Skip to content

Commit c9ff23b

Browse files
committed
github: workflows: Enable Graph builds for aarch64 CI
Signed-off-by: Hamza Butt <hamza.butt@arm.com>
1 parent 44160a1 commit c9ff23b

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

.github/automation/build_aarch64.sh

+8-1
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,24 @@ export ACL_ROOT_DIR=${ACL_ROOT_DIR:-"${PWD}/ComputeLibrary"}
3030

3131
CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-"Release"}
3232
ONEDNN_TEST_SET=SMOKE
33+
ONEDNN_BUILD_GRAPH=1
3334

3435
# ACL is not built with OMP on macOS.
3536
if [[ "$OS" == "Darwin" ]]; then
3637
ONEDNN_THREADING=SEQ
38+
if [[ "$BUILD_TOOLSET" == "clang" ]]; then
39+
if [[ "$CMAKE_BUILD_TYPE" == "Debug" ]]; then
40+
# Darwin graph tests take a lot of time in debug mode.
41+
ONEDNN_BUILD_GRAPH=0
42+
fi
43+
fi
3744
fi
3845

3946
set -x
4047
cmake \
4148
-Bbuild -S. \
4249
-DDNNL_AARCH64_USE_ACL=ON \
43-
-DONEDNN_BUILD_GRAPH=0 \
50+
-DONEDNN_BUILD_GRAPH=$ONEDNN_BUILD_GRAPH \
4451
-DDNNL_CPU_RUNTIME=$ONEDNN_THREADING \
4552
-DONEDNN_WERROR=ON \
4653
-DDNNL_BUILD_FOR_CI=ON \

.github/automation/test_aarch64.sh

+13-1
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,21 @@ if [[ "$OS" == "Linux" ]]; then
6262
SKIPPED_TEST_FAILURES+="|test_benchdnn_modeC_conv_smoke_cpu"
6363
SKIPPED_TEST_FAILURES+="|test_benchdnn_modeC_deconv_smoke_cpu"
6464
SKIPPED_TEST_FAILURES+="|test_benchdnn_modeC_matmul_smoke_cpu"
65+
SKIPPED_TEST_FAILURES+="|cpu-graph-gqa-cpp"
66+
SKIPPED_TEST_FAILURES+="|cpu-graph-mqa-cpp"
67+
SKIPPED_TEST_FAILURES+="|cpu-graph-sdpa-cpp"
68+
SKIPPED_TEST_FAILURES+="|cpu-graph-sdpa-stacked-qkv-cpp"
69+
SKIPPED_TEST_FAILURES+="|test_graph_unit_dnnl_large_partition_usm_cpu"
70+
SKIPPED_TEST_FAILURES+="|test_graph_unit_dnnl_sdp_decomp_usm_cpu"
6571
elif [[ "$CMAKE_BUILD_TYPE" == "Release" ]]; then
6672
SKIPPED_TEST_FAILURES="cpu-primitives-deconvolution-cpp"
6773
SKIPPED_TEST_FAILURES+="|test_benchdnn_modeC_lnorm_smoke_cpu"
74+
SKIPPED_TEST_FAILURES+="|cpu-graph-gqa-cpp"
75+
SKIPPED_TEST_FAILURES+="|cpu-graph-mqa-cpp"
76+
SKIPPED_TEST_FAILURES+="|cpu-graph-sdpa-cpp"
77+
SKIPPED_TEST_FAILURES+="|cpu-graph-sdpa-stacked-qkv-cpp"
78+
SKIPPED_TEST_FAILURES+="|test_graph_unit_dnnl_large_partition_usm_cpu"
79+
SKIPPED_TEST_FAILURES+="|test_graph_unit_dnnl_sdp_decomp_usm_cpu"
6880
fi
6981
elif [[ "$OS" == "Darwin" ]]; then
7082
if [[ "$CMAKE_BUILD_TYPE" == "Debug" ]]; then
@@ -85,7 +97,7 @@ if [[ "$OS" == "Darwin" ]]; then
8597
elif [[ "$OS" == "Linux" ]]; then
8698
if [[ "$ONEDNN_THREADING" == "OMP" ]]; then
8799
# OMP is already multi-threaded. Let's not oversubscribe.
88-
CTEST_MP=-j2
100+
CTEST_MP=-j3
89101
elif [[ "$ONEDNN_THREADING" == "SEQ" ]]; then
90102
CTEST_MP=$MP
91103
fi

src/graph/backend/dnnl/kernels/sdp_primitive_config.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*******************************************************************************/
1616

1717
#include "graph/backend/dnnl/kernels/sdp_primitive_config.hpp"
18+
#include "common/compiler_workarounds.hpp"
1819

1920
namespace dnnl {
2021
namespace impl {

0 commit comments

Comments
 (0)