From b96ef98c3cd6dc94a65b71d922cd2b61cfa1932d Mon Sep 17 00:00:00 2001 From: Hansong <107070759+kirklandsign@users.noreply.github.com> Date: Fri, 9 May 2025 11:38:38 -0700 Subject: [PATCH 1/3] Use torchtune 0.6.1 --- examples/models/llama3_2_vision/install_requirements.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/models/llama3_2_vision/install_requirements.sh b/examples/models/llama3_2_vision/install_requirements.sh index 4a5df966e5f..3742b9e3ec5 100755 --- a/examples/models/llama3_2_vision/install_requirements.sh +++ b/examples/models/llama3_2_vision/install_requirements.sh @@ -7,7 +7,5 @@ set +ex -NIGHTLY_VERSION="dev20250310" - # Install torchtune nightly for model definitions. -pip install --pre torchtune==0.6.0.${NIGHTLY_VERSION} --extra-index-url https://download.pytorch.org/whl/nightly/cpu --no-cache-dir +pip install --pre torchtune==0.6.1 --no-cache-dir From bec96cc062ba404b643c753b6ecad3eddf356bcd Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Fri, 9 May 2025 12:06:28 -0700 Subject: [PATCH 2/3] as pip requirement --- .ci/scripts/test_model.sh | 4 ---- .ci/scripts/unittest-linux.sh | 3 --- .ci/scripts/unittest-macos.sh | 1 - backends/arm/test/test_arm_baremetal.sh | 4 ---- .../models/llama3_2_vision/install_requirements.sh | 11 ----------- requirements-examples.txt | 1 + 6 files changed, 1 insertion(+), 23 deletions(-) delete mode 100755 examples/models/llama3_2_vision/install_requirements.sh diff --git a/.ci/scripts/test_model.sh b/.ci/scripts/test_model.sh index fa922e897d7..9175942a0ac 100755 --- a/.ci/scripts/test_model.sh +++ b/.ci/scripts/test_model.sh @@ -87,10 +87,6 @@ test_model() { bash examples/models/llava/install_requirements.sh STRICT="--no-strict" fi - if [[ "$MODEL_NAME" == "llama3_2_vision_encoder" || "$MODEL_NAME" == "llama3_2_text_decoder" ]]; then - # Install requirements for llama vision. - bash examples/models/llama3_2_vision/install_requirements.sh - fi if [[ "${MODEL_NAME}" == "qwen2_5" ]]; then # Install requirements for export_llama bash examples/models/llama/install_requirements.sh diff --git a/.ci/scripts/unittest-linux.sh b/.ci/scripts/unittest-linux.sh index a05211d8e0e..dcb15ba5050 100755 --- a/.ci/scripts/unittest-linux.sh +++ b/.ci/scripts/unittest-linux.sh @@ -24,9 +24,6 @@ if [[ "$BUILD_TOOL" == "cmake" ]]; then CMAKE_ARGS="-DEXECUTORCH_BUILD_PYBIND=ON -DEXECUTORCH_BUILD_XNNPACK=ON -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON" \ .ci/scripts/setup-linux.sh "$@" - # Install llama3_2_vision dependencies. - PYTHON_EXECUTABLE=python ./examples/models/llama3_2_vision/install_requirements.sh - .ci/scripts/unittest-linux-cmake.sh elif [[ "$BUILD_TOOL" == "buck2" ]]; then # Removing this breaks sccache in the Buck build, apparently diff --git a/.ci/scripts/unittest-macos.sh b/.ci/scripts/unittest-macos.sh index 12c9d3f1508..1c202c0c235 100755 --- a/.ci/scripts/unittest-macos.sh +++ b/.ci/scripts/unittest-macos.sh @@ -29,7 +29,6 @@ if [[ "$BUILD_TOOL" == "cmake" ]]; then # Install llama3_2_vision dependencies. PYTHON_EXECUTABLE=python \ ${CONDA_RUN} --no-capture-output \ - ./examples/models/llama3_2_vision/install_requirements.sh .ci/scripts/unittest-macos-cmake.sh elif [[ "$BUILD_TOOL" == "buck2" ]]; then diff --git a/backends/arm/test/test_arm_baremetal.sh b/backends/arm/test/test_arm_baremetal.sh index 476d417a69a..330f0f138d0 100755 --- a/backends/arm/test/test_arm_baremetal.sh +++ b/backends/arm/test/test_arm_baremetal.sh @@ -83,8 +83,6 @@ test_pytest_ops() { # Test ops and other things test_pytest_models() { # Test ops and other things echo "${TEST_SUITE_NAME}: Run pytest" - examples/models/llama3_2_vision/install_requirements.sh - # Prepare for pytest backends/arm/scripts/build_executorch.sh @@ -117,8 +115,6 @@ test_pytest_ops_ethosu_fvp() { # Same as test_pytest but also sometime verify us test_pytest_models_ethosu_fvp() { # Same as test_pytest but also sometime verify using Corstone FVP echo "${TEST_SUITE_NAME}: Run pytest with fvp" - examples/models/llama3_2_vision/install_requirements.sh - # Prepare Corstone-3x0 FVP for pytest backends/arm/scripts/build_executorch.sh backends/arm/scripts/build_portable_kernels.sh diff --git a/examples/models/llama3_2_vision/install_requirements.sh b/examples/models/llama3_2_vision/install_requirements.sh deleted file mode 100755 index 3742b9e3ec5..00000000000 --- a/examples/models/llama3_2_vision/install_requirements.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Copyright (c) Meta Platforms, Inc. and affiliates. -# All rights reserved. -# -# This source code is licensed under the BSD-style license found in the -# LICENSE file in the root directory of this source tree. - -set +ex - -# Install torchtune nightly for model definitions. -pip install --pre torchtune==0.6.1 --no-cache-dir diff --git a/requirements-examples.txt b/requirements-examples.txt index d4126a178aa..b52bf2bc1c6 100644 --- a/requirements-examples.txt +++ b/requirements-examples.txt @@ -2,4 +2,5 @@ # TODO: Make each example publish its own requirements.txt timm == 1.0.7 torchsr == 1.0.4 +torchsr >= 0.6.1 transformers ==4.47.1 From 844d01cb0ad525c2236e29deb26a754aed3f02b9 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Fri, 9 May 2025 12:08:07 -0700 Subject: [PATCH 3/3] as pip requirement --- requirements-examples.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-examples.txt b/requirements-examples.txt index b52bf2bc1c6..f52eb113075 100644 --- a/requirements-examples.txt +++ b/requirements-examples.txt @@ -2,5 +2,5 @@ # TODO: Make each example publish its own requirements.txt timm == 1.0.7 torchsr == 1.0.4 -torchsr >= 0.6.1 +torchtune >= 0.6.1 transformers ==4.47.1