From a7ef50085610c394e55cda02e8bf517f81d0d8c7 Mon Sep 17 00:00:00 2001
From: lambda7xx <lambda7xx@gmail.com>
Date: Thu, 8 Feb 2024 22:10:37 -0500
Subject: [PATCH] fix the head file

---
 deps/legion                  |  2 +-
 deps/nccl                    |  2 +-
 include/flexflow/ops/fused.h | 12 ++++++++++++
 llama.sh                     |  1 +
 src/ops/fused.cu             | 14 ++------------
 5 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 llama.sh

diff --git a/deps/legion b/deps/legion
index 15b23cf0d..626b55689 160000
--- a/deps/legion
+++ b/deps/legion
@@ -1 +1 @@
-Subproject commit 15b23cf0d95f186297f05c76611ddd3e2cbbe9f9
+Subproject commit 626b55689c77848b246e1da19678c7ad58899f0c
diff --git a/deps/nccl b/deps/nccl
index 399656269..6e24ef4e1 160000
--- a/deps/nccl
+++ b/deps/nccl
@@ -1 +1 @@
-Subproject commit 399656269027c1818fc999ccf8ec4dd838cec50d
+Subproject commit 6e24ef4e1f1eac9f104d115ef65429f179924ee7
diff --git a/include/flexflow/ops/fused.h b/include/flexflow/ops/fused.h
index dd80cf2f0..af2f26a39 100644
--- a/include/flexflow/ops/fused.h
+++ b/include/flexflow/ops/fused.h
@@ -6,6 +6,18 @@
 
 namespace FlexFlow {
 
+// declare Legion names
+using Legion::Context;
+using Legion::coord_t;
+using Legion::Domain;
+using Legion::Future;
+using Legion::LogicalPartition;
+using Legion::LogicalRegion;
+using Legion::Memory;
+using Legion::PhysicalRegion;
+using Legion::Runtime;
+using Legion::Task;
+
 class FusedOp;
 class FusedOpMeta {
 public:
diff --git a/llama.sh b/llama.sh
new file mode 100644
index 000000000..dd3beed71
--- /dev/null
+++ b/llama.sh
@@ -0,0 +1 @@
+./build/inference/incr_decoding/incr_decoding --ll:util 8 -ll:cpu 4 -ll:fsize 20000 -ll:zsize 30000 -llm-model meta-llama/Llama-2-7b-hf -cache-folder /home/xiaoxias/weights --fusion -ll:gpu 4 -prompt /home/xiaoxias/cudagraph/inference/prompt/chatgpt.json  -tensor-parallelism-degree 4 > llama2.log 2>&1
diff --git a/src/ops/fused.cu b/src/ops/fused.cu
index 88c301bae..488c9e00c 100644
--- a/src/ops/fused.cu
+++ b/src/ops/fused.cu
@@ -47,17 +47,6 @@
 #include "flexflow/ffconst_utils.h"
 
 namespace FlexFlow {
-// declare Legion names
-using Legion::Context;
-using Legion::coord_t;
-using Legion::Domain;
-using Legion::Future;
-using Legion::LogicalPartition;
-using Legion::LogicalRegion;
-using Legion::Memory;
-using Legion::PhysicalRegion;
-using Legion::Runtime;
-using Legion::Task;
 
 OpMeta *FusedOp::init_task(Task const *task,
                            std::vector<PhysicalRegion> const &regions,
@@ -1127,7 +1116,7 @@ __host__ void FusedOp::capture_graph(Task const *task,
         output_accessors_to_save.push_back(output_accessor[i + ooff]);
       }
       assert(task->index_point.get_dim() == 1);
-      int shard_id = task->index_point.point_data[0];
+      shard_id = task->index_point.point_data[0];
       FusedOp::save_inference_tensors_to_file(metas->meta[op],
                                               shard_id,
                                               bc,
@@ -1176,6 +1165,7 @@ __host__ void
                       bc->num_active_tokens(),
                       bc->num_generation_tokens > 0);
   int scenario = 0;
+  int shard_id = task->index_point.point_data[0];
   auto it = metas->graph_collections.find(graph_params);
   if(it != metas->graph_collections.end()) {
     instance = it->second;