polish code

FlagOpen · Jan 24, 2025 · bf045eb · bf045eb
1 parent bfd87dc
commit bf045eb
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 76 deletions.
diff --git a/tests/functional_tests/test_cases/serve/build_dag/conf/serve/config.yaml b/tests/functional_tests/test_cases/serve/build_dag/conf/serve/config.yaml
@@ -1,26 +1,26 @@
 deploy:
   models:
     A:
-      module: ./tests/functional_tests/test_cases/serve/build_dag/main.py 
+      module: ./tests/functional_tests/test_cases/serve/utils/models/base_model.py 
       name: model_A
       resources:
         gpu: 1 
     B:
-      module: ./tests/functional_tests/test_cases/serve/build_dag/main.py
+      module: ./tests/functional_tests/test_cases/serve/utils/models/base_model.py
       depends:
         - A
       name: model_B
       resources:
         gpu: 0
     C:
-      module: ./tests/functional_tests/test_cases/serve/build_dag/custom/models.py
+      module: ./tests/functional_tests/test_cases/serve/utils/models/util_models/util_model.py
       depends: 
         - A
       name: model_C
       resources:
         gpu: 0
     D:
-      module: ./tests/functional_tests/test_cases/serve/build_dag/custom/models.py
+      module: ./tests/functional_tests/test_cases/serve/utils/models/util_models/util_model.py
       depends:
         - B
         - C

diff --git a/tests/functional_tests/test_cases/serve/build_vllm_models/conf/serve/config.yaml b/tests/functional_tests/test_cases/serve/build_vllm_models/conf/serve/config.yaml
@@ -1,26 +1,26 @@
 deploy:
   models:
     A:
-      module: ./tests/functional_tests/test_cases/serve/build_dag/main.py 
+      module: ./tests/functional_tests/test_cases/serve/utils/models/vllm_model.py 
       name: model_A
       resources:
         gpu: 1 
     B:
-      module: ./tests/functional_tests/test_cases/serve/build_dag/main.py
+      module: ./tests/functional_tests/test_cases/serve/utils/models/vllm_model.py
       depends:
         - A
       name: model_B
       resources:
         gpu: 0
     C:
-      module: ./tests/functional_tests/test_cases/serve/build_dag/custom/models.py
+      module: ./tests/functional_tests/test_cases/serve/utils/models/util_models/util_model.py
       depends: 
         - A
       name: model_C
       resources:
         gpu: 0
     D:
-      module: ./tests/functional_tests/test_cases/serve/build_dag/custom/models.py
+      module: ./tests/functional_tests/test_cases/serve/utils/models/util_models/util_model.py
       depends:
         - B
         - C

diff --git a/tests/functional_tests/test_cases/serve/build_vllm_models/custom/models.py b/tests/functional_tests/test_cases/serve/build_vllm_models/custom/models.py
diff --git a/tests/functional_tests/test_cases/serve/multiple_nodes/custom/models.py b/tests/functional_tests/test_cases/serve/multiple_nodes/custom/models.py
diff --git a/tests/functional_tests/test_cases/serve/multiple_nodes/main.py b/tests/functional_tests/test_cases/serve/multiple_nodes/main.py
diff --git a/..._tests/test_cases/serve/build_dag/main.py → ...st_cases/serve/utils/models/base_model.py b/..._tests/test_cases/serve/build_dag/main.py → ...st_cases/serve/utils/models/base_model.py
@@ -1,4 +1,4 @@
-from custom.models import fn
+from util_models.util_model import fn
 
 
 def model_A(prompt):

diff --git a/...st_cases/serve/build_dag/custom/models.py → ...ve/utils/models/util_models/util_model.py b/...st_cases/serve/build_dag/custom/models.py → ...ve/utils/models/util_models/util_model.py
diff --git a/...est_cases/serve/build_vllm_models/main.py → ...st_cases/serve/utils/models/vllm_model.py b/...est_cases/serve/build_vllm_models/main.py → ...st_cases/serve/utils/models/vllm_model.py
@@ -1,5 +1,5 @@
 from vllm import LLM, SamplingParams
-from custom.models import fn
+from util_models.util_model import fn
 from flagscale.serve.core import auto_remote