From 02b33c13833294dde39468ab965209736361f5fe Mon Sep 17 00:00:00 2001 From: Hamza Butt Date: Thu, 6 Feb 2025 15:47:51 +0000 Subject: [PATCH] github: workflows: Move CI into dedicated AArch64 folders Signed-off-by: Hamza Butt --- .../{build_aarch64.sh => aarch64/build.sh} | 2 +- .github/automation/{ => aarch64}/build_acl.sh | 2 +- .../automation/{ci-aarch64.json => aarch64/ci.json} | 0 .../{common_aarch64.sh => aarch64/common.sh} | 2 +- .github/automation/{ => aarch64}/get_acl.sh | 2 +- .../automation/{test_aarch64.sh => aarch64/test.sh} | 2 +- .github/workflows/aarch64-acl.yml | 6 +++--- .github/workflows/ci-aarch64.yml | 12 +++++++----- .github/workflows/nightly-aarch64.yml | 10 +++++----- .gitignore | 4 ++-- 10 files changed, 22 insertions(+), 20 deletions(-) rename .github/automation/{build_aarch64.sh => aarch64/build.sh} (97%) rename .github/automation/{ => aarch64}/build_acl.sh (98%) rename .github/automation/{ci-aarch64.json => aarch64/ci.json} (100%) rename .github/automation/{common_aarch64.sh => aarch64/common.sh} (96%) rename .github/automation/{ => aarch64}/get_acl.sh (98%) rename .github/automation/{test_aarch64.sh => aarch64/test.sh} (98%) diff --git a/.github/automation/build_aarch64.sh b/.github/automation/aarch64/build.sh similarity index 97% rename from .github/automation/build_aarch64.sh rename to .github/automation/aarch64/build.sh index 80f05c6568..d5ccdffbfb 100755 --- a/.github/automation/build_aarch64.sh +++ b/.github/automation/aarch64/build.sh @@ -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"} diff --git a/.github/automation/build_acl.sh b/.github/automation/aarch64/build_acl.sh similarity index 98% rename from .github/automation/build_acl.sh rename to .github/automation/aarch64/build_acl.sh index 3efdce021b..53cc2a825f 100755 --- a/.github/automation/build_acl.sh +++ b/.github/automation/aarch64/build_acl.sh @@ -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"} diff --git a/.github/automation/ci-aarch64.json b/.github/automation/aarch64/ci.json similarity index 100% rename from .github/automation/ci-aarch64.json rename to .github/automation/aarch64/ci.json diff --git a/.github/automation/common_aarch64.sh b/.github/automation/aarch64/common.sh similarity index 96% rename from .github/automation/common_aarch64.sh rename to .github/automation/aarch64/common.sh index 82a2562547..cfb483eb46 100644 --- a/.github/automation/common_aarch64.sh +++ b/.github/automation/aarch64/common.sh @@ -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"); diff --git a/.github/automation/get_acl.sh b/.github/automation/aarch64/get_acl.sh similarity index 98% rename from .github/automation/get_acl.sh rename to .github/automation/aarch64/get_acl.sh index 85738eb841..7745b9b976 100755 --- a/.github/automation/get_acl.sh +++ b/.github/automation/aarch64/get_acl.sh @@ -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"); diff --git a/.github/automation/test_aarch64.sh b/.github/automation/aarch64/test.sh similarity index 98% rename from .github/automation/test_aarch64.sh rename to .github/automation/aarch64/test.sh index ebc5ca7f5d..373a0d612f 100755 --- a/.github/automation/test_aarch64.sh +++ b/.github/automation/aarch64/test.sh @@ -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" diff --git a/.github/workflows/aarch64-acl.yml b/.github/workflows/aarch64-acl.yml index 55fc8884c9..ce9640db37 100644 --- a/.github/workflows/aarch64-acl.yml +++ b/.github/workflows/aarch64-acl.yml @@ -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 @@ -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 diff --git a/.github/workflows/ci-aarch64.yml b/.github/workflows/ci-aarch64.yml index 45dfcb133e..108ef6e986 100644 --- a/.github/workflows/ci-aarch64.yml +++ b/.github/workflows/ci-aarch64.yml @@ -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. @@ -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 @@ -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 @@ -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 @@ -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 }} diff --git a/.github/workflows/nightly-aarch64.yml b/.github/workflows/nightly-aarch64.yml index 50534e7578..14e0371850 100644 --- a/.github/workflows/nightly-aarch64.yml +++ b/.github/workflows/nightly-aarch64.yml @@ -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 @@ -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 @@ -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 @@ -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 }} diff --git a/.gitignore b/.gitignore index 77ddf9d3ab..381a4f20f4 100644 --- a/.gitignore +++ b/.gitignore @@ -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. @@ -15,7 +15,7 @@ # limitations under the License. #=============================================================================== -build* +/build* external .vs .vscode