Use scons

Change-Id: Ie1ae58fba0c7c15fec82f4026e15dd1dc53f21f1
oneapi-src · Jan 16, 2025 · 8069564 · 8069564
1 parent 880741d
commit 8069564
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/.github/automation/build_acl.sh b/.github/automation/build_acl.sh
@@ -36,6 +36,23 @@ elif [[ "$ACL_THREADING" == "SEQ" ]]; then
     ACL_OPENMP=0
 fi
 
+if [[ "$OS" == "Linux" ]]; then
+    ACL_MULTI_ISA_SUPPORT=1
+    if [[ "$ACL_THREADING" == "OMP" ]]; then
+        ACL_OPENMP=1
+    elif [[ "$ACL_THREADING" == "SEQ" ]]; then
+        ACL_OPENMP=0
+    fi
+    ACL_OS="linux"
+elif [[ "$OS" == "Darwin" ]]; then
+    ACL_MULTI_ISA_SUPPORT=0
+    ACL_OPENMP=0
+    ACL_OS="macos"
+else
+    echo "Unknown OS: $OS"
+    exit 1
+fi
+
 if [[ "$ACL_ACTION" == "clone" ]]; then
     set -x
     git clone --branch $ACL_VERSION --depth 1 $ACL_REPO $ACL_ROOT_DIR
@@ -49,12 +66,18 @@ elif [[ "$ACL_ACTION" == "configure" ]]; then
 	-DARM_COMPUTE_WERROR=0 \
 	-DARM_COMPUTE_BUILD_EXAMPLES=1 \
 	-DARM_COMPUTE_BUILD_TESTING=1 \
-    -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
-    -DARM_COMPUTE_ARCH=native
+    -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE
     set +x
 elif [[ "$ACL_ACTION" == "build" ]]; then
     set -x
-    cmake --build $ACL_ROOT_DIR/build 
+    # cmake --build $ACL_ROOT_DIR/build 
+    cd $ACL_ROOT_DIR
+    set -x
+    scons $MP Werror=0 debug=$ACL_DEBUG neon=1 opencl=0 embed_kernels=0 \
+        os=$ACL_OS arch=armv8.2-a build=native multi_isa=$ACL_MULTI_ISA_SUPPORT \
+        fixed_format_kernels=1 cppthreads=0 openmp=$ACL_OPENMP examples=0 \
+        validation_tests=0
+    set +x
     set +x
 else
     echo "Unknown action: $ACL_ACTION"

diff --git a/.github/workflows/aarch64-acl.yml b/.github/workflows/aarch64-acl.yml
@@ -65,6 +65,11 @@ jobs:
           cmakeVersion: 3.31.0
           ninjaVersion: 1.12.0
 
+      - name: Install Scons
+        uses: threeal/pipx-install-action@b0bf0add7d5aefda03a3d4e47d651df807889e10 # v1.0.0
+        with:
+          packages: scons
+
       - name: Read version file
         id: get-versions
         run: |
@@ -116,6 +121,12 @@ jobs:
         run: ${{ github.workspace }}/oneDNN/.github/automation/build_acl.sh
         env:
           ACL_ACTION: build
+          ACL_ROOT_DIR: ${{ github.workspace }}/ComputeLibrary
+          ACL_THREADING: ${{ matrix.config.threading }}
+          BUILD_TOOLSET: ${{ matrix.config.toolset }}
+          CMAKE_BUILD_TYPE: ${{ matrix.config.build }}
+          CMAKE_GENERATOR: Ninja
+          GCC_VERSION: ${{ fromJson(steps.get-versions.outputs.output).dependencies.gcc }}
 
       - name: Get system name
         id: get_system_name