From d8c372d0c82bfa570d854bf914c7cc63dfae8ee5 Mon Sep 17 00:00:00 2001
From: Naman Nandan <namannan@amazon.com>
Date: Tue, 26 Sep 2023 10:24:35 -0700
Subject: [PATCH 1/3] update path to sample input text for inf2 opt benchmark
 model

---
 benchmarks/models_config/opt_6.7b_neuronx.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/benchmarks/models_config/opt_6.7b_neuronx.yaml b/benchmarks/models_config/opt_6.7b_neuronx.yaml
index 99df9cc78b..1dc0f0e63f 100644
--- a/benchmarks/models_config/opt_6.7b_neuronx.yaml
+++ b/benchmarks/models_config/opt_6.7b_neuronx.yaml
@@ -8,7 +8,7 @@ opt_6.7b_neuronx_batch_1:
     batch_delay: 100
     batch_size:
       - 1
-    input: "./examples/large_models/inferentia2/sample_text.txt"
+    input: "./examples/large_models/inferentia2/opt/sample_text.txt"
     requests: 2000
     concurrency: 10
     backend_profiling: False
@@ -25,7 +25,7 @@ opt_6.7b_neuronx_batch_2:
     batch_delay: 100
     batch_size:
       - 2
-    input: "./examples/large_models/inferentia2/sample_text.txt"
+    input: "./examples/large_models/inferentia2/opt/sample_text.txt"
     requests: 2000
     concurrency: 10
     backend_profiling: False
@@ -42,7 +42,7 @@ opt_6.7b_neuronx_batch_4:
     batch_delay: 100
     batch_size:
       - 4
-    input: "./examples/large_models/inferentia2/sample_text.txt"
+    input: "./examples/large_models/inferentia2/opt/sample_text.txt"
     requests: 2000
     concurrency: 10
     backend_profiling: False
@@ -59,7 +59,7 @@ opt_6.7b_neuronx_batch_8:
     batch_delay: 100
     batch_size:
       - 8
-    input: "./examples/large_models/inferentia2/sample_text.txt"
+    input: "./examples/large_models/inferentia2/opt/sample_text.txt"
     requests: 2000
     concurrency: 10
     backend_profiling: False

From 467930598607c9a05831c0cb3d40721bee98cf4e Mon Sep 17 00:00:00 2001
From: Naman Nandan <namannan@amazon.com>
Date: Tue, 26 Sep 2023 10:29:12 -0700
Subject: [PATCH 2/3] test inf2 benchmark fix

---
 .github/workflows/benchmark_nightly.yml  | 7 ++++---
 benchmarks/benchmark_config_neuronx.yaml | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/benchmark_nightly.yml b/.github/workflows/benchmark_nightly.yml
index 0bb33739f9..f8c0a30a75 100644
--- a/.github/workflows/benchmark_nightly.yml
+++ b/.github/workflows/benchmark_nightly.yml
@@ -2,15 +2,16 @@ name: Benchmark torchserve nightly
 
 on:
   # run every day at 2:15am
-  schedule:
-    - cron:  '15 02 * * *'
+  # schedule:
+  #   - cron:  '15 02 * * *'
+  push
 
 jobs:
   nightly:
     strategy:
       fail-fast: false
       matrix:
-        hardware: [cpu, gpu, inf1, inf2]
+        hardware: [inf2]
     runs-on:
       - self-hosted
       - ${{ matrix.hardware }}
diff --git a/benchmarks/benchmark_config_neuronx.yaml b/benchmarks/benchmark_config_neuronx.yaml
index 8f8876dc24..9b641974bf 100644
--- a/benchmarks/benchmark_config_neuronx.yaml
+++ b/benchmarks/benchmark_config_neuronx.yaml
@@ -3,8 +3,8 @@
 #  - nightly: "2022.3.16"
 #  - release: "0.5.3"
 # Nightly build will be installed if "ts_version" is not specifiged
-#ts_version:
-#    branch: &ts_version "master"
+ts_version:
+    branch: "benchmark/fix_inf2_opt_benchmark"
 
 # a list of model configure yaml files defined in benchmarks/models_config
 # or a list of model configure yaml files with full path

From fdec204a243ac4a5d1d5634b4219e2a0672afac5 Mon Sep 17 00:00:00 2001
From: Naman Nandan <namannan@amazon.com>
Date: Tue, 26 Sep 2023 15:49:41 -0700
Subject: [PATCH 3/3] Revert "test inf2 benchmark fix"

This reverts commit 467930598607c9a05831c0cb3d40721bee98cf4e.
---
 .github/workflows/benchmark_nightly.yml  | 7 +++----
 benchmarks/benchmark_config_neuronx.yaml | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/benchmark_nightly.yml b/.github/workflows/benchmark_nightly.yml
index f8c0a30a75..0bb33739f9 100644
--- a/.github/workflows/benchmark_nightly.yml
+++ b/.github/workflows/benchmark_nightly.yml
@@ -2,16 +2,15 @@ name: Benchmark torchserve nightly
 
 on:
   # run every day at 2:15am
-  # schedule:
-  #   - cron:  '15 02 * * *'
-  push
+  schedule:
+    - cron:  '15 02 * * *'
 
 jobs:
   nightly:
     strategy:
       fail-fast: false
       matrix:
-        hardware: [inf2]
+        hardware: [cpu, gpu, inf1, inf2]
     runs-on:
       - self-hosted
       - ${{ matrix.hardware }}
diff --git a/benchmarks/benchmark_config_neuronx.yaml b/benchmarks/benchmark_config_neuronx.yaml
index 9b641974bf..8f8876dc24 100644
--- a/benchmarks/benchmark_config_neuronx.yaml
+++ b/benchmarks/benchmark_config_neuronx.yaml
@@ -3,8 +3,8 @@
 #  - nightly: "2022.3.16"
 #  - release: "0.5.3"
 # Nightly build will be installed if "ts_version" is not specifiged
-ts_version:
-    branch: "benchmark/fix_inf2_opt_benchmark"
+#ts_version:
+#    branch: &ts_version "master"
 
 # a list of model configure yaml files defined in benchmarks/models_config
 # or a list of model configure yaml files with full path