From 08a9f4d71f26c2e7b1e6d924ed4929e7d650ee89 Mon Sep 17 00:00:00 2001 From: Scott Roy <161522778+metascroy@users.noreply.github.com> Date: Mon, 30 Sep 2024 11:48:35 -0700 Subject: [PATCH 1/4] init --- install/install_requirements.sh | 6 +++--- torchchat/utils/scripts/install_utils.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/install_requirements.sh b/install/install_requirements.sh index cd6c302c2..219f464ee 100755 --- a/install/install_requirements.sh +++ b/install/install_requirements.sh @@ -47,10 +47,10 @@ fi # 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=dev20240901 +PYTORCH_NIGHTLY_VERSION=dev20240925 # Nightly version for torchvision -VISION_NIGHTLY_VERSION=dev20240901 +VISION_NIGHTLY_VERSION=dev20240925 # Nightly version for torchtune TUNE_NIGHTLY_VERSION=dev20240928 @@ -73,7 +73,7 @@ fi # pip packages needed by exir. REQUIREMENTS_TO_INSTALL=( - torch=="2.5.0.${PYTORCH_NIGHTLY_VERSION}" + torch=="2.6.0.${PYTORCH_NIGHTLY_VERSION}" torchvision=="0.20.0.${VISION_NIGHTLY_VERSION}" torchtune=="0.3.0.${TUNE_NIGHTLY_VERSION}" ) diff --git a/torchchat/utils/scripts/install_utils.sh b/torchchat/utils/scripts/install_utils.sh index ec9677373..f5698237f 100644 --- a/torchchat/utils/scripts/install_utils.sh +++ b/torchchat/utils/scripts/install_utils.sh @@ -178,7 +178,7 @@ clone_torchao() { git clone https://github.com/pytorch/ao.git cd ao - git checkout $(cat ${TORCHCHAT_ROOT}/intstall/.pins/torchao-pin.txt) + git checkout $(cat ${TORCHCHAT_ROOT}/install/.pins/torchao-pin.txt) popd } From 61df13b3f5a1b53722365b3b5ad5fcce94c5158a Mon Sep 17 00:00:00 2001 From: Scott Roy <161522778+metascroy@users.noreply.github.com> Date: Mon, 30 Sep 2024 11:55:47 -0700 Subject: [PATCH 2/4] remove pt update --- install/install_requirements.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/install/install_requirements.sh b/install/install_requirements.sh index 219f464ee..fa921cc69 100755 --- a/install/install_requirements.sh +++ b/install/install_requirements.sh @@ -47,13 +47,10 @@ fi # 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=dev20240925 +PYTORCH_NIGHTLY_VERSION=dev20240901 # Nightly version for torchvision -VISION_NIGHTLY_VERSION=dev20240925 - -# Nightly version for torchtune -TUNE_NIGHTLY_VERSION=dev20240928 +VISION_NIGHTLY_VERSION=dev20240901 # Uninstall triton, as nightly will depend on pytorch-triton, which is one and the same ( @@ -73,9 +70,8 @@ fi # pip packages needed by exir. REQUIREMENTS_TO_INSTALL=( - torch=="2.6.0.${PYTORCH_NIGHTLY_VERSION}" + torch=="2.5.0.${PYTORCH_NIGHTLY_VERSION}" torchvision=="0.20.0.${VISION_NIGHTLY_VERSION}" - torchtune=="0.3.0.${TUNE_NIGHTLY_VERSION}" ) # Install the requirements. --extra-index-url tells pip to look for package @@ -91,6 +87,12 @@ REQUIREMENTS_TO_INSTALL=( $PIP_EXECUTABLE install torchao=="0.5.0" ) +# Rely on the latest tochtune for flamingo support +( + set -x + $PIP_EXECUTABLE install -I git+https://github.com/pytorch/torchtune.git@d002d45e3ec700fa770d9dcc61b02c59e2507bf6 +) + if [[ -x "$(command -v nvidia-smi)" ]]; then ( set -x From ff3f2fddadcae16a16587a26fa741d078c2c6aa7 Mon Sep 17 00:00:00 2001 From: Scott Roy <161522778+metascroy@users.noreply.github.com> Date: Mon, 30 Sep 2024 11:57:08 -0700 Subject: [PATCH 3/4] remove pt update --- install/install_requirements.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install/install_requirements.sh b/install/install_requirements.sh index fa921cc69..cf832bc8d 100755 --- a/install/install_requirements.sh +++ b/install/install_requirements.sh @@ -52,6 +52,9 @@ PYTORCH_NIGHTLY_VERSION=dev20240901 # Nightly version for torchvision VISION_NIGHTLY_VERSION=dev20240901 +# Nightly version for torchtune +TUNE_NIGHTLY_VERSION=dev20240928 + # Uninstall triton, as nightly will depend on pytorch-triton, which is one and the same ( set -x @@ -72,6 +75,7 @@ fi REQUIREMENTS_TO_INSTALL=( torch=="2.5.0.${PYTORCH_NIGHTLY_VERSION}" torchvision=="0.20.0.${VISION_NIGHTLY_VERSION}" + torchtune=="0.3.0.${TUNE_NIGHTLY_VERSION}" ) # Install the requirements. --extra-index-url tells pip to look for package @@ -103,5 +107,5 @@ fi ( set -x - $PIP_EXECUTABLE install evaluate=="0.4.3" lm-eval=="0.4.2" psutil=="6.0.0" + $PIP_EXECUTABLE install lm-eval=="0.4.2" ) From f962c5169a9ff73cc2592e9a30083c386b42169e Mon Sep 17 00:00:00 2001 From: Scott Roy <161522778+metascroy@users.noreply.github.com> Date: Mon, 30 Sep 2024 11:58:37 -0700 Subject: [PATCH 4/4] remove pt update --- install/install_requirements.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/install/install_requirements.sh b/install/install_requirements.sh index cf832bc8d..cd6c302c2 100755 --- a/install/install_requirements.sh +++ b/install/install_requirements.sh @@ -91,12 +91,6 @@ REQUIREMENTS_TO_INSTALL=( $PIP_EXECUTABLE install torchao=="0.5.0" ) -# Rely on the latest tochtune for flamingo support -( - set -x - $PIP_EXECUTABLE install -I git+https://github.com/pytorch/torchtune.git@d002d45e3ec700fa770d9dcc61b02c59e2507bf6 -) - if [[ -x "$(command -v nvidia-smi)" ]]; then ( set -x @@ -107,5 +101,5 @@ fi ( set -x - $PIP_EXECUTABLE install lm-eval=="0.4.2" + $PIP_EXECUTABLE install evaluate=="0.4.3" lm-eval=="0.4.2" psutil=="6.0.0" )