ci fixes

Author: metascroy

.github/workflows/pull.yml

@@ -452,7 +452,6 @@ jobs:
           echo "Intalling pip3 packages"
           ./install/install_requirements.sh
 
-          export TORCHCHAT_ROOT=$PWD
           ./torchchat/utils/scripts/install_et.sh
 
           pip3 list
@@ -621,6 +620,9 @@ jobs:
           python torchchat.py remove stories15m
 
   test-mps:
+    uses: actions/setup-python@v2
+      with:
+        python-version: 3.10.11
     uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
     with:
       runner: macos-m1-stable  # neeps MPS, was macos-m1-stable
@@ -733,6 +735,9 @@ jobs:
 
           echo "Tests complete."
   test-mps-dtype:
+    uses: actions/setup-python@v2
+      with:
+        python-version: 3.10.11
     uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
     with:
       runner: macos-m1-stable  # needs MPS, was macos-m1-stable
@@ -915,30 +920,6 @@ jobs:
         run: |
           echo "Installing ExecuTorch"
           bash torchchat/utils/scripts/build_native.sh et
-      - name: Install ET pip
-        run: |
-          echo "ET build directory"
-          ls et-build | cat
-
-          pushd et-build/src/executorch
-          if [ $(git rev-parse HEAD) != ${{env.et-git-hash}} ]; then
-            echo "Mismatched hash.  Make sure branch install_et.sh matches branch from Github cache."
-            echo "On commit $(git rev-parse HEAD)"
-            echo "Expected commit ${{env.et-git-hash}}"
-            exit 1
-          fi
-          pip install .
-          popd
-      - name: Install runner
-        run: |
-          # Pull submodules (re2, abseil) for Tiktoken
-          git submodule sync
-          git submodule update --init
-
-          export TORCHCHAT_ROOT=${PWD}
-          cmake -S . -B ./cmake-out -G Ninja
-          cmake --build ./cmake-out --target et_run
-
       - name: Run inference
         run: |
           python torchchat.py download stories15M

runner/build_android.sh

@@ -22,6 +22,7 @@ fi
 export ET_BUILD_DIR="et-build-android"
 export CMAKE_OUT_DIR="cmake-out-android"
 export EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT="OFF"
+export EXECUTORCH_BUILD_EXTENSION_TENSOR="ON"
 export EXECUTORCH_BUILD_KERNELS_CUSTOM="ON"
 export CMAKE_OUT_DIR="cmake-out-android"
 # export DCMAKE_INSTALL_PREFIX=cmake-out-android