Merge branch 'master' into flattening

diku-dk · Nov 23, 2024 · a711470 · a711470
2 parents 8fcf415 + f346bf4
commit a711470
Show file tree

Hide file tree

Showing 346 changed files with 7,243 additions and 2,494 deletions.
diff --git a/.github/actions/benchmark/action.yml b/.github/actions/benchmark/action.yml
@@ -25,7 +25,7 @@ runs:
           module load perl
           cd futhark-benchmarks
           ./get-data.sh external-data.txt
-        slurm-options: --time=30:00 -c 1
+        slurm-options: --time=30:00
 
     - uses: ./.github/actions/futhark-slurm
       with:
@@ -40,7 +40,7 @@ runs:
             --ignore-files /lib/ ${{inputs.futhark-options}}
         slurm-options: --time=0-02:00:00 ${{inputs.slurm-options}}
 
-    - uses: actions/upload-artifact@v1
+    - uses: actions/upload-artifact@v4
       with:
         name: futhark-${{inputs.backend}}-${{inputs.system}}-${{ github.sha }}.json
         path: futhark-${{inputs.backend}}-${{inputs.system}}-${{ github.sha }}.json
diff --git a/.github/actions/futhark-slurm/action.yml b/.github/actions/futhark-slurm/action.yml
@@ -11,7 +11,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: futhark-nightly-linux-x86_64.tar.xz
 
@@ -36,6 +36,6 @@ runs:
         printf '#!/bin/bash
         ${{inputs.script}}' > temp.sh
         chmod +x temp.sh
-        export TMPDIR=/scratch
+        [ -d /scratch ] && export TMPDIR=/scratch
         srun ${{inputs.slurm-options}} temp.sh
         rm temp.sh
diff --git a/.github/actions/is-slurm/action.yml b/.github/actions/is-slurm/action.yml
@@ -14,7 +14,7 @@ runs:
       shell: bash
       run: |
         printf '#!/bin/bash
-        if ! srun --version &> /dev/null; then
+        if ! srun --version &> /dev/null || [ $(hostname) = hendrixfut02fl.unicph.domain ]; then
             echo "is-slurm=false"
         else
             echo "is-slurm=true"

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install Nix
       uses: cachix/install-nix-action@v27
@@ -28,69 +28,69 @@ jobs:
     - name: Build Futhark
       run: nix-build --argstr suffix nightly-linux-x86_64 --argstr commit $GITHUB_SHA
 
-    - uses: actions/upload-artifact@v1
+    - uses: actions/upload-artifact@v4
       with:
         name: futhark-nightly-linux-x86_64.tar.xz
         path: result/futhark-nightly-linux-x86_64.tar.xz
 
-  # benchmark-MI100-opencl:
-  #   runs-on: MI100
-  #   needs: [build-linux-nix]
+  benchmark-MI100-opencl:
+    runs-on: MI100
+    needs: [build-linux-nix]
 
-  #   env:
-  #     TMPDIR: "/scratch"
-  #   steps:
-  #   - uses: actions/checkout@v3
-  #     with:
-  #       submodules: recursive
-  #       fetch-depth: 0
-  #   - uses: ./.github/actions/benchmark
-  #     with:
-  #       backend: opencl
-  #       system: MI100
+    env:
+      TMPDIR: "/scratch"
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        fetch-depth: 0
+    - uses: ./.github/actions/benchmark
+      with:
+        backend: opencl
+        system: MI100
 
-  # benchmark-MI100-hip:
-  #   runs-on: MI100
-  #   needs: [build-linux-nix]
+  benchmark-MI100-hip:
+    runs-on: MI100
+    needs: [build-linux-nix]
 
-  #   env:
-  #     TMPDIR: "/scratch"
-  #   steps:
-  #   - uses: actions/checkout@v3
-  #     with:
-  #       submodules: recursive
-  #       fetch-depth: 0
-  #   - uses: ./.github/actions/benchmark
-  #     with:
-  #       backend: hip
-  #       system: MI100
+    env:
+      TMPDIR: "/scratch"
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        fetch-depth: 0
+    - uses: ./.github/actions/benchmark
+      with:
+        backend: hip
+        system: MI100
 
   benchmark-A100:
     runs-on: hendrix
     needs: [build-linux-nix]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 0
     - uses: ./.github/actions/benchmark
       with:
         backend: opencl
         system: A100
-        slurm-options: -p gpu --mem=16G  --gres=gpu:a100:1 --job-name=fut-opencl-A100 --exclude=hendrixgpu14fl
+        slurm-options: -p gpu --mem=48G  --gres=gpu:a100:1 --job-name=fut-opencl-A100 --exclude=hendrixgpu14fl
     - uses: ./.github/actions/benchmark
       with:
         backend: cuda
         system: A100
-        slurm-options: -p gpu --mem=16G --gres=gpu:a100:1 --job-name=fut-cuda-A100 --exclude=hendrixgpu14fl
+        slurm-options: -p gpu --mem=48G --gres=gpu:a100:1 --job-name=fut-cuda-A100 --exclude=hendrixgpu14fl
 
   # benchmark-titanx-cuda:
   #   runs-on: hendrix
   #   needs: [build-linux-nix]
 
   #   steps:
-  #   - uses: actions/checkout@v3
+  #   - uses: actions/checkout@v4
   #     with:
   #       submodules: recursive
   #       fetch-depth: 0
@@ -106,7 +106,7 @@ jobs:
   #   needs: [build-linux-nix]
 
   #   steps:
-  #   - uses: actions/checkout@v3
+  #   - uses: actions/checkout@v4
   #     with:
   #       submodules: recursive
   #       fetch-depth: 0
@@ -122,30 +122,30 @@ jobs:
     needs: [build-linux-nix]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 0
     - uses: ./.github/actions/benchmark
       with:
         backend: cuda
         system: titanrtx
-        slurm-options: -p gpu --mem=16G --gres=gpu:titanrtx:1 --job-name=fut-cuda-titanrtx --exclude=hendrixgpu05fl,hendrixgpu06fl
+        slurm-options: -p gpu --mem=48G --gres=gpu:titanrtx:1 --job-name=fut-cuda-titanrtx --exclude=hendrixgpu05fl,hendrixgpu06fl
 
   benchmark-titanrtx-opencl:
     runs-on: hendrix
     needs: [build-linux-nix]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 0
     - uses: ./.github/actions/benchmark
       with:
         backend: opencl
         system: titanrtx
-        slurm-options: -p gpu --mem=16G --gres=gpu:titanrtx:1 --job-name=fut-opencl-titanrtx --exclude=hendrixgpu05fl,hendrixgpu06fl
+        slurm-options: -p gpu --mem=48G --gres=gpu:titanrtx:1 --job-name=fut-opencl-titanrtx --exclude=hendrixgpu05fl,hendrixgpu06fl
 
   benchmark-results:
     runs-on: ubuntu-22.04
@@ -164,7 +164,7 @@ jobs:
       with:
         key: ${{ secrets.SSHKEY }}
         known_hosts: ${{ secrets.KNOWN_HOSTS }}
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
     - run: |
         ls -R
     - name: Prepare package