up

Author: metascroy

.github/workflows/pull.yml

@@ -1154,10 +1154,10 @@ jobs:
           ./install/install_requirements.sh
           pip3 list
           python3 -c 'import torch;print(f"torch: {torch.__version__, torch.version.git_version}")'
-      - name: Install torchao-ops
-        id: install-torchao-ops
+      - name: Clone torchao
+        id: clone-torchao
         run: |
-          bash torchchat/utils/scripts/build_torchao_ops.sh
+          bash torchchat/utils/scripts/clone_torchao.sh
       - name: Install runner
         run: |
           echo "Installing runner"
@@ -1209,10 +1209,10 @@ jobs:
           echo "Installing ExecuTorch"
           export TORCHCHAT_ROOT=${PWD}
           bash torchchat/utils/scripts/install_et.sh
-      - name: Install torchao-ops
-        id: install-torchao-ops
+      - name: Clone torchao
+        id: clone-torchao
         run: |
-          bash torchchat/utils/scripts/build_torchao_ops.sh
+          bash torchchat/utils/scripts/clone_torchao.sh
       - name: Install runner
         run: |
           echo "Installing runner"
@@ -1256,6 +1256,7 @@ jobs:
       - name: Install torchao-ops-mps
         id: install-torchao-ops-mps
         run: |
+          bash torchchat/utils/scripts/clone_torchao.sh
           bash torchchat/utils/scripts/build_torchao_ops.sh mps
       - name: Run inference
         run: |

torchchat/utils/scripts/build_native.sh

@@ -88,6 +88,7 @@ if [[ "$TARGET" == "et" ]]; then
 elif [[ "$LINK_TORCHAO_OPS" == "ON" ]]; then
    # Install OMP when using AOTI with linked torchao ops
    brew install libomp
+   install_torchao_aten_ops cpu
 fi
 popd
 

torchchat/utils/scripts/build_torchao_ops.sh

@@ -16,6 +16,5 @@ source "$(dirname "${BASH_SOURCE[0]}")/install_utils.sh"
 
 pushd ${TORCHCHAT_ROOT}
 find_cmake_prefix_path
-clone_torchao
 install_torchao_aten_ops "$device"
 popd

torchchat/utils/scripts/clone_torchao.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+source "$(dirname "${BASH_SOURCE[0]}")/install_utils.sh"
+
+pushd ${TORCHCHAT_ROOT}
+clone_torchao
+popd

torchchat/utils/scripts/install_utils.sh

@@ -204,7 +204,7 @@ install_torchao_aten_ops() {
     -DCMAKE_INSTALL_PREFIX=${CMAKE_OUT_DIR} \
     -DTORCHAO_BUILD_CPU_AARCH64=ON \
     -DTORCHAO_PARALLEL_BACKEND=OPENMP \
-    -DOpenMP_ROOT="/opt/homebrew/opt/libomp" \
+    -DOpenMP_ROOT="$(brew --prefix)/opt/libomp" \
     -DCMAKE_BUILD_TYPE="Release" \
     -S . \
     -B ${CMAKE_OUT_DIR} -G Ninja