github: workflows: Move CI into dedicated AArch64 folders

Signed-off-by: Hamza Butt <[email protected]>
oneapi-src · Feb 6, 2025 · 1fb2872 · 1fb2872
1 parent fd2915e
commit 1fb2872
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 18 deletions.
diff --git a/.github/automation/build_aarch64.sh → .github/automation/aarch64/build.sh b/.github/automation/build_aarch64.sh → .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 → .github/automation/aarch64/build_acl.sh b/.github/automation/build_acl.sh → .github/automation/aarch64/build_acl.sh
diff --git a/.github/automation/ci-aarch64.json → .github/automation/aarch64/ci.json b/.github/automation/ci-aarch64.json → .github/automation/aarch64/ci.json
diff --git a/.github/automation/common_aarch64.sh → .github/automation/aarch64/common.sh b/.github/automation/common_aarch64.sh → .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 → .github/automation/aarch64/get_acl.sh b/.github/automation/get_acl.sh → .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 → .github/automation/aarch64/test.sh b/.github/automation/test_aarch64.sh → .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
@@ -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
@@ -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
@@ -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
@@ -15,7 +15,7 @@
 # limitations under the License.
 #===============================================================================
 
-build*
+build/*
 external
 .vs
 .vscode
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
     # limitations under the License.
     #===============================================================================
-    build*
+    build/*
     external
     .vs
     .vscode
@@ Expand Down @@