Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

github: workflows: Move CI into dedicated AArch64 folders #2615

Merged
merged 1 commit into from
Feb 7, 2025
Merged

github: workflows: Move CI into dedicated AArch64 folders #2615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/automation/build_aarch64.sh → .github/automation/aarch64/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ set -o errexit -o pipefail -o noclobber
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"

# Defines MP, CC, CXX and OS.
source ${SCRIPT_DIR}/common_aarch64.sh
source ${SCRIPT_DIR}/common.sh

export ACL_ROOT_DIR=${ACL_ROOT_DIR:-"${PWD}/ComputeLibrary"}

Expand Down
2 changes: 1 addition & 1 deletion .github/automation/build_acl.sh → .github/automation/aarch64/build_acl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ set -o errexit -o pipefail -o noclobber
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"

# Defines MP, CC, CXX and OS.
source ${SCRIPT_DIR}/common_aarch64.sh
source ${SCRIPT_DIR}/common.sh

ACL_BUILD_TYPE=${ACL_BUILD_TYPE:-"Release"}
ACL_ROOT_DIR=${ACL_ROOT_DIR:-"${PWD}/ComputeLibrary"}
Expand Down
0 .github/automation/ci-aarch64.json → .github/automation/aarch64/ci.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/automation/common_aarch64.sh → .github/automation/aarch64/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/bash

# *******************************************************************************
# Copyright 2024 Arm Limited and affiliates.
# Copyright 2024-2025 Arm Limited and affiliates.
# SPDX-License-Identifier: Apache-2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion .github/automation/get_acl.sh → .github/automation/aarch64/get_acl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/bash

# *******************************************************************************
# Copyright 2024 Arm Limited and affiliates.
# Copyright 2024-2025 Arm Limited and affiliates.
# SPDX-License-Identifier: Apache-2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion .github/automation/test_aarch64.sh → .github/automation/aarch64/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ set -o errexit -o pipefail -o noclobber
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"

# Defines MP, CC, CXX and OS.
source ${SCRIPT_DIR}/common_aarch64.sh
source ${SCRIPT_DIR}/common.sh

# AArch64 does not officially support graph for now.
SKIPPED_GRAPH_TEST_FAILURES="test_graph_unit_dnnl_sdp_decomp_cpu"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/aarch64-acl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ jobs:
- name: Read version file
id: get-versions
run: |
content=`cat ${{ github.workspace }}/oneDNN/.github/automation/ci-aarch64.json`
content=`cat ${{ github.workspace }}/oneDNN/.github/automation/aarch64/ci.json`
content="${content//[$'\t\r\n$ ']}"
echo "output=$content" >> $GITHUB_OUTPUT
- name: Clone ACL
run: ${{ github.workspace }}/oneDNN/.github/automation/build_acl.sh
run: ${{ github.workspace }}/oneDNN/.github/automation/aarch64/build_acl.sh
env:
ACL_ACTION: clone
ACL_ROOT_DIR: ${{ github.workspace }}/ComputeLibrary
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:

- name: Build ACL
if: ${{ steps.cache-acl-restore.outputs.cache-hit != 'true' }}
run: ${{ github.workspace }}/oneDNN/.github/automation/build_acl.sh
run: ${{ github.workspace }}/oneDNN/.github/automation/aarch64/build_acl.sh
env:
ACL_ACTION: build
ACL_ROOT_DIR: ${{ github.workspace }}/ComputeLibrary
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/ci-aarch64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ on:
- "src/cpu/aarch64/**"
- "tests/**"
- "CMakeLists.txt"
#* allow manual trigger of workflow when needed.
workflow_dispatch:

#* Stop stale workflows when pull requests are updated: https://stackoverflow.com/a/70972844
#* Does not apply to the main branch.
Expand Down Expand Up @@ -81,7 +83,7 @@ jobs:
- name: Read version file
id: get-versions
run: |
content=`cat ${{ github.workspace }}/oneDNN/.github/automation/ci-aarch64.json`
content=`cat ${{ github.workspace }}/oneDNN/.github/automation/aarch64/ci.json`
content="${content//[$'\t\r\n$ ']}"
echo "output=$content" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -110,7 +112,7 @@ jobs:
version: ${{ fromJson(steps.get-versions.outputs.output).dependencies.clang }}

- name: Clone ACL
run: ${{ github.workspace }}/oneDNN/.github/automation/build_acl.sh
run: ${{ github.workspace }}/oneDNN/.github/automation/aarch64/build_acl.sh
env:
ACL_ACTION: clone
ACL_ROOT_DIR: ${{ github.workspace }}/ComputeLibrary
Expand All @@ -132,7 +134,7 @@ jobs:
path: ${{ github.workspace }}/ComputeLibrary/build

- name: Configure oneDNN
run: ${{ github.workspace }}/oneDNN/.github/automation/build_aarch64.sh
run: ${{ github.workspace }}/oneDNN/.github/automation/aarch64/build.sh
working-directory: ${{ github.workspace }}/oneDNN
env:
ACL_ROOT_DIR: ${{ github.workspace }}/ComputeLibrary
Expand All @@ -145,13 +147,13 @@ jobs:
ONEDNN_THREADING: ${{ matrix.config.threading }}

- name: Build oneDNN
run: ${{ github.workspace }}/oneDNN/.github/automation/build_aarch64.sh
run: ${{ github.workspace }}/oneDNN/.github/automation/aarch64/build.sh
working-directory: ${{ github.workspace }}/oneDNN
env:
ONEDNN_ACTION: build

- name: Run oneDNN tests
run: ${{ github.workspace }}/oneDNN/.github/automation/test_aarch64.sh
run: ${{ github.workspace }}/oneDNN/.github/automation/aarch64/test.sh
working-directory: ${{ github.workspace }}/oneDNN/build
env:
BUILD_TOOLSET: ${{ matrix.config.toolset }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/nightly-aarch64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Read version file
id: get-versions
run: |
content=`cat ${{ github.workspace }}/oneDNN/.github/automation/ci-aarch64.json`
content=`cat ${{ github.workspace }}/oneDNN/.github/automation/aarch64/ci.json`
content="${content//[$'\t\r\n$ ']}"
echo "output=$content" >> $GITHUB_OUTPUT
Expand All @@ -81,7 +81,7 @@ jobs:
sudo apt install -y g++-${{ fromJson(steps.get-versions.outputs.output).dependencies.gcc }}
- name: Clone ACL
run: ${{ github.workspace }}/oneDNN/.github/automation/build_acl.sh
run: ${{ github.workspace }}/oneDNN/.github/automation/aarch64/build_acl.sh
env:
ACL_ACTION: clone
ACL_ROOT_DIR: ${{ github.workspace }}/ComputeLibrary
Expand All @@ -103,7 +103,7 @@ jobs:
path: ${{ github.workspace }}/ComputeLibrary/build

- name: Configure oneDNN
run: ${{ github.workspace }}/oneDNN/.github/automation/build_aarch64.sh
run: ${{ github.workspace }}/oneDNN/.github/automation/aarch64/build.sh
working-directory: ${{ github.workspace }}/oneDNN
env:
ACL_ROOT_DIR: ${{ github.workspace }}/ComputeLibrary
Expand All @@ -116,13 +116,13 @@ jobs:
ONEDNN_THREADING: ${{ matrix.config.threading }}

- name: Build oneDNN
run: ${{ github.workspace }}/oneDNN/.github/automation/build_aarch64.sh
run: ${{ github.workspace }}/oneDNN/.github/automation/aarch64/build.sh
working-directory: ${{ github.workspace }}/oneDNN
env:
ONEDNN_ACTION: build

- name: Run oneDNN tests
run: ${{ github.workspace }}/oneDNN/.github/automation/test_aarch64.sh
run: ${{ github.workspace }}/oneDNN/.github/automation/aarch64/test.sh
working-directory: ${{ github.workspace }}/oneDNN/build
env:
BUILD_TOOLSET: ${{ matrix.config.toolset }}
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#===============================================================================
# Copyright 2019-2021 Intel Corporation
# Copyright 2024 Arm Limited and affiliates.
# Copyright 2024-2025 Arm Limited and affiliates.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -15,7 +15,7 @@
# limitations under the License.
#===============================================================================

build*
/build*
external
.vs
.vscode
Expand Down