up

Author: metascroy

install/install_requirements.sh

@@ -126,15 +126,7 @@ then
 )
 fi
 
-# For torchao need to install from github since nightly build doesn't have macos build.
-# TODO: Remove this and install nightly build, once it supports macos
-# USE_CPP=1 indicates that the torchao experimental aten kernels will be built and loaded
-# if on Mac with Apple Silicon
-export TORCHAO_PIN=$(cat install/.pins/torchao-pin.txt)
-(
-  set -x
-  USE_CPP=1 $PIP_EXECUTABLE install git+https://github.com/pytorch/ao.git@${TORCHAO_PIN}
-)
+bash install/install_torchao.sh
 
 if [[ -x "$(command -v nvidia-smi)" ]]; then
   (

torchchat/utils/scripts/install_et.sh

@@ -19,4 +19,8 @@ pushd ${TORCHCHAT_ROOT}
 find_cmake_prefix_path
 clone_executorch
 install_executorch_libs $ENABLE_ET_PYBIND
+
+# During installation, ET uninstalls torchchat's preferred version of torchao
+# so we reinstall here
+bash install/install/install_torchao.sh
 popd

torchchat/utils/scripts/install_utils.sh

@@ -186,8 +186,6 @@ clone_torchao() {
 install_torchao_aten_ops() {
   local device=${1:-cpu}
 
-  USE_CPP=1 pip install "${TORCHCHAT_ROOT}/torchao-build/src/ao"
-
   if [[ "$device" == "cpu" ]]; then
     echo "Building torchao custom ops for ATen"
     pushd ${TORCHCHAT_ROOT}/torchao-build/src/ao/torchao/experimental