From 67d8a3bee44c48ebe15bf5aeb072bf4cb4950228 Mon Sep 17 00:00:00 2001 From: WilliamMTK Date: Fri, 4 Jul 2025 15:11:15 -0400 Subject: Update ci (#119) * update_ci: use test matrix * update_ci: add updated test script and better name * update_ci: use minimal image for accelsim test as well * update_ci: use github image for sst run * update_ci: revert main yaml --- .github/workflows/accelsim.yml | 7 +++- .github/workflows/cmake.yml | 77 ++++++++--------------------------- .github/workflows/main.yml | 10 ++--- .github/workflows/sst_integration.yml | 2 +- short-tests-cmake.sh | 8 +++- 5 files changed, 37 insertions(+), 67 deletions(-) diff --git a/.github/workflows/accelsim.yml b/.github/workflows/accelsim.yml index ec94317..f152c0d 100644 --- a/.github/workflows/accelsim.yml +++ b/.github/workflows/accelsim.yml @@ -21,9 +21,14 @@ env: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: build-QV100: + strategy: + matrix: + image_tags: + - ubuntu-24.04-cuda-12.8-minimal + - ubuntu-22.04-cuda-11.7.1-minimal runs-on: ubuntu-latest container: - image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8 + image: ghcr.io/accel-sim/accel-sim-framework:${{ matrix.image_tags }} # Steps represent a sequence of tasks that will be executed as part of the job steps: diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index c37bd41..c61f5b3 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -15,68 +15,27 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - build-TITANV: + build: + strategy: + matrix: + app: + - rodinia_2.0-ft + config: + - TITANV + - TITANV-LOCALXBAR + - QV100 + - RTX2060 + - RTX3070 + image_tags: + - ubuntu-24.04-cuda-12.8-minimal + - ubuntu-22.04-cuda-11.7.1-minimal runs-on: ubuntu-latest + name: Build ${{ matrix.app }} on ${{ matrix.image_tags }} with ${{ matrix.config }} container: - image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8 + image: ghcr.io/accel-sim/accel-sim-framework:${{ matrix.image_tags }} env: - CONFIG: TITANV - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v4 - - name: Run Simulation - run: /bin/bash $GITHUB_WORKSPACE/short-tests-cmake.sh - - build-TITANV-LOCALXBAR: - runs-on: ubuntu-latest - container: - image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8 - env: - CONFIG: TITANV-LOCALXBAR - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v4 - - name: Run Simulation - run: /bin/bash $GITHUB_WORKSPACE/short-tests-cmake.sh - - build-QV100: - runs-on: ubuntu-latest - container: - image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8 - env: - CONFIG: QV100 - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v4 - - name: Run Simulation - run: /bin/bash $GITHUB_WORKSPACE/short-tests-cmake.sh - - build-2060: - runs-on: ubuntu-latest - container: - image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8 - env: - CONFIG: RTX2060 - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v4 - - name: Run Simulation - run: /bin/bash $GITHUB_WORKSPACE/short-tests-cmake.sh - - build-3070: - runs-on: ubuntu-latest - container: - image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8 - env: - CONFIG: RTX3070 + CONFIG: ${{ matrix.config }} + APP: ${{ matrix.app }} # Steps represent a sequence of tasks that will be executed as part of the job steps: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a4f838d..4c12f58 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: build-TITANV: runs-on: ubuntu-latest container: - image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8 + image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8-minimal env: CONFIG: TITANV @@ -32,7 +32,7 @@ jobs: build-TITANV-LOCALXBAR: runs-on: ubuntu-latest container: - image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8 + image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8-minimal env: CONFIG: TITANV-LOCALXBAR @@ -46,7 +46,7 @@ jobs: build-QV100: runs-on: ubuntu-latest container: - image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8 + image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8-minimal env: CONFIG: QV100 @@ -60,7 +60,7 @@ jobs: build-2060: runs-on: ubuntu-latest container: - image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8 + image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8-minimal env: CONFIG: RTX2060 @@ -74,7 +74,7 @@ jobs: build-3070: runs-on: ubuntu-latest container: - image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8 + image: ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8-minimal env: CONFIG: RTX3070 diff --git a/.github/workflows/sst_integration.yml b/.github/workflows/sst_integration.yml index 4a88bf3..cb94de4 100644 --- a/.github/workflows/sst_integration.yml +++ b/.github/workflows/sst_integration.yml @@ -24,7 +24,7 @@ jobs: # test_type: [simple, medium, long] test_type: [simple, medium] container: - image: tgrogers/accel-sim_regress:SST-Integration-Ubuntu-22.04-cuda-11.7-llvm-18.1.8-riscv-gnu-2024.08.06-nightly + image: ghcr.io/accel-sim/accel-sim-framework:SST-Integration-Ubuntu-22.04-cuda-11.7-llvm-18.1.8-riscv-gnu-2024.08.06-nightly env: CONFIG: QV100 GPU_ARCH: sm_70 diff --git a/short-tests-cmake.sh b/short-tests-cmake.sh index 23cf66c..c898ecd 100755 --- a/short-tests-cmake.sh +++ b/short-tests-cmake.sh @@ -13,6 +13,12 @@ if [ ! -n "$GPUAPPS_ROOT" ]; then exit 1; fi +# Set default value for APP +if [ ! -n "$APP" ]; then + APP=rodinia_2.0-ft +fi +echo "Running simulation for $APP with config $CONFIG" + git config --system --add safe.directory '*' export PATH=$CUDA_INSTALL_PATH/bin:$PATH @@ -23,5 +29,5 @@ cmake --install build source setup git clone https://github.com/accel-sim/accel-sim-framework.git -./accel-sim-framework/util/job_launching/run_simulations.py -C $CONFIG -B rodinia_2.0-ft -N regress -l local +./accel-sim-framework/util/job_launching/run_simulations.py -C $CONFIG -B $APP -N regress -l local ./accel-sim-framework/util/job_launching/monitor_func_test.py -v -N regress -j procman -- cgit v1.3