up

Author: metascroy

.github/workflows/pull.yml

@@ -1198,17 +1198,17 @@ jobs:
             sysctl machdep.cpu.brand_string
             sysctl machdep.cpu.core_count
           fi
-      - name: Install ET
-        run: |
-          echo "Installing ExecuTorch"
-          export TORCHCHAT_ROOT=${PWD}
-          bash torchchat/utils/scripts/install_et.sh
       - name: Install torchchat
         run: |
           echo "Intalling pip3 packages"
           ./install/install_requirements.sh
           pip3 list
           python3 -c 'import torch;print(f"torch: {torch.__version__, torch.version.git_version}")'
+      - name: Install ET
+        run: |
+          echo "Installing ExecuTorch"
+          export TORCHCHAT_ROOT=${PWD}
+          bash torchchat/utils/scripts/install_et.sh
       - name: Install torchao-ops
         id: install-torchao-ops
         run: |

runner/aoti.cmake

@@ -15,7 +15,7 @@ ENDIF()
 
 find_package(CUDA)
 
-find_package(Torch 2.4.0)
+find_package(Torch REQUIRED)
 if(Torch_FOUND)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ${TORCH_CXX_FLAGS} -fpermissive")
 

torchchat/utils/scripts/build_native.sh

@@ -57,6 +57,7 @@ while (( "$#" )); do
 done
 
 source "$(dirname "${BASH_SOURCE[0]}")/install_utils.sh"
+find_cmake_prefix_path
 
 if [ -z "${ET_BUILD_DIR}" ]; then
     ET_BUILD_DIR="et-build"
@@ -80,8 +81,6 @@ if [[ "$TARGET" == "et" ]]; then
       exit 1
     fi
 
-    source "$(dirname "${BASH_SOURCE[0]}")/install_utils.sh"
-    find_cmake_prefix_path
     EXECUTORCH_INCLUDE_DIRS="${TORCHCHAT_ROOT}/${ET_BUILD_DIR}/install/include;${TORCHCHAT_ROOT}/${ET_BUILD_DIR}/src"
     EXECUTORCH_LIBRARIES="${TORCHCHAT_ROOT}/${ET_BUILD_DIR}/install/lib/libexecutorch_no_prim_ops.a;${TORCHCHAT_ROOT}/${ET_BUILD_DIR}/install/lib/libextension_threadpool.a;${TORCHCHAT_ROOT}/${ET_BUILD_DIR}/install/lib/libcpuinfo.a;${TORCHCHAT_ROOT}/${ET_BUILD_DIR}/install/lib/libpthreadpool.a"
     install_torchao_executorch_ops
@@ -94,9 +93,9 @@ popd
 
 # CMake commands
 if [[ "$TARGET" == "et" ]]; then
-    cmake -S . -B ./cmake-out -DCMAKE_PREFIX_PATH=`python3 -c 'import torch;print(torch.utils.cmake_prefix_path)'` -DLINK_TORCHAO_OPS="${LINK_TORCHAO_OPS}" -DET_USE_ADAPTIVE_THREADS=ON -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=1" -G Ninja
+    cmake -S . -B ./cmake-out -DCMAKE_PREFIX_PATH="${MY_CMAKE_PREFIX_PATH}" -DLINK_TORCHAO_OPS="${LINK_TORCHAO_OPS}" -DET_USE_ADAPTIVE_THREADS=ON -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=1" -G Ninja
 else
-    cmake -S . -B ./cmake-out -DCMAKE_PREFIX_PATH=`python3 -c 'import torch;print(torch.utils.cmake_prefix_path)'` -DLINK_TORCHAO_OPS="${LINK_TORCHAO_OPS}" -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=1" -G Ninja
+    cmake -S . -B ./cmake-out -DCMAKE_PREFIX_PATH="${MY_CMAKE_PREFIX_PATH}" -DLINK_TORCHAO_OPS="${LINK_TORCHAO_OPS}" -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=1" -G Ninja
 fi
 cmake --build ./cmake-out --target "${TARGET}"_run
 

torchchat/utils/scripts/install_utils.sh

@@ -186,6 +186,8 @@ 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