Update

pytorch · Oct 31, 2024 · dbd4909 · dbd4909
1 parent 67f7011
commit dbd4909
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml
@@ -929,6 +929,7 @@ jobs:
           ./install/install_requirements.sh
 
           # Install ET
+          export TORCHCHAT_ROOT=$PWD
           source ./torchchat/utils/scripts/install_utils.sh
           install_executorch_python_libs
 

diff --git a/torchchat/utils/scripts/build_native.sh b/torchchat/utils/scripts/build_native.sh
@@ -66,6 +66,9 @@ fi
 pushd ${TORCHCHAT_ROOT}
 git submodule update --init
 git submodule sync
+
+find_cmake_prefix_path
+
 if [[ "$TARGET" == "et" ]]; then
   if [ ! -d "${TORCHCHAT_ROOT}/${ET_BUILD_DIR}/install" ]; then
     echo "Directory ${TORCHCHAT_ROOT}/${ET_BUILD_DIR}/install does not exist."
@@ -81,7 +84,6 @@ if [[ "$TARGET" == "et" ]]; then
     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
@@ -91,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=0" -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=0" -G Ninja
 fi
 cmake --build ./cmake-out --target "${TARGET}"_run
 

diff --git a/torchchat/utils/scripts/install_utils.sh b/torchchat/utils/scripts/install_utils.sh
@@ -23,7 +23,7 @@ install_pip_dependencies() {
 }
 
 function find_cmake_prefix_path() {
-  path=`python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())"`
+  path=`python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())"`
   MY_CMAKE_PREFIX_PATH=$path
 }