Merge branch 'development' into clang-tidy-action

Author: zingale

.github/workflows/check_params.py

@@ -10,7 +10,7 @@
 whitelist = ["maestro.lo_bc",
              "maestro.hi_bc"]
 
-# we don't have all of the radiation parametrs in the _cpp_parameters
+# we don't have all of the radiation parameters in the _cpp_parameters
 # yet, so we won't check these namespaces
 
 namespace_ignore = []

…lows/dependencies_clang-tidy-apt-llvm.sh …cies/dependencies_clang-tidy-apt-llvm.sh.github/workflows/dependencies_clang-tidy-apt-llvm.sh renamed to .github/workflows/dependencies/dependencies_clang-tidy-apt-llvm.sh .github/workflows/dependencies_clang-tidy-apt-llvm.sh renamed to .github/workflows/dependencies/dependencies_clang-tidy-apt-llvm.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+#
+# Copyright 2020-2022 Axel Huebl
+#
+# License: BSD-3-Clause-LBNL
+
+set -eu -o pipefail
+
+# `man apt.conf`:
+#   Number of retries to perform. If this is non-zero APT will retry
+#   failed files the given number of times.
+echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries
+
+sudo apt-get -qqq update
+sudo apt-get install -y \
+    build-essential     \
+    ca-certificates     \
+    cmake               \
+    g++                 \
+    gfortran            \
+    gnupg               \
+    libopenmpi-dev      \
+    openmpi-bin         \
+    pkg-config          \
+    wget
+
+VERSION_DOTTED=${1-12.0} && VERSION_DASHED=$(sed 's/\./-/' <<< $VERSION_DOTTED)
+curl -O https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-keyring_1.0-1_all.deb
+sudo dpkg -i cuda-keyring_1.0-1_all.deb
+sudo apt-get update
+sudo apt-get install -y \
+    cuda-command-line-tools-$VERSION_DASHED \
+    cuda-compiler-$VERSION_DASHED           \
+    cuda-cupti-dev-$VERSION_DASHED          \
+    cuda-minimal-build-$VERSION_DASHED      \
+    cuda-nvml-dev-$VERSION_DASHED           \
+    cuda-nvtx-$VERSION_DASHED               \
+    libcublas-dev-$VERSION_DASHED           \
+    libcufft-dev-$VERSION_DASHED            \
+    libcurand-dev-$VERSION_DASHED           \
+    libcusparse-dev-$VERSION_DASHED
+sudo ln -s cuda-$VERSION_DOTTED /usr/local/cuda

.github/workflows/dependencies/dependencies_nvcc.sh

@@ -1,9 +1,10 @@
 name: GPU compilation
 
 on: [pull_request]
+
 jobs:
   gpu-compilation:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -24,14 +25,7 @@ jobs:
           sudo apt-get -qq -y install curl cmake jq clang g++>=9.3.0
 
       - name: Install CUDA
-        # from https://developer.nvidia.com/cuda-downloads?target_os=Linux&target_arch=x86_64&Distribution=Ubuntu&target_version=20.04&target_type=deb_network
-        run: |
-          wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin
-          sudo mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600
-          sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub
-          sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /"
-          sudo apt-get update
-          sudo apt-get -y install cuda
+        run: .github/workflows/dependencies/dependencies_nvcc.sh 11.8
 
       - name: Compile reacting_bubble for GPU
         run: |

.github/workflows/gpu_action.yml

@@ -1,3 +1,7 @@
+# 25.02
+
+  * CI fixes (#478, #481,#482)
+
 # 24.08
 
   * change access to phys_bc to use BCRec (#469)

CHANGES.md

@@ -354,7 +354,7 @@ void Maestro::MakeRHCCforNodalProj(Vector<MultiFab>& rhcc,
         }
     }
 
-    // averge down and fill ghost cells using first-order extrapolation
+    // average down and fill ghost cells using first-order extrapolation
     AverageDown(rhcc, 0, 1);
     FillPatch(t_old, rhcc, rhcc, rhcc, 0, 0, 1, 0, bcs_f);
 }

Exec/test_problems/imposed_external_heating/MaestroMakeS.cpp

@@ -353,7 +353,7 @@ void Maestro::MakeRHCCforNodalProj(Vector<MultiFab>& rhcc,
         }
     }
 
-    // averge down and fill ghost cells using first-order extrapolation
+    // average down and fill ghost cells using first-order extrapolation
     AverageDown(rhcc, 0, 1);
     FillPatch(t_old, rhcc, rhcc, rhcc, 0, 0, 1, 0, bcs_f);
 }