Skip to content

Commit 6fb3b98

Browse files
authored
Merge branch 'main' into GraniteCodeSupport
2 parents 78a3637 + fd1857a commit 6fb3b98

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

install/.pins/torchao-pin.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7d7c14e898eca3fe66138d2a9445755a9270b800
1+
2e032c6b0de960dee554dcb08126ace718b14c6d

install/install_requirements.sh

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,31 +44,20 @@ fi
4444

4545
echo "Using pip executable: $PIP_EXECUTABLE"
4646

47-
#
48-
# First install requirements in install/requirements.txt. Older torch may be
49-
# installed from the dependency of other models. It will be overridden by
50-
# newer version of torch nightly installed later in this script.
51-
#
52-
53-
(
54-
set -x
55-
$PIP_EXECUTABLE install -r install/requirements.txt --extra-index-url https://download.pytorch.org/whl/nightly/cu121
56-
)
57-
5847
# Since torchchat often uses main-branch features of pytorch, only the nightly
5948
# pip versions will have the required features. The PYTORCH_NIGHTLY_VERSION value should
6049
# agree with the third-party/pytorch pinned submodule commit.
6150
#
6251
# NOTE: If a newly-fetched version of the executorch repo changes the value of
6352
# PYTORCH_NIGHTLY_VERSION, you should re-run this script to install the necessary
6453
# package versions.
65-
PYTORCH_NIGHTLY_VERSION=dev20241213
54+
PYTORCH_NIGHTLY_VERSION=dev20241218
6655

6756
# Nightly version for torchvision
68-
VISION_NIGHTLY_VERSION=dev20241213
57+
VISION_NIGHTLY_VERSION=dev20241218
6958

7059
# Nightly version for torchtune
71-
TUNE_NIGHTLY_VERSION=dev20241126
60+
TUNE_NIGHTLY_VERSION=dev20241218
7261

7362
# Uninstall triton, as nightly will depend on pytorch-triton, which is one and the same
7463
(
@@ -96,6 +85,16 @@ REQUIREMENTS_TO_INSTALL=(
9685
torchtune=="0.5.0.${TUNE_NIGHTLY_VERSION}"
9786
)
9887

88+
#
89+
# First install requirements in install/requirements.txt. Older torch may be
90+
# installed from the dependency of other models. It will be overridden by
91+
# newer version of torch nightly installed later in this script.
92+
#
93+
(
94+
set -x
95+
$PIP_EXECUTABLE install -r install/requirements.txt --extra-index-url "${TORCH_NIGHTLY_URL}"
96+
)
97+
9998
# Install the requirements. --extra-index-url tells pip to look for package
10099
# versions on the provided URL if they aren't available on the default URL.
101100
(

torchchat/utils/quantize.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -932,13 +932,15 @@ def quantized_model(self) -> nn.Module:
932932
libs = glob.glob(f"{torchao_build_path}/cmake-out/lib/libtorchao_ops_aten.*")
933933
libs = list(filter(lambda l: (l.endswith("so") or l.endswith("dylib")), libs))
934934
torch.ops.load_library(libs[0])
935+
print("Loaded torchao cpu ops.")
935936
except Exception as e:
936937
print("Unabled to load torchao cpu ops library. Slow fallback kernels will be used.")
937938

938939
try:
939940
libname = "libtorchao_ops_mps_aten.dylib"
940941
libpath = f"{torchao_build_path}/cmake-out/lib/{libname}"
941942
torch.ops.load_library(libpath)
943+
print("Loaded torchao mps ops.")
942944
except Exception as e:
943945
print("Unabled to load torchao mps ops library.")
944946

0 commit comments

Comments
 (0)