From 912f67f65f75c46770cbab7d06f6850c9d4747a9 Mon Sep 17 00:00:00 2001 From: Jack-Khuu Date: Tue, 17 Dec 2024 13:34:37 -0800 Subject: [PATCH 1/4] Update install_requirements.sh to pt/pt dev20241217 --- install/install_requirements.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/install_requirements.sh b/install/install_requirements.sh index 3db559dbc..45e6af735 100755 --- a/install/install_requirements.sh +++ b/install/install_requirements.sh @@ -62,10 +62,10 @@ echo "Using pip executable: $PIP_EXECUTABLE" # NOTE: If a newly-fetched version of the executorch repo changes the value of # PYTORCH_NIGHTLY_VERSION, you should re-run this script to install the necessary # package versions. -PYTORCH_NIGHTLY_VERSION=dev20241213 +PYTORCH_NIGHTLY_VERSION=dev20241217 # Nightly version for torchvision -VISION_NIGHTLY_VERSION=dev20241213 +VISION_NIGHTLY_VERSION=dev20241217 # Nightly version for torchtune TUNE_NIGHTLY_VERSION=dev20241126 From dda03006c5b307dc4d0d58b6c1433e264db82384 Mon Sep 17 00:00:00 2001 From: Jack-Khuu Date: Wed, 18 Dec 2024 11:03:39 -0800 Subject: [PATCH 2/4] Update install_requirements.sh to 1218 --- install/install_requirements.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/install_requirements.sh b/install/install_requirements.sh index 45e6af735..aa96986c3 100755 --- a/install/install_requirements.sh +++ b/install/install_requirements.sh @@ -62,10 +62,10 @@ echo "Using pip executable: $PIP_EXECUTABLE" # NOTE: If a newly-fetched version of the executorch repo changes the value of # PYTORCH_NIGHTLY_VERSION, you should re-run this script to install the necessary # package versions. -PYTORCH_NIGHTLY_VERSION=dev20241217 +PYTORCH_NIGHTLY_VERSION=dev20241218 # Nightly version for torchvision -VISION_NIGHTLY_VERSION=dev20241217 +VISION_NIGHTLY_VERSION=dev20241218 # Nightly version for torchtune TUNE_NIGHTLY_VERSION=dev20241126 From 77a65ab66d8a2d5aea41d308f2df3e55b2709de9 Mon Sep 17 00:00:00 2001 From: Jack-Khuu Date: Wed, 18 Dec 2024 13:16:21 -0800 Subject: [PATCH 3/4] Update install_requirements.sh --- install/install_requirements.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/install_requirements.sh b/install/install_requirements.sh index aa96986c3..b807065f0 100755 --- a/install/install_requirements.sh +++ b/install/install_requirements.sh @@ -68,7 +68,7 @@ PYTORCH_NIGHTLY_VERSION=dev20241218 VISION_NIGHTLY_VERSION=dev20241218 # Nightly version for torchtune -TUNE_NIGHTLY_VERSION=dev20241126 +TUNE_NIGHTLY_VERSION=dev20241218 # Uninstall triton, as nightly will depend on pytorch-triton, which is one and the same ( From 653ef719524f17be87a7c34e82bd3bdec642cfe5 Mon Sep 17 00:00:00 2001 From: Jack-Khuu Date: Wed, 18 Dec 2024 16:36:06 -0800 Subject: [PATCH 4/4] Rearrange install order; previuosly inconsistent extra-index-url --- install/install_requirements.sh | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/install/install_requirements.sh b/install/install_requirements.sh index b807065f0..b5ac414fd 100755 --- a/install/install_requirements.sh +++ b/install/install_requirements.sh @@ -44,17 +44,6 @@ fi echo "Using pip executable: $PIP_EXECUTABLE" -# -# First install requirements in install/requirements.txt. Older torch may be -# installed from the dependency of other models. It will be overridden by -# newer version of torch nightly installed later in this script. -# - -( - set -x - $PIP_EXECUTABLE install -r install/requirements.txt --extra-index-url https://download.pytorch.org/whl/nightly/cu121 -) - # Since torchchat often uses main-branch features of pytorch, only the nightly # pip versions will have the required features. The PYTORCH_NIGHTLY_VERSION value should # agree with the third-party/pytorch pinned submodule commit. @@ -96,6 +85,16 @@ REQUIREMENTS_TO_INSTALL=( torchtune=="0.5.0.${TUNE_NIGHTLY_VERSION}" ) +# +# First install requirements in install/requirements.txt. Older torch may be +# installed from the dependency of other models. It will be overridden by +# newer version of torch nightly installed later in this script. +# +( + set -x + $PIP_EXECUTABLE install -r install/requirements.txt --extra-index-url "${TORCH_NIGHTLY_URL}" +) + # Install the requirements. --extra-index-url tells pip to look for package # versions on the provided URL if they aren't available on the default URL. (