Merge branch 'pytorch:main' into patch-5

mikekgfb · web-flow · commit 572d97962de0 · 2024-10-16T16:18:59.000-07:00
diff --git a/install/install_requirements.sh b/install/install_requirements.sh
@@ -53,7 +53,7 @@ PYTORCH_NIGHTLY_VERSION=dev20241002
 VISION_NIGHTLY_VERSION=dev20241002
 
 # Nightly version for torchtune
-TUNE_NIGHTLY_VERSION=dev20240928
+TUNE_NIGHTLY_VERSION=dev20241010
 
 # Uninstall triton, as nightly will depend on pytorch-triton, which is one and the same
 (
@@ -78,7 +78,7 @@ fi
 REQUIREMENTS_TO_INSTALL=(
   torch=="2.6.0.${PYTORCH_NIGHTLY_VERSION}"
   torchvision=="0.20.0.${VISION_NIGHTLY_VERSION}"
-  torchtune=="0.3.0.${TUNE_NIGHTLY_VERSION}"
+  torchtune=="0.4.0.${TUNE_NIGHTLY_VERSION}"
 )
 
 # Install the requirements. --extra-index-url tells pip to look for package
diff --git a/install/requirements.txt b/install/requirements.txt
@@ -12,7 +12,8 @@ tiktoken
 # Miscellaneous
 snakeviz
 sentencepiece
-numpy < 2.0
+# numpy version range required by GGUF util
+numpy >= 1.17, < 2.0
 gguf
 blobfile
 tomli >= 1.1.0 ; python_version < "3.11"

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ PYTORCH_NIGHTLY_VERSION=dev20241002`
`53`	`53`	`VISION_NIGHTLY_VERSION=dev20241002`
`54`	`54`
`55`	`55`	`# Nightly version for torchtune`
`56`		`-TUNE_NIGHTLY_VERSION=dev20240928`
	`56`	`+TUNE_NIGHTLY_VERSION=dev20241010`
`57`	`57`
`58`	`58`	`# Uninstall triton, as nightly will depend on pytorch-triton, which is one and the same`
`59`	`59`	`(`
`@@ -78,7 +78,7 @@ fi`
`78`	`78`	`REQUIREMENTS_TO_INSTALL=(`
`79`	`79`	`torch=="2.6.0.${PYTORCH_NIGHTLY_VERSION}"`
`80`	`80`	`torchvision=="0.20.0.${VISION_NIGHTLY_VERSION}"`
`81`		`- torchtune=="0.3.0.${TUNE_NIGHTLY_VERSION}"`
	`81`	`+ torchtune=="0.4.0.${TUNE_NIGHTLY_VERSION}"`
`82`	`82`	`)`
`83`	`83`
`84`	`84`	`# Install the requirements. --extra-index-url tells pip to look for package`