Restore GitHub Actions workflow

.github/workflows/macos.yml

@@ -6,57 +6,36 @@ on:
   pull_request:
     branches: [ main ]
 
+env:
+  PYTHON_VERSION: '3.12'
+
 jobs:
   build-macos:
-    runs-on: ${{ matrix.os }}
-    name: ${{ matrix.name }}
     strategy:
       matrix:
         include:
-          # macOS 12.4 + Xcode 13.4.1
-          - name: "macOS 12.4 + Xcode 13.4.1"
-            os: macos-12
-            compiler: xcode
-            version: "13.4.1"
-          # macOS 11.6 + Xcode 13.2.1
-          - name: "macOS 11.6 + Xcode 13.2.1"
-            os: macos-11
+          # macOS 26.3 + Xcode 26.3
+          - name: "macOS 26.3 + Xcode 26.3"
+            os: macos-26
             compiler: xcode
-            version: "13.2.1"
-          # macOS 11.6 + Xcode 12.5.1
-          - name: "macOS 11.6 + Xcode 12.5.1"
-            os: macos-11
+            version: "26.3"
+          # macOS 15.7.4 + Xcode 16.4
+          - name: "macOS 15.7.4 + Xcode 16.4"
+            os: macos-15
             compiler: xcode
-            version: "12.5.1"
-          # macOS 11.6 + Xcode 11.7
-          - name: "macOS 11.6 + Xcode 11.7"
-            os: macos-11
-            compiler: xcode
-            version: "11.7"
-          # macOS 12.4 + gcc-11
-          - name: "macOS 12.4 + gcc-11"
-            os: macos-12
-            compiler: gcc
-            version: "11"
-          # macOS 11.6 + gcc-11
-          - name: "macOS 11.6 + gcc-11"
-            os: macos-11
-            compiler: gcc
-            version: "11"
-          # macOS 11.6 + gcc-10
-          - name: "macOS 11.6 + gcc-10"
-            os: macos-11
-            compiler: gcc
-            version: "10"
-          # macOS 11.6 + gcc-9
-          - name: "macOS 11.6 + gcc-9"
-            os: macos-11
-            compiler: gcc
-            version: "9"
+            version: "16.4"
+
+    runs-on: ${{ matrix.os }}
+    name: 🍎 Build - ${{ matrix.name }}
+
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
       with:
         submodules: true
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ env.PYTHON_VERSION }}
     - name: Configure Compiler
       run: |
         if [ "${{ matrix.compiler }}" = "gcc" ]; then
@@ -74,12 +53,9 @@ jobs:
       run: cd build && make
     - name: Run Unit Test
       run: /Users/runner/work/CubbyFlow/CubbyFlow/build/bin/UnitTests
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.7'
     - name: Run Python Test
       run: |
-        pip install -r requirements.txt
-        pip install .
-        python -m pytest Tests/PythonTests/
+        python -m pip install --upgrade pip
+        python -m pip install -r requirements.txt
+        python -m pip install .
+        python -m pytest Tests/PythonTests/

.github/workflows/scripts/actions/install_cuda_ubuntu.sh

@@ -17,6 +17,7 @@
 # Ideally choose from the list of meta-packages to minimise variance between cuda versions (although it does change too)
 CUDA_PACKAGES_IN=(
     "command-line-tools"
+    "compiler"
     "libraries-dev"
 )
 

.github/workflows/scripts/actions/install_cuda_windows.ps1

@@ -16,10 +16,14 @@ $CUDA_KNOWN_URLS = @{
     "10.2.89" = "http://developer.download.nvidia.com/compute/cuda/10.2/Prod/network_installers/cuda_10.2.89_win10_network.exe";
     "11.0.167" = "http://developer.download.nvidia.com/compute/cuda/11.0.1/network_installers/cuda_11.0.1_win10_network.exe"
     "11.3.1" = "http://developer.download.nvidia.com/compute/cuda/11.3.1/network_installers/cuda_11.3.1_win10_network.exe"
+    "12.6.3" = "https://developer.download.nvidia.com/compute/cuda/12.6.3/network_installers/cuda_12.6.3_windows_network.exe"
+    "13.2.0" = "https://developer.download.nvidia.com/compute/cuda/13.2.0/network_installers/cuda_13.2.0_windows_network.exe"
 }
 
 # @todo - change this to be based on _MSC_VER intead, or invert it to be CUDA keyed instead?
 $VISUAL_STUDIO_MIN_CUDA = @{
+    "2026" = "13.2";
+    "2022" = "11.6";
     "2019" = "10.1";
     "2017" = "10.0"; # Depends on which version of 2017! 9.0 to 10.0 depending on  version
     "2015" = "8.0"; # might support older, unsure.
@@ -80,6 +84,15 @@ $VISUAL_STUDIO_YEAR = $VISUAL_STUDIO.Substring($VISUAL_STUDIO.Length-4)
 
 $CUDA_PACKAGES = ""
 
+# CUDA 13+ separates runtime headers such as crt/host_config.h into the crt package.
+if ([version]$CUDA_VERSION_FULL -ge [version]"13.0" -and -not ($CUDA_PACKAGES_IN -contains "crt")) {
+    $CUDA_PACKAGES_IN += "crt"
+}
+# CUDA 13+ requires NVVM tooling (cicc) for nvcc compilation.
+if ([version]$CUDA_VERSION_FULL -ge [version]"13.0" -and -not ($CUDA_PACKAGES_IN -contains "nvvm")) {
+    $CUDA_PACKAGES_IN += "nvvm"
+}
+
 # for CUDA >= 11 cudart is a required package.
 # if([version]$CUDA_VERSION_FULL -ge [version]"11.0") {
 #     if(-not $CUDA_PACKAGES_IN -contains "cudart") {
@@ -131,12 +144,12 @@ if(Test-Path -Path $CUDA_REPO_PKG_LOCAL){
 
 # Invoke silent install of CUDA (via network installer)
 Write-Output "Installing CUDA $($CUDA_VERSION_FULL). Subpackages $($CUDA_PACKAGES)"
-Start-Process -Wait -FilePath .\"$($CUDA_REPO_PKG_LOCAL)" -ArgumentList "-s $($CUDA_PACKAGES)"
+$installerProcess = Start-Process -Wait -PassThru -FilePath .\"$($CUDA_REPO_PKG_LOCAL)" -ArgumentList "-s $($CUDA_PACKAGES)"
 
 # Check the return status of the CUDA installer.
-if (!$?) {
-    Write-Output "Error: CUDA installer reported error. $($LASTEXITCODE)"
-    exit 1
+if ($installerProcess.ExitCode -ne 0) {
+    Write-Output "Error: CUDA installer reported error. Exit code: $($installerProcess.ExitCode)"
+    exit $installerProcess.ExitCode
 }
 
 # Store the CUDA_PATH in the environment for the current session, to be forwarded in the action.
@@ -150,4 +163,4 @@ Write-Output "CUDA_PATH_VX_Y $($CUDA_PATH_VX_Y)"
 
 # PATH needs updating elsewhere, anything in here won't persist.
 # Append $CUDA_PATH/bin to path.
-# Set CUDA_PATH as an environmental variable
+# Set CUDA_PATH as an environmental variable

.github/workflows/ubuntu-codecov.yml

@@ -6,22 +6,31 @@ on:
   pull_request:
     branches: [ main ]
 
+env:
+  PYTHON_VERSION: '3.12'
+
 jobs:
   build-ubuntu:
-    runs-on: ${{ matrix.os }}
-    name: ${{ matrix.name }}
     strategy:
       matrix:
         include:
-          # Ubuntu 20.04 + gcc-9
-          - name: "Ubuntu 20.04 + gcc-9"
-            os: ubuntu-20.04
+          # Ubuntu 24.04 + gcc-14
+          - name: "Ubuntu 24.04 + gcc-14"
+            os: ubuntu-24.04
             compiler: gcc
-            version: "9"
+            version: "14"
+
+    runs-on: ${{ matrix.os }}
+    name: 🧪 Code Coverage - Codecov
+
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
       with:
         submodules: true
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ env.PYTHON_VERSION }}
     - name: Install packages
       run: sudo apt-get install -yq lcov
     - name: Configure Compiler
@@ -39,5 +48,17 @@ jobs:
       run: cd build && make
     - name: Run Unit Test
       run: /home/runner/work/CubbyFlow/CubbyFlow/build/bin/UnitTests
-    - name: Upload coverage to Codecov
-      run: bash <(curl -s https://codecov.io/bash)
+    - name: Collect coverage report
+      run: |
+        GCOV_TOOL="$(command -v gcov-${{ matrix.version }})"
+        lcov --gcov-tool "${GCOV_TOOL}" --ignore-errors mismatch --directory build --capture --output-file build/coverage.info
+        lcov --ignore-errors unused --gcov-tool "${GCOV_TOOL}" --ignore-errors mismatch --remove build/coverage.info '/usr/*' '*/Tests/*' --output-file build/coverage.info.cleaned
+    - name: Upload Coverage Reports to Codecov
+      uses: codecov/codecov-action@v5
+      with:
+        fail_ci_if_error: true
+        files: ./build/coverage.info.cleaned
+        flags: unittests
+        name: ubuntu-codecov
+        token: ${{ secrets.CODECOV_TOKEN }}
+        verbose: true

.github/workflows/ubuntu-cuda.yml

@@ -1,42 +1,49 @@
-name: Ubuntu-CUDA
+name: Ubuntu CUDA
 
 on:
   push:
-    branches: [ main, "gpu*" ]
+    branches: [ main ]
   pull_request:
-    branches: [ main, "gpu*" ]
+    branches: [ main ]
+
+env:
+  PYTHON_VERSION: '3.12'
 
 jobs:
   build-ubuntu-cuda:
-    runs-on: ${{ matrix.os }}
-    name: ${{ matrix.name }}
     strategy:
       matrix:
         include:
-          - name: "Ubuntu 20.04 + gcc-10 + CUDA 11.7 (Disable Test)"
-            os: ubuntu-20.04
-            cuda: "11.7"
+          # Ubuntu 24.04 + gcc-12 + CUDA 12.6.3
+          - name: "Ubuntu 24.04 + gcc-12 + CUDA 12.6.3"
+            os: ubuntu-24.04
+            cuda: "12.6.3"
             compiler: gcc
-            version: "10"
+            version: "12"
+
+    runs-on: ${{ matrix.os }}
+    name: 🐧 CUDA Build - ${{ matrix.name }}
+
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
       with:
         submodules: true
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ env.PYTHON_VERSION }}
+    - name: Install packages
+      run: sudo apt-get update && sudo apt-get install -yq python3-setuptools
     - name: Install CUDA
       env:
         cuda: ${{ matrix.cuda }}
+      shell: bash
       run: |
         source ./.github/workflows/scripts/actions/install_cuda_ubuntu.sh
-        if [[ $? -eq 0 ]]; then
-          # Set paths for subsequent steps, using ${CUDA_PATH}
-          echo "Adding CUDA to CUDA_PATH, PATH and LD_LIBRARY_PATH"
-          echo "CUDA_PATH=${CUDA_PATH}" >> $GITHUB_ENV
-          echo "${CUDA_PATH}/bin" >> $GITHUB_PATH
-          echo "LD_LIBRARY_PATH=${CUDA_PATH}/lib:${LD_LIBRARY_PATH}" >> $GITHUB_ENV
-        fi
-      shell: bash
-    - name: Install Packages
-      run: sudo apt-get install -yq python3-setuptools
+        echo "Adding CUDA to CUDA_PATH, PATH and LD_LIBRARY_PATH"
+        echo "CUDA_PATH=${CUDA_PATH}" >> "$GITHUB_ENV"
+        echo "${CUDA_PATH}/bin" >> "$GITHUB_PATH"
+        echo "LD_LIBRARY_PATH=${CUDA_PATH}/lib64:${LD_LIBRARY_PATH}" >> "$GITHUB_ENV"
     - name: Configure Compiler
       run: |
         if [ "${{ matrix.compiler }}" = "gcc" ]; then
@@ -47,6 +54,13 @@ jobs:
           echo "CXX=clang++-${{ matrix.version }}" >> $GITHUB_ENV
         fi
     - name: Configure Build
-      run: mkdir build && cd build && cmake -DENABLE_CUDA=ON -DCMAKE_BUILD_TYPE=Release ..
+      run: mkdir build && cd build && cmake -DUSE_CUDA=ON -DCMAKE_BUILD_TYPE=Release ..
     - name: Build
-      run: cd build && make
+      run: cd build && make
+    - name: Run CUDA Unit Test
+      run: |
+        if command -v nvidia-smi >/dev/null 2>&1 && nvidia-smi -L >/dev/null 2>&1; then
+          /home/runner/work/CubbyFlow/CubbyFlow/build/bin/CUDATests
+        else
+          echo "No CUDA-capable GPU detected on runner. Skipping CUDA unit tests."
+        fi