up

.ci/docker/build.sh

@@ -259,6 +259,7 @@ case "$tag" in
     ANACONDA_PYTHON_VERSION=3.10
     CLANG_VERSION=12
     EXECUTORCH=yes
+    TRITON_CPU=yes
     ;;
   pytorch-linux-jammy-py3.12-halide)
     CUDA_VERSION=12.6

.ci/docker/ci_commit_pins/executorch.txt

@@ -1 +1 @@
-56392aa978594cc155fa8af48cd949f5b5f1823a
+6d567136baf898e682d4645781d846529b2b9bae

.ci/docker/common/install_executorch.sh

@@ -39,6 +39,10 @@ install_pip_dependencies() {
   pushd executorch
   as_jenkins bash install_executorch.sh
 
+  pushd .ci/docker
+  conda_run pip install -r requirements-ci.txt
+  popd
+
   # A workaround, ExecuTorch has moved to numpy 2.0 which is not compatible with the current
   # numba and scipy version used in PyTorch CI
   conda_run pip uninstall -y numba scipy
@@ -49,10 +53,11 @@ install_pip_dependencies() {
 setup_executorch() {
   pushd executorch
 
-  export PYTHON_EXECUTABLE=python
-  export CMAKE_ARGS="-DEXECUTORCH_BUILD_PYBIND=ON -DEXECUTORCH_BUILD_XNNPACK=ON -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON"
-
-  as_jenkins .ci/scripts/setup-linux.sh --build-tool cmake || true
+  # export PYTHON_EXECUTABLE=python
+  # export CMAKE_ARGS="-DEXECUTORCH_BUILD_PYBIND=ON -DEXECUTORCH_BUILD_XNNPACK=ON -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON -DEXECUTORCH_BUILD_EXECUTOR_RUNNER=ON -DEXECUTORCH_BUILD_TESTS=ON"
+  as_jenkins PYTHON_EXECUTABLE=python \
+  CMAKE_ARGS="-DEXECUTORCH_BUILD_EXECUTOR_RUNNER=ON -DEXECUTORCH_BUILD_TESTS=ON" \
+  .ci/scripts/setup-linux.sh "cmake" "debug" "false"
   popd
 }
 

.github/workflows/pull.yml

@@ -317,7 +317,6 @@ jobs:
     secrets: inherit
 
   linux-jammy-py3-clang12-executorch-build:
-    if: false  # Docker build needs pin update
     name: linux-jammy-py3-clang12-executorch
     uses: ./.github/workflows/_linux-build.yml
     needs: get-label-type
@@ -335,7 +334,6 @@ jobs:
     name: linux-jammy-py3-clang12-executorch
     uses: ./.github/workflows/_linux-test.yml
     needs: linux-jammy-py3-clang12-executorch-build
-    if: false # Has been broken for a while
     with:
       build-environment: linux-jammy-py3-clang12-executorch
       docker-image: ${{ needs.linux-jammy-py3-clang12-executorch-build.outputs.docker-image }}