diff --git a/.ci/scripts/gather_test_models.py b/.ci/scripts/gather_test_models.py index ef65b6f9b4..1b3880c54e 100755 --- a/.ci/scripts/gather_test_models.py +++ b/.ci/scripts/gather_test_models.py @@ -23,7 +23,7 @@ "w2l": "linux.12xlarge", "ic4": "linux.12xlarge", "resnet50": "linux.12xlarge", - "llava_encoder": "linux.4xlarge", + "llava": "linux.4xlarge", # This one causes timeout on smaller runner, the root cause is unclear (T161064121) "dl3": "linux.12xlarge", "emformer_join": "linux.12xlarge", @@ -83,7 +83,7 @@ def model_should_run_on_event(model: str, event: str) -> bool: We put higher priority and fast models to pull request and rest to push. """ if event == "pull_request": - return model in ["add", "ic3", "mv2", "mv3", "resnet18", "vit", "llava_encoder"] + return model in ["add", "ic3", "mv2", "mv3", "resnet18", "vit", "llava"] return True @@ -93,7 +93,7 @@ def model_should_run_on_target_os(model: str, target_os: str) -> bool: For example, a big model can be disabled in macos due to the limited macos resources. """ if target_os == "macos": - return model not in ["llava_encoder"] + return model not in ["llava"] return True diff --git a/.ci/scripts/test.sh b/.ci/scripts/test.sh index c29c09dc63..9cf633b13b 100755 --- a/.ci/scripts/test.sh +++ b/.ci/scripts/test.sh @@ -67,9 +67,9 @@ test_model() { run_portable_executor_runner rm "./${MODEL_NAME}.pte" fi - if [[ "${MODEL_NAME}" == "llava_encoder" ]]; then + if [[ "${MODEL_NAME}" == "llava" ]]; then # Install requirements for llava - bash examples/models/llava_encoder/install_requirements.sh + bash examples/models/llava/install_requirements.sh fi # python3 -m examples.portable.scripts.export --model_name="llama2" should works too "${PYTHON_EXECUTABLE}" -m examples.portable.scripts.export --model_name="${MODEL_NAME}" diff --git a/examples/models/__init__.py b/examples/models/__init__.py index c66feb0962..05029f9631 100644 --- a/examples/models/__init__.py +++ b/examples/models/__init__.py @@ -26,7 +26,7 @@ "ic4": ("inception_v4", "InceptionV4Model"), "resnet18": ("resnet", "ResNet18Model"), "resnet50": ("resnet", "ResNet50Model"), - "llava_encoder": ("llava_encoder", "LlavaModel"), + "llava": ("llava", "LlavaModel"), } __all__ = [ diff --git a/examples/models/llava_encoder/README.md b/examples/models/llava/README.md similarity index 100% rename from examples/models/llava_encoder/README.md rename to examples/models/llava/README.md diff --git a/examples/models/llava_encoder/__init__.py b/examples/models/llava/__init__.py similarity index 100% rename from examples/models/llava_encoder/__init__.py rename to examples/models/llava/__init__.py diff --git a/examples/models/llava_encoder/install_requirements.sh b/examples/models/llava/install_requirements.sh similarity index 100% rename from examples/models/llava_encoder/install_requirements.sh rename to examples/models/llava/install_requirements.sh diff --git a/examples/models/llava_encoder/model.py b/examples/models/llava/model.py similarity index 100% rename from examples/models/llava_encoder/model.py rename to examples/models/llava/model.py