From 40eeb3b46d91c7d57f8b4f761098b6ea5d70c959 Mon Sep 17 00:00:00 2001 From: colramos425 Date: Thu, 5 Jan 2023 11:46:12 -0600 Subject: [PATCH 1/8] Merge CI workflows into a single Ubuntu 20.04 action Signed-off-by: colramos425 --- .github/workflows/analyze-workloads.yml | 52 ------------------- ...{analyze-commands.yml => ubuntu-focal.yml} | 8 ++- 2 files changed, 6 insertions(+), 54 deletions(-) delete mode 100644 .github/workflows/analyze-workloads.yml rename .github/workflows/{analyze-commands.yml => ubuntu-focal.yml} (88%) diff --git a/.github/workflows/analyze-workloads.yml b/.github/workflows/analyze-workloads.yml deleted file mode 100644 index ef38abfdde..0000000000 --- a/.github/workflows/analyze-workloads.yml +++ /dev/null @@ -1,52 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: analyze-workloads - - -# Controls when the workflow will run -on: - push: - branches: [ main, dev ] - pull_request: - branches: [ main, dev ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - container: - image: rocm/dev-ubuntu-22.04:5.3 - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Cancel any previous runs - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.11.0 - - name: Install baseline OS dependencies - run: | - sudo apt-get update - sudo apt-get install -y git - sudo apt-get install -y python3-pip - sudo apt-get install -y cmake - - name: Checkout - uses: actions/checkout@v3 - with: - submodules: recursive - token: ${{ secrets.GH_PAT }} - - name: Install Python prereqs - run: | - python3 -m pip install -r requirements.txt - python3 -m pip install pyinstaller pytest pytest-cov - - name: Configure and install - run: | - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/opt/omniperf .. - make install - - name: run ctest - run: | - cd build - ctest --verbose -R test_analyze_workloads test_saved_analysis diff --git a/.github/workflows/analyze-commands.yml b/.github/workflows/ubuntu-focal.yml similarity index 88% rename from .github/workflows/analyze-commands.yml rename to .github/workflows/ubuntu-focal.yml index 786195916a..35168276f1 100644 --- a/.github/workflows/analyze-commands.yml +++ b/.github/workflows/ubuntu-focal.yml @@ -1,6 +1,6 @@ # This is a basic workflow to help you get started with Actions -name: analyze-commands +name: Ubuntu 20.04 # Controls when the workflow will run on: @@ -45,7 +45,11 @@ jobs: cd build cmake -DCMAKE_INSTALL_PREFIX=/opt/omniperf .. make install - - name: Run ctest + - name: CTEST- Analyze Commands run: | cd build ctest --verbose -R test_analyze_commands + - name: CTEST- Analyze Workloads + run: | + cd build + ctest --verbose -R test_analyze_workloads test_saved_analysis From 2a07759bdd75676c7275fc4049cebc507b5392ab Mon Sep 17 00:00:00 2001 From: colramos425 Date: Thu, 5 Jan 2023 11:48:59 -0600 Subject: [PATCH 2/8] Temp tesing of CI on ci-reorg branch Signed-off-by: colramos425 --- .github/workflows/ubuntu-focal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu-focal.yml b/.github/workflows/ubuntu-focal.yml index 35168276f1..0cc3ce6e94 100644 --- a/.github/workflows/ubuntu-focal.yml +++ b/.github/workflows/ubuntu-focal.yml @@ -5,9 +5,9 @@ name: Ubuntu 20.04 # Controls when the workflow will run on: push: - branches: [ main, dev ] + branches: [ main, dev, ci-reorg ] pull_request: - branches: [ main, dev ] + branches: [ main, dev, ci-reorg ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From b4a63461037c3a11b88ad7c81132e1a9937a8671 Mon Sep 17 00:00:00 2001 From: Cole Ramos Date: Thu, 5 Jan 2023 13:03:37 -0600 Subject: [PATCH 3/8] Add Ubuntu 20.04 workflow badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8bfa56510b..f6afd1d6b0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![Ubuntu 20.04](https://github.com/AMDResearch/omniperf/actions/workflows/ubuntu-focal.yml/badge.svg)](https://github.com/AMDResearch/omniperf/actions/workflows/ubuntu-focal.yml) [![Docs](https://github.com/AMDResearch/omniperf/actions/workflows/docs.yml/badge.svg)](https://amdresearch.github.io/omniperf/) [![DOI](https://zenodo.org/badge/561919887.svg)](https://zenodo.org/badge/latestdoi/561919887) From b58ca9b59d2c11356619db34595bd4819003364d Mon Sep 17 00:00:00 2001 From: colramos425 Date: Thu, 5 Jan 2023 13:07:35 -0600 Subject: [PATCH 4/8] Revert temp branch testing Signed-off-by: colramos425 --- .github/workflows/ubuntu-focal.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ubuntu-focal.yml b/.github/workflows/ubuntu-focal.yml index 0cc3ce6e94..d9683af8c1 100644 --- a/.github/workflows/ubuntu-focal.yml +++ b/.github/workflows/ubuntu-focal.yml @@ -5,9 +5,9 @@ name: Ubuntu 20.04 # Controls when the workflow will run on: push: - branches: [ main, dev, ci-reorg ] + branches: [ main, dev ] pull_request: - branches: [ main, dev, ci-reorg ] + branches: [ main, dev ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -45,11 +45,11 @@ jobs: cd build cmake -DCMAKE_INSTALL_PREFIX=/opt/omniperf .. make install - - name: CTEST- Analyze Commands + - name: CTest- Analyze Commands run: | cd build ctest --verbose -R test_analyze_commands - - name: CTEST- Analyze Workloads + - name: CTest- Analyze Workloads run: | cd build ctest --verbose -R test_analyze_workloads test_saved_analysis From 3e4c9a2265678bf62cf3ed54c40729b7edefce2a Mon Sep 17 00:00:00 2001 From: colramos425 Date: Fri, 6 Jan 2023 12:37:31 -0600 Subject: [PATCH 5/8] Test new RHEL 8 based CI pipeline Signed-off-by: colramos425 --- .github/workflows/opensuse.yml | 58 ++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/opensuse.yml diff --git a/.github/workflows/opensuse.yml b/.github/workflows/opensuse.yml new file mode 100644 index 0000000000..18335d6f42 --- /dev/null +++ b/.github/workflows/opensuse.yml @@ -0,0 +1,58 @@ +# This is a basic workflow to help you get started with Actions + +name: RHEL 8 + +# Controls when the workflow will run +on: + push: + branches: [ main, dev, ci-reorg ] + pull_request: + branches: [ main, dev, ci-reorg ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + container: + image: colramos/target-images:rhel8 + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Cancel any previous runs + - name: Cancel Previous Runs + uses: styfle/cancel-workflow-action@0.11.0 + - name: Install baseline OS dependencies + run: | + sudo yum -y update + sudo yum -y install git + sudo yum -y install python39 + sudo yum -y install cmake3 + - name: Checkout + uses: actions/checkout@v3 + with: + submodules: recursive + token: ${{ secrets.GH_PAT }} + - name: Upgrade Python to 3.9 + run: | + + - name: Install Python prereqs + run: | + python3.9 -m pip install -r requirements.txt + python3.9 -m pip install pyinstaller pytest pytest-cov mock + - name: Configure and install + run: | + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/opt/omniperf .. + make install + - name: CTest- Analyze Commands + run: | + cd build + ctest --verbose -R test_analyze_commands + - name: CTest- Analyze Workloads + run: | + cd build + ctest --verbose -R test_analyze_workloads test_saved_analysis From 6b1e4687168f7efea2dfe24223875fe3a2d070b9 Mon Sep 17 00:00:00 2001 From: colramos425 Date: Fri, 6 Jan 2023 12:42:07 -0600 Subject: [PATCH 6/8] Change dependency install permissions Signed-off-by: colramos425 --- .github/workflows/opensuse.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/opensuse.yml b/.github/workflows/opensuse.yml index 18335d6f42..2521c4722b 100644 --- a/.github/workflows/opensuse.yml +++ b/.github/workflows/opensuse.yml @@ -26,10 +26,10 @@ jobs: uses: styfle/cancel-workflow-action@0.11.0 - name: Install baseline OS dependencies run: | - sudo yum -y update - sudo yum -y install git - sudo yum -y install python39 - sudo yum -y install cmake3 + yum -y update + yum -y install git + yum -y install python39 + yum -y install cmake3 - name: Checkout uses: actions/checkout@v3 with: From 23377548e73447fffd1c79b2d920fc4f7b14a58c Mon Sep 17 00:00:00 2001 From: colramos425 Date: Fri, 6 Jan 2023 13:15:58 -0600 Subject: [PATCH 7/8] Remove test on temp dev branch Signed-off-by: colramos425 --- .github/workflows/opensuse.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/opensuse.yml b/.github/workflows/opensuse.yml index 2521c4722b..b7d0208ef4 100644 --- a/.github/workflows/opensuse.yml +++ b/.github/workflows/opensuse.yml @@ -5,9 +5,9 @@ name: RHEL 8 # Controls when the workflow will run on: push: - branches: [ main, dev, ci-reorg ] + branches: [ main, dev ] pull_request: - branches: [ main, dev, ci-reorg ] + branches: [ main, dev ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -35,9 +35,6 @@ jobs: with: submodules: recursive token: ${{ secrets.GH_PAT }} - - name: Upgrade Python to 3.9 - run: | - - name: Install Python prereqs run: | python3.9 -m pip install -r requirements.txt From d5c28f5348910223404d8d9a3bd00ef94a919b97 Mon Sep 17 00:00:00 2001 From: Cole Ramos Date: Fri, 6 Jan 2023 13:17:02 -0600 Subject: [PATCH 8/8] Add RHEL 8 status badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f6afd1d6b0..90b8c3547e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![Ubuntu 20.04](https://github.com/AMDResearch/omniperf/actions/workflows/ubuntu-focal.yml/badge.svg)](https://github.com/AMDResearch/omniperf/actions/workflows/ubuntu-focal.yml) +[![RHEL 8](https://github.com/AMDResearch/omniperf/actions/workflows/opensuse.yml/badge.svg)](https://github.com/AMDResearch/omniperf/actions/workflows/opensuse.yml) [![Docs](https://github.com/AMDResearch/omniperf/actions/workflows/docs.yml/badge.svg)](https://amdresearch.github.io/omniperf/) [![DOI](https://zenodo.org/badge/561919887.svg)](https://zenodo.org/badge/latestdoi/561919887)