chore: cleanup presets folder

kaito-project · Oct 20, 2023 · beec436 · beec436
1 parent 994f870
commit beec436
Show file tree

Hide file tree

Showing 30 changed files with 8 additions and 3,551 deletions.
diff --git a/.github/workflows/e2e-preset-test.yml b/.github/workflows/e2e-preset-test.yml
@@ -248,7 +248,7 @@ jobs:
 
       - name: Create Service
         if: steps.check_image.outputs.IMAGE_EXISTS == 'true'
-        run: kubectl apply -f presets/k8s/${{ matrix.image.name }}/${{ matrix.image.name }}-service.yaml
+        run: kubectl apply -f presets/examples/${{ matrix.image.name }}/${{ matrix.image.name }}-service.yaml
 
       - name: Retrieve External Service IP
         if: steps.check_image.outputs.IMAGE_EXISTS == 'true'
@@ -264,10 +264,10 @@ jobs:
       - name: Replace IP and Deploy Statefulset to K8s
         if: steps.check_image.outputs.IMAGE_EXISTS == 'true'
         run: |
-            sed -i "s/MASTER_ADDR_HERE/${{ steps.get_ip.outputs.SERVICE_IP }}/g" presets/k8s/${{ matrix.image.name }}/${{ matrix.image.name }}-statefulset.yaml
-            sed -i "s/TAG_HERE/${{ needs.setup.outputs.IMG_TAG }}/g" presets/k8s/${{ matrix.image.name }}/${{ matrix.image.name }}-statefulset.yaml
-            sed -i "s/REPO_HERE/${{ steps.get_acr_name.outputs.ACR_NAME }}/g" presets/k8s/${{ matrix.image.name }}/${{ matrix.image.name }}-statefulset.yaml
-            kubectl apply -f presets/k8s/${{ matrix.image.name }}/${{ matrix.image.name }}-statefulset.yaml
+            sed -i "s/MASTER_ADDR_HERE/${{ steps.get_ip.outputs.SERVICE_IP }}/g" presets/examples/${{ matrix.image.name }}/${{ matrix.image.name }}-statefulset.yaml
+            sed -i "s/TAG_HERE/${{ needs.setup.outputs.IMG_TAG }}/g" presets/examples/${{ matrix.image.name }}/${{ matrix.image.name }}-statefulset.yaml
+            sed -i "s/REPO_HERE/${{ steps.get_acr_name.outputs.ACR_NAME }}/g" presets/examples/${{ matrix.image.name }}/${{ matrix.image.name }}-statefulset.yaml
+            kubectl apply -f presets/examples/${{ matrix.image.name }}/${{ matrix.image.name }}-statefulset.yaml
     
       - name: Wait for Statefulset to be ready
         if: steps.check_image.outputs.IMAGE_EXISTS == 'true'

diff --git a/.github/workflows/preset-image-build.yml b/.github/workflows/preset-image-build.yml
@@ -200,7 +200,7 @@ jobs:
           DEPLOYMENT=$(kubectl get deployment docker-deployment -o=jsonpath='{.metadata.name}' --ignore-not-found)
           if [ -z "$DEPLOYMENT" ]; then
             # Apply the deployment if it does not exist
-            kubectl apply -f presets/k8s/docker.yaml
+            kubectl apply -f presets/test/docker.yaml
           fi
           kubectl wait --for=condition=ready pod -l app=docker --timeout=300s
         

diff --git a/presets/Most-Googled-questions-global-Jan-to-Jun-2023.csv b/presets/Most-Googled-questions-global-Jan-to-Jun-2023.csv
diff --git a/...instruct/falcon-40b-instruct-service.yaml → ...instruct/falcon-40b-instruct-service.yaml b/...instruct/falcon-40b-instruct-service.yaml → ...instruct/falcon-40b-instruct-service.yaml
diff --git a/...ruct/falcon-40b-instruct-statefulset.yaml → ...ruct/falcon-40b-instruct-statefulset.yaml b/...ruct/falcon-40b-instruct-statefulset.yaml → ...ruct/falcon-40b-instruct-statefulset.yaml
diff --git a/...ts/k8s/falcon-40b/falcon-40b-service.yaml → ...amples/falcon-40b/falcon-40b-service.yaml b/...ts/k8s/falcon-40b/falcon-40b-service.yaml → ...amples/falcon-40b/falcon-40b-service.yaml
diff --git a/...8s/falcon-40b/falcon-40b-statefulset.yaml → ...es/falcon-40b/falcon-40b-statefulset.yaml b/...8s/falcon-40b/falcon-40b-statefulset.yaml → ...es/falcon-40b/falcon-40b-statefulset.yaml
diff --git a/...-instruct/falcon-7b-instruct-service.yaml → ...-instruct/falcon-7b-instruct-service.yaml b/...-instruct/falcon-7b-instruct-service.yaml → ...-instruct/falcon-7b-instruct-service.yaml
diff --git a/...truct/falcon-7b-instruct-statefulset.yaml → ...truct/falcon-7b-instruct-statefulset.yaml b/...truct/falcon-7b-instruct-statefulset.yaml → ...truct/falcon-7b-instruct-statefulset.yaml
diff --git a/presets/k8s/falcon-7b/falcon-7b-service.yaml → ...examples/falcon-7b/falcon-7b-service.yaml b/presets/k8s/falcon-7b/falcon-7b-service.yaml → ...examples/falcon-7b/falcon-7b-service.yaml
diff --git a/.../k8s/falcon-7b/falcon-7b-statefulset.yaml → ...ples/falcon-7b/falcon-7b-statefulset.yaml b/.../k8s/falcon-7b/falcon-7b-statefulset.yaml → ...ples/falcon-7b/falcon-7b-statefulset.yaml
diff --git a/...-2-13b-chat/llama-2-13b-chat-service.yaml → ...-2-13b-chat/llama-2-13b-chat-service.yaml b/...-2-13b-chat/llama-2-13b-chat-service.yaml → ...-2-13b-chat/llama-2-13b-chat-service.yaml
diff --git a/...3b-chat/llama-2-13b-chat-statefulset.yaml → ...3b-chat/llama-2-13b-chat-statefulset.yaml b/...3b-chat/llama-2-13b-chat-statefulset.yaml → ...3b-chat/llama-2-13b-chat-statefulset.yaml
diff --git a/.../k8s/llama-2-13b/llama-2-13b-service.yaml → ...ples/llama-2-13b/llama-2-13b-service.yaml b/.../k8s/llama-2-13b/llama-2-13b-service.yaml → ...ples/llama-2-13b/llama-2-13b-service.yaml
diff --git a/.../llama-2-13b/llama-2-13b-statefulset.yaml → .../llama-2-13b/llama-2-13b-statefulset.yaml b/.../llama-2-13b/llama-2-13b-statefulset.yaml → .../llama-2-13b/llama-2-13b-statefulset.yaml
diff --git a/...ma-2-7b-chat/llama-2-7b-chat-service.yaml → ...ma-2-7b-chat/llama-2-7b-chat-service.yaml b/...ma-2-7b-chat/llama-2-7b-chat-service.yaml → ...ma-2-7b-chat/llama-2-7b-chat-service.yaml
diff --git a/...-7b-chat/llama-2-7b-chat-statefulset.yaml → ...-7b-chat/llama-2-7b-chat-statefulset.yaml b/...-7b-chat/llama-2-7b-chat-statefulset.yaml → ...-7b-chat/llama-2-7b-chat-statefulset.yaml
diff --git a/...ts/k8s/llama-2-7b/llama-2-7b-service.yaml → ...amples/llama-2-7b/llama-2-7b-service.yaml b/...ts/k8s/llama-2-7b/llama-2-7b-service.yaml → ...amples/llama-2-7b/llama-2-7b-service.yaml
diff --git a/...8s/llama-2-7b/llama-2-7b-statefulset.yaml → ...es/llama-2-7b/llama-2-7b-statefulset.yaml b/...8s/llama-2-7b/llama-2-7b-statefulset.yaml → ...es/llama-2-7b/llama-2-7b-statefulset.yaml
diff --git a/presets/inference.py b/presets/inference.py
diff --git a/presets/llama-2-chat/example_chat_completion.py b/presets/llama-2-chat/example_chat_completion.py
diff --git a/presets/llama-2/example_text_completion.py b/presets/llama-2/example_text_completion.py
diff --git a/presets/llama-2/params.md b/presets/llama-2/params.md
diff --git a/presets/llama.md b/presets/llama.md
diff --git a/presets/common-gpt-questions.csv → presets/test/common-gpt-questions.csv b/presets/common-gpt-questions.csv → presets/test/common-gpt-questions.csv
diff --git a/presets/k8s/docker.yaml → presets/test/docker.yaml b/presets/k8s/docker.yaml → presets/test/docker.yaml
diff --git a/presets/falcon/benchmark/README.md → presets/test/falcon-benchmark/README.md b/presets/falcon/benchmark/README.md → presets/test/falcon-benchmark/README.md
diff --git a/...s/falcon/benchmark/inference-benchmark.py → ...t/falcon-benchmark/inference-benchmark.py b/...s/falcon/benchmark/inference-benchmark.py → ...t/falcon-benchmark/inference-benchmark.py
@@ -81,7 +81,7 @@ def inference(requests):
 
 
 
-with open("requests.csv", "r") as f:
+with open("../common-gpt-questions.csv", "r") as f:
     requests = [line.strip() for line in f.readlines()]
 
 fieldnames = ["model", "num_nodes", "num_processes", "num_gpus", "num_prompts", "prompt_len", "model_parallelism", "data_parallelism", "quantization", "machine", "inference_time", "request_id", "timestamp"]

diff --git a/presets/falcon/benchmark/plot.ipynb → presets/test/falcon-benchmark/plot.ipynb b/presets/falcon/benchmark/plot.ipynb → presets/test/falcon-benchmark/plot.ipynb
diff --git a/presets/benchmark_inference.py → ...ts/test/llama-test/inference-benchmark.py b/presets/benchmark_inference.py → ...ts/test/llama-test/inference-benchmark.py
@@ -16,7 +16,7 @@ def load_search_terms_from_csv(filename):
         return [row['search_terms'] for row in reader]
 
 # Load search terms and shuffle them for randomness
-search_terms = load_search_terms_from_csv("common-gpt-questions.csv")
+search_terms = load_search_terms_from_csv("../common-gpt-questions.csv")
 random.shuffle(search_terms)
 
 # Constants