ci fixes

Author: metascroy

.github/workflows/pull.yml

@@ -915,16 +915,17 @@ jobs:
         continue-on-error: true
         run: |
           echo "Installing ExecuTorch"
-          bash torchchat/utils/scripts/build_native.sh et
+          bash torchchat/utils/scripts/install_et.sh
       - name: Install ExecuTorch python
         run: |
           echo "Install ExecuTorch python"
+          export TORCHCHAT_ROOT=$PWD
           source "torchchat/utils/scripts/install_utils.sh"
           install_executorch_python_libs
       - name: Install runner
         run: |
           echo "Installing runner"
-          bash torchchat/utils/scripts/build_native.sh et skip_et_install
+          bash torchchat/utils/scripts/build_native.sh et
       - name: Run inference
         run: |
           python torchchat.py download stories15M
@@ -1077,11 +1078,11 @@ jobs:
         continue-on-error: true
         run: |
           echo "Installing ExecuTorch"
-          bash torchchat/utils/scripts/build_native.sh et link_torchao
+          bash torchchat/utils/scripts/install_et.sh
       - name: Install runner
         run: |
           echo "Installing runner"
-          bash torchchat/utils/scripts/build_native.sh et skip_et_install link_torchao
+          bash torchchat/utils/scripts/build_native.sh et link_torchao
       - name: Install runner AOTI
         id: install-runner-aoti
         run: |

runner/build_android.sh

@@ -41,5 +41,5 @@ install_executorch_python_libs $ENABLE_ET_PYBIND
 export CMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake
 export ANDROID_ABI=arm64-v8a
 export ANDROID_PLATFORM=android-23
-install_executorch
+install_executorch_cpp_libs
 build_runner_et

torchchat/utils/scripts/build_native.sh

@@ -27,7 +27,6 @@ if [ $# -eq 0 ]; then
 fi
 
 LINK_TORCHAO=OFF
-SKIP_ET_INSTALL=OFF
 while (( "$#" )); do
   case "$1" in
     -h|--help)
@@ -49,11 +48,6 @@ while (( "$#" )); do
       LINK_TORCHAO=ON
       shift
       ;;
-    skip_et_install)
-      echo "Skipping ET install..."
-      SKIP_ET_INSTALL=ON
-      shift
-      ;;
     *)
       echo "Invalid option: $1"
       show_help
@@ -73,18 +67,23 @@ pushd ${TORCHCHAT_ROOT}
 git submodule update --init
 git submodule sync
 if [[ "$TARGET" == "et" ]]; then
-    find_cmake_prefix_path
-    if [[ "$SKIP_ET_INSTALL" == "OFF" ]]; then
-      install_pip_dependencies
-      clone_executorch
-      install_executorch_libs false
-    fi
+  if [ ! -d "${TORCHCHAT_ROOT}/${ET_BUILD_DIR}/install" ]; then
+    echo "Directory ${TORCHCHAT_ROOT}/${ET_BUILD_DIR}/install does not exist."
+    echo "Make sure you run install_executorch_libs"
+    exit 1
+  fi
 
-    if [[ "$LINK_TORCHAO" == "ON" ]]; then
-      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_custom_executorch_ops
+  if [[ "$LINK_TORCHAO" == "ON" ]]; then
+    if [ ! -d "${TORCHCHAT_ROOT}/torchao-build" ]; then
+      echo "Directory ${TORCHCHAT_ROOT}/torchao-build does not exist."
+      echo "Make sure you run clone_torchao"
+      exit 1
     fi
+    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_custom_executorch_ops
+  fi
 fi
 popd
 

torchchat/utils/scripts/install_utils.sh

@@ -107,7 +107,7 @@ COMMON_CMAKE_ARGS="\
     -DEXECUTORCH_BUILD_XNNPACK=ON \
     -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON"
 
-install_executorch() {
+install_executorch_cpp_libs() {
   # AOT lib has to be build for model export
   # So by default it is built, and you can explicitly opt-out
   EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT_VAR=OFF
@@ -156,7 +156,7 @@ install_executorch() {
 }
 
 install_executorch_libs() {
-  install_executorch
+  install_executorch_cpp_libs
   install_executorch_python_libs $1
 }