[llava][2/N] Rename llava_encoder to llava

.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
 
 

.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}"

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__ = [