Skip to content

Commit 8069564

Browse files
committed
Use scons
Change-Id: Ie1ae58fba0c7c15fec82f4026e15dd1dc53f21f1
1 parent 880741d commit 8069564

File tree

2 files changed

+37
-3
lines changed

2 files changed

+37
-3
lines changed

.github/automation/build_acl.sh

+26-3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,23 @@ elif [[ "$ACL_THREADING" == "SEQ" ]]; then
3636
ACL_OPENMP=0
3737
fi
3838

39+
if [[ "$OS" == "Linux" ]]; then
40+
ACL_MULTI_ISA_SUPPORT=1
41+
if [[ "$ACL_THREADING" == "OMP" ]]; then
42+
ACL_OPENMP=1
43+
elif [[ "$ACL_THREADING" == "SEQ" ]]; then
44+
ACL_OPENMP=0
45+
fi
46+
ACL_OS="linux"
47+
elif [[ "$OS" == "Darwin" ]]; then
48+
ACL_MULTI_ISA_SUPPORT=0
49+
ACL_OPENMP=0
50+
ACL_OS="macos"
51+
else
52+
echo "Unknown OS: $OS"
53+
exit 1
54+
fi
55+
3956
if [[ "$ACL_ACTION" == "clone" ]]; then
4057
set -x
4158
git clone --branch $ACL_VERSION --depth 1 $ACL_REPO $ACL_ROOT_DIR
@@ -49,12 +66,18 @@ elif [[ "$ACL_ACTION" == "configure" ]]; then
4966
-DARM_COMPUTE_WERROR=0 \
5067
-DARM_COMPUTE_BUILD_EXAMPLES=1 \
5168
-DARM_COMPUTE_BUILD_TESTING=1 \
52-
-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
53-
-DARM_COMPUTE_ARCH=native
69+
-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE
5470
set +x
5571
elif [[ "$ACL_ACTION" == "build" ]]; then
5672
set -x
57-
cmake --build $ACL_ROOT_DIR/build
73+
# cmake --build $ACL_ROOT_DIR/build
74+
cd $ACL_ROOT_DIR
75+
set -x
76+
scons $MP Werror=0 debug=$ACL_DEBUG neon=1 opencl=0 embed_kernels=0 \
77+
os=$ACL_OS arch=armv8.2-a build=native multi_isa=$ACL_MULTI_ISA_SUPPORT \
78+
fixed_format_kernels=1 cppthreads=0 openmp=$ACL_OPENMP examples=0 \
79+
validation_tests=0
80+
set +x
5881
set +x
5982
else
6083
echo "Unknown action: $ACL_ACTION"

.github/workflows/aarch64-acl.yml

+11
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ jobs:
6565
cmakeVersion: 3.31.0
6666
ninjaVersion: 1.12.0
6767

68+
- name: Install Scons
69+
uses: threeal/pipx-install-action@b0bf0add7d5aefda03a3d4e47d651df807889e10 # v1.0.0
70+
with:
71+
packages: scons
72+
6873
- name: Read version file
6974
id: get-versions
7075
run: |
@@ -116,6 +121,12 @@ jobs:
116121
run: ${{ github.workspace }}/oneDNN/.github/automation/build_acl.sh
117122
env:
118123
ACL_ACTION: build
124+
ACL_ROOT_DIR: ${{ github.workspace }}/ComputeLibrary
125+
ACL_THREADING: ${{ matrix.config.threading }}
126+
BUILD_TOOLSET: ${{ matrix.config.toolset }}
127+
CMAKE_BUILD_TYPE: ${{ matrix.config.build }}
128+
CMAKE_GENERATOR: Ninja
129+
GCC_VERSION: ${{ fromJson(steps.get-versions.outputs.output).dependencies.gcc }}
119130

120131
- name: Get system name
121132
id: get_system_name

0 commit comments

Comments
 (0)