Cleanup.

nv-legate · Sep 25, 2023 · c4d0f24 · c4d0f24
1 parent d22a964
commit c4d0f24
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 28 deletions.
diff --git a/.github/workflows/gh-build-and-test.yml b/.github/workflows/gh-build-and-test.yml
@@ -17,7 +17,6 @@ jobs:
     with:
       device: ${{ inputs.device }}
       image: ${{ inputs.image }}
-      # Ref: https://docs.rapids.ai/resources/github-actions/#cpu-labels for `linux-amd64-cpu4`
       runs-on: ${{ github.repository_owner == 'nv-legate' && 'linux-amd64-32cpu' || 'ubuntu-latest' }}
 
   test:
@@ -29,67 +28,58 @@ jobs:
         include:
           - name: 1 CPU test
             options: test --cpus 1 --unit --debug
-            log: cpu
             runner: ${{ inputs.device == 'gpu' && 'linux-amd64-gpu-v100-latest-1' || 'linux-amd64-cpu4' }}
             has-gpu: false
             enabled: true
 
           - name: 2 CPUs test
             options: test --cpus 2 --debug
-            log: cpus
             runner: ${{ inputs.device == 'gpu' && 'linux-amd64-gpu-v100-latest-1' || 'linux-amd64-cpu8' }}
             has-gpu: false
             enabled: true
 
           - name: GPU test
             options: test --use cuda --gpus 1 --debug
-            log: gpu
             runner: linux-amd64-gpu-v100-latest-1
             has-gpu: true
             enabled: ${{ inputs.device == 'gpu' }}
 
           - name: 2 GPUs test
             options: test --use cuda --gpus 2 --debug
-            log: gpus
             runner: linux-amd64-2gpu
             has-gpu: true
             enabled: ${{ inputs.device == 'gpu' }}
 
           - name: OpenMP test
             options: test --use openmp --omps 1 --ompthreads 2 --debug
-            log: omp
             runner: ${{ inputs.device == 'gpu' && 'linux-amd64-gpu-v100-latest-1' || 'linux-amd64-32cpu' }}
             has-gpu: ${{ inputs.device == 'gpu' }}
             enabled: false
 
           - name: 2 NUMA OpenMPs test
             options: test --use openmp --omps 2 --ompthreads 2 --numamem 2048 --debug
-            log: omps
             runner: ${{ inputs.device == 'gpu' && 'linux-amd64-gpu-v100-latest-1' || 'linux-amd64-32cpu' }}
             has-gpu: ${{ inputs.device == 'gpu' }}
             enabled: false
 
           - name: Eager execution test
             options: test --use eager --debug
-            log: eager
             runner: ${{ inputs.device == 'gpu' && 'linux-amd64-gpu-v100-latest-1' || 'linux-amd64-cpu4' }}
             has-gpu: ${{ inputs.device == 'gpu' }}
             enabled: true
 
           - name: mypy
             options: mypy
-            log: mypy
             runner: linux-amd64-cpu4
             has-gpu: false
             enabled: true
 
           - name: documentation
             options: docs
-            log: docs
             runner: linux-amd64-32cpu
             has-gpu: false
             enabled: ${{ inputs.device == 'gpu' }}
-    # name: ${{ matrix.name }}
+
     uses:
       ./.github/workflows/gh-test.yml
     with:
@@ -99,5 +89,4 @@ jobs:
       runs-on: ${{ matrix.runner }}
       has-gpu: ${{ matrix.has-gpu }}
       test-options: ${{ matrix.options }}
-      log-name: ${{ matrix.log }}
       enabled: ${{ matrix.enabled }}
diff --git a/.github/workflows/gh-build.yml b/.github/workflows/gh-build.yml
@@ -20,8 +20,7 @@ jobs:
     permissions:
       id-token: write # This is required for configure-aws-credentials
       contents: read  # This is required for actions/checkout
-      # packages: write # This is required to push docker image to ghcr.io
-
+
     runs-on: ${{ inputs.runs-on }}
 
     container:

diff --git a/.github/workflows/gh-test.yml b/.github/workflows/gh-test.yml
@@ -22,9 +22,6 @@ on:
       test-options:
         required: true
         type: string
-      log-name:
-        required: true
-        type: string
       enabled:
         required: true
         type: boolean
@@ -86,18 +83,9 @@ jobs:
         shell: su coder {0}
         run: |
           set -x
-          # ls -R /home/coder/.artifacts
-          mkdir -p ~/.test_logs
-          sudo chown -R coder:coder ~/.test_logs
-          sudo chown -R coder:coder ~/.artifacts
+          sudo chown -R coder:coder /home/coder/.artifacts
 
           export PATH="/home/coder/cunumeric/continuous_integration/scripts:$PATH"
 
           set -eo pipefail
-          test-cunumeric ${{ inputs.test-options }} 2>&1 | tee ~/.test_logs/cunumeric-${{ github.sha }}-test-${{ inputs.log-name }}.log
-
-      - name: Upload logs
-        uses: actions/upload-artifact@v3
-        with:
-          name: "cunumeric-${{ inputs.device }}-${{ github.sha }}-test-${{ inputs.log-name }}-log"
-          path: test_logs/cunumeric-${{ github.sha }}-test-${{ inputs.log-name }}.log
+          test-cunumeric ${{ inputs.test-options }}