Skip to content

Commit 0df9b4e

Browse files
taoye9taoye9
committed
merge to
Change-Id: Iabd6887b4e04616431db597fb51b55f6f689376d
1 parent bef9382 commit 0df9b4e

File tree

1 file changed

+64
-132
lines changed

1 file changed

+64
-132
lines changed

‎.github/workflows/ci-aarch64.yml

+64-132
Original file line numberDiff line numberDiff line change
@@ -34,61 +34,65 @@ concurrency:
3434
permissions: read-all
3535

3636
jobs:
37-
# macos:
38-
# name: macOS
39-
# runs-on: macos-14
40-
# strategy:
41-
# matrix:
42-
# toolset: [clang, gcc]
43-
# config: [Debug, Release]
44-
45-
# steps:
46-
# - name: Checkout oneDNN
47-
# uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
48-
# with:
49-
# path: oneDNN
50-
51-
# - name: Install Scons
52-
# uses: threeal/pipx-install-action@b0bf0add7d5aefda03a3d4e47d651df807889e10 # v1.0.0
53-
# with:
54-
# packages: scons
55-
56-
# - name: Build ACL
57-
# run: ${{ github.workspace }}/oneDNN/.github/automation/build_acl.sh
58-
# env:
59-
# ACL_ROOT_DIR: ${{ github.workspace }}/ComputeLibrary
60-
# BUILD_TOOLSET: ${{ matrix.toolset }}
61-
# ACL_CONFIG: ${{ matrix.config }}
62-
# GCC_VERSION: 14
63-
64-
# - name: Build oneDNN
65-
# run: ${{ github.workspace }}/oneDNN/.github/automation/build_aarch64.sh
66-
# working-directory: ${{ github.workspace }}/oneDNN
67-
# env:
68-
# ACL_ROOT_DIR: ${{ github.workspace }}/ComputeLibrary
69-
# BUILD_TOOLSET: ${{ matrix.toolset }}
70-
# CMAKE_BUILD_TYPE: ${{ matrix.config }}
71-
# GCC_VERSION: 14
72-
73-
# - name: Run oneDNN smoke tests
74-
# run: ${{ github.workspace }}/oneDNN/.github/automation/test_aarch64.sh
75-
# working-directory: ${{ github.workspace }}/oneDNN/build
76-
# env:
77-
# CMAKE_BUILD_TYPE: ${{ matrix.config }}
78-
# DYLD_LIBRARY_PATH: ${{ github.workspace }}/ComputeLibrary/build
37+
macos:
38+
name: macOS
39+
runs-on: macos-14
40+
strategy:
41+
matrix:
42+
toolset: [clang, gcc]
43+
config: [Debug, Release]
44+
45+
steps:
46+
- name: Checkout oneDNN
47+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
48+
with:
49+
path: oneDNN
50+
51+
- name: Install Scons
52+
uses: threeal/pipx-install-action@b0bf0add7d5aefda03a3d4e47d651df807889e10 # v1.0.0
53+
with:
54+
packages: scons
55+
56+
- name: Build ACL
57+
run: ${{ github.workspace }}/oneDNN/.github/automation/build_acl.sh
58+
env:
59+
ACL_ROOT_DIR: ${{ github.workspace }}/ComputeLibrary
60+
BUILD_TOOLSET: ${{ matrix.toolset }}
61+
ACL_CONFIG: ${{ matrix.config }}
62+
GCC_VERSION: 14
63+
64+
- name: Build oneDNN
65+
run: ${{ github.workspace }}/oneDNN/.github/automation/build_aarch64.sh
66+
working-directory: ${{ github.workspace }}/oneDNN
67+
env:
68+
ACL_ROOT_DIR: ${{ github.workspace }}/ComputeLibrary
69+
BUILD_TOOLSET: ${{ matrix.toolset }}
70+
CMAKE_BUILD_TYPE: ${{ matrix.config }}
71+
GCC_VERSION: 14
72+
73+
- name: Run oneDNN smoke tests
74+
run: ${{ github.workspace }}/oneDNN/.github/automation/test_aarch64.sh
75+
working-directory: ${{ github.workspace }}/oneDNN/build
76+
env:
77+
CMAKE_BUILD_TYPE: ${{ matrix.config }}
78+
DYLD_LIBRARY_PATH: ${{ github.workspace }}/ComputeLibrary/build
7979

80-
# We only run the linux aarch64 runners if macos smoke tests pass.
81-
linux-TP:
82-
# needs: macos
80+
# We only run the linux aarch64 runners if macOS smoke tests pass.
81+
linux:
82+
needs: macos
8383
strategy:
8484
matrix:
85-
toolset: [clang]
86-
threading: [TP]
87-
config: [Release]
85+
threading: [OMP]
86+
toolset: [clang, gcc]
87+
config: [Debug, Release]
8888
host: [
8989
{ name: c6g, label: ah-ubuntu_22_04-c6g_2x-50 },
9090
{ name: c7g, label: ah-ubuntu_22_04-c7g_2x-50 }
9191
]
92+
include:
93+
- toolset: clang
94+
config: Release
95+
threading: TP
9296

9397
name: ${{ matrix.host.name }}, ${{ matrix.toolset }}, ${{ matrix.threading }}, ${{ matrix.config }}
9498
runs-on: ${{ matrix.host.label }}
@@ -102,12 +106,11 @@ jobs:
102106
run: |
103107
sudo apt update -y
104108
sudo apt install -y scons cmake make
105-
106-
- if: matrix.toolset == 'clang'
107-
name: Install clang
108-
uses: KyleMayes/install-llvm-action@e0a8dc9cb8a22e8a7696e8a91a4e9581bec13181
109-
with:
110-
version: "17"
109+
110+
- if: matrix.threading == 'OMP'
111+
name: Install openmp
112+
run: |
113+
sudo apt install -y libomp-dev
111114
112115
- if: matrix.toolset == 'gcc'
113116
name: Install gcc
@@ -116,6 +119,12 @@ jobs:
116119
sudo apt update -y
117120
sudo apt install -y g++-13
118121
122+
- if: matrix.toolset == 'clang'
123+
name: Install clang
124+
uses: KyleMayes/install-llvm-action@e0a8dc9cb8a22e8a7696e8a91a4e9581bec13181
125+
with:
126+
version: "17"
127+
119128
- if: matrix.threading == 'TP'
120129
name: Install eigen3
121130
working-directory: ${{ github.workspace }}
@@ -128,11 +137,6 @@ jobs:
128137
git checkout aa6964bf3a34fd607837dd8123bc42465185c4f8
129138
cd ..
130139
${{ github.workspace }}/oneDNN/.github/automation/build-eigen-headers.sh
131-
132-
- if: matrix.threading == 'OMP'
133-
name: Install openmp
134-
run: |
135-
sudo apt install -y libomp-dev
136140
137141
- name: Build ACL
138142
run: ${{ github.workspace }}/oneDNN/.github/automation/build_acl.sh
@@ -162,76 +166,4 @@ jobs:
162166
BUILD_TOOLSET: ${{ matrix.toolset }}
163167
CMAKE_BUILD_TYPE: ${{ matrix.config }}
164168
DYLD_LIBRARY_PATH: ${{ github.workspace }}/ComputeLibrary/build
165-
ONEDNN_THREADING: ${{ matrix.threading }}
166-
167-
# # We only run the linux aarch64 runners if macos smoke tests pass.
168-
# linux-OMP:
169-
# needs: macos
170-
# strategy:
171-
# matrix:
172-
# threading: [SEQ, OMP]
173-
# toolset: [clang, gcc]
174-
# config: [Debug, Release]
175-
# host: [
176-
# { name: c6g, label: ah-ubuntu_22_04-c6g_2x-50 },
177-
# { name: c7g, label: ah-ubuntu_22_04-c7g_2x-50 }
178-
# ]
179-
180-
# name: ${{ matrix.host.name }}, ${{ matrix.toolset }}, ${{ matrix.threading }}, ${{ matrix.config }}
181-
# runs-on: ${{ matrix.host.label }}
182-
# steps:
183-
# - name: Checkout oneDNN
184-
# uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
185-
# with:
186-
# path: oneDNN
187-
188-
# - name: Install dev tools
189-
# run: |
190-
# sudo apt update -y
191-
# sudo apt install -y scons cmake make
192-
193-
# - if: matrix.threading == 'OMP'
194-
# name: Install openmp
195-
# run: |
196-
# sudo apt install -y libomp-dev
197-
198-
# - if: matrix.toolset == 'gcc'
199-
# name: Install gcc
200-
# run: |
201-
# sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
202-
# sudo apt update -y
203-
# sudo apt install -y g++-13
204-
205-
# - if: matrix.toolset == 'clang'
206-
# name: Install clang
207-
# uses: KyleMayes/install-llvm-action@e0a8dc9cb8a22e8a7696e8a91a4e9581bec13181
208-
# with:
209-
# version: "17"
210-
211-
# - name: Build ACL
212-
# run: ${{ github.workspace }}/oneDNN/.github/automation/build_acl.sh
213-
# env:
214-
# ACL_CONFIG: ${{ matrix.config }}
215-
# ACL_ROOT_DIR: ${{ github.workspace }}/ComputeLibrary
216-
# BUILD_TOOLSET: ${{ matrix.toolset }}
217-
# GCC_VERSION: 13
218-
# ACL_THREADING: ${{ matrix.threading }}
219-
220-
# - name: Build oneDNN
221-
# run: ${{ github.workspace }}/oneDNN/.github/automation/build_aarch64.sh
222-
# working-directory: ${{ github.workspace }}/oneDNN
223-
# env:
224-
# ACL_ROOT_DIR: ${{ github.workspace }}/ComputeLibrary
225-
# BUILD_TOOLSET: ${{ matrix.toolset }}
226-
# CMAKE_BUILD_TYPE: ${{ matrix.config }}
227-
# GCC_VERSION: 13
228-
# ONEDNN_THREADING: ${{ matrix.threading }}
229-
230-
# - name: Run oneDNN tests
231-
# run: ${{ github.workspace }}/oneDNN/.github/automation/test_aarch64.sh
232-
# working-directory: ${{ github.workspace }}/oneDNN/build
233-
# env:
234-
# BUILD_TOOLSET: ${{ matrix.toolset }}
235-
# CMAKE_BUILD_TYPE: ${{ matrix.config }}
236-
# DYLD_LIBRARY_PATH: ${{ github.workspace }}/ComputeLibrary/build
237-
# ONEDNN_THREADING: ${{ matrix.threading }}
169+
ONEDNN_THREADING: ${{ matrix.threading }}

0 commit comments

Comments
 (0)