Merge branch 'development' into sdc_clip

.clang-tidy

@@ -7,7 +7,6 @@ Checks: >
      clang-diagnostic-*,
      cppcoreguidelines-*,
        -cppcoreguidelines-avoid-c-arrays,
-       -cppcoreguidelines-avoid-goto,
        -cppcoreguidelines-avoid-magic-numbers,
        -cppcoreguidelines-avoid-non-const-global-variables,
        -cppcoreguidelines-init-variables,
@@ -17,11 +16,17 @@ Checks: >
        -cppcoreguidelines-non-private-member-variables-in-classes,
        -cppcoreguidelines-owning-memory,
        -cppcoreguidelines-pro-*,
+     misc-*,
+       -misc-const-correctness,
+       -misc-include-cleaner,
+       -misc-non-private-member-variables-in-classes,
      modernize-*,
        -modernize-avoid-c-arrays,
        -modernize-use-trailing-return-type,
        -modernize-use-using,
      performance-*,
+       -performance-avoid-endl,
+     portability-*,
      readability-*,
        -readability-avoid-const-params-in-decls,
        -readability-braces-around-statements,

.github/dependabot.yml

@@ -0,0 +1,9 @@
+# Dependabot configuration
+# ref: https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "development"

.github/workflows/c-linter.yml

@@ -6,7 +6,7 @@ jobs:
   cpp-linter:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -30,7 +30,7 @@ jobs:
           tar xfz v2.28.0.tar.gz
           cd hypre-2.28.0/src
           ./configure --with-cxxstandard=17 --without-MPI
-          make -j 2
+          make -j 4
           make install
           cd ../../
 
@@ -56,7 +56,7 @@ jobs:
           -run-linter
 
       - name: Archive clang tidy report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: clang-tidy-report
           path: clang-tidy-report.txt

.github/workflows/check-ifdefs.yml

@@ -14,23 +14,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
-
-      - name: Cache pip
-        uses: actions/cache@v3
-        with:
-          # this path is specific to Ubuntu
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          python-version: '3.11'
 
       - name: Run check-ifdefs
         run: |

.github/workflows/check-makefiles.yml

@@ -0,0 +1,29 @@
+name: check makefiles
+
+on:
+  push:
+    branches:
+      - development
+      - main
+  pull_request:
+    branches:
+      - development
+
+jobs:
+  check-ifdefs:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Run check-ifdefs
+        run: |
+          python .github/workflows/check_makefiles.py
+

.github/workflows/check-params.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -28,19 +28,10 @@ jobs:
           cd ../..
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 
-      - name: Cache pip
-        uses: actions/cache@v3
-        with:
-          # this path is specific to Ubuntu
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-
       - name: Run check-params
         run: |
           PYTHONPATH=external/Microphysics/util/build_scripts python .github/workflows/check_params.py .

.github/workflows/check_makefiles.py

@@ -0,0 +1,46 @@
+import re
+import sys
+from pathlib import Path
+
+correct_params = {
+    "DEBUG": "FALSE",
+    "USE_MPI": "TRUE",
+    "USE_OMP": "FALSE",
+    "COMP": "gnu",
+    "USE_CUDA": "FALSE",
+    "USE_HIP": "FALSE",
+    "PRECISION": "DOUBLE",
+    "PROFILE": "FALSE"}
+
+
+def find_source_files():
+    p = Path("./Exec")
+    files = list(p.glob(r"**/GNUmakefile"))
+    return files
+
+def check_makefile(makefile):
+
+    with open(makefile) as mf:
+        for _line in mf:
+            if idx := _line.find("#") >= 0:
+                line = _line[:idx]
+            else:
+                line = _line
+
+            for key in correct_params:
+                if key in line:
+                    try:
+                        k, v = re.split(":=|\?=|=", line)
+                    except ValueError:
+                        sys.exit(f"invalid line: {line}")
+
+                    if not v.strip() == correct_params[key]:
+                        sys.exit(f"invalid param {key} in {makefile}")
+
+if __name__ == "__main__":
+
+    for f in find_source_files():
+        check_makefile(f)
+
+
+

.github/workflows/codespell.yml

@@ -14,23 +14,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
-
-      - name: Cache pip
-        uses: actions/cache@v3
-        with:
-          # this path is specific to Ubuntu
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          cache: "pip"
 
       - name: Install dependencies
         run: pip install -r ./requirements.txt

.github/workflows/compiler-warnings.yml

@@ -5,7 +5,7 @@ jobs:
   compiler_warnings:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -26,14 +26,14 @@ jobs:
       - name: Compile Detonation
         run: |
           cd Exec/science/Detonation
-          make USE_MPI=FALSE USE_OMP=FALSE DEBUG=TRUE WARN_ALL=TRUE WARN_ERROR=TRUE -j 2
+          make USE_MPI=FALSE USE_OMP=FALSE DEBUG=TRUE WARN_ALL=TRUE WARN_ERROR=TRUE -j 4
 
       - name: Compile subchandra
         run: |
           cd Exec/science/subchandra
-          make USE_MPI=FALSE USE_OMP=FALSE DEBUG=TRUE WARN_ALL=TRUE WARN_ERROR=TRUE -j 2
+          make USE_MPI=FALSE USE_OMP=FALSE DEBUG=TRUE WARN_ALL=TRUE WARN_ERROR=TRUE -j 4
 
       - name: Compile wdmerger
         run: |
           cd Exec/science/wdmerger
-          make USE_MPI=FALSE USE_OMP=FALSE DEBUG=TRUE WARN_ALL=TRUE WARN_ERROR=TRUE -j 2
+          make USE_MPI=FALSE USE_OMP=FALSE DEBUG=TRUE WARN_ALL=TRUE WARN_ERROR=TRUE -j 4

.github/workflows/create_release.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Get the version
         id: get_version
@@ -33,4 +33,4 @@ jobs:
           release_name: Release ${{ github.ref }}
           body: ${{ env.RELEASE_TXT }}
           draft: false
-          prerelease: false
+          prerelease: false

.github/workflows/dependencies_hip.sh

@@ -1,17 +1,26 @@
 #!/usr/bin/env bash
 #
-# Copyright 2020-2022 The AMReX Community
+# Copyright 2020 The AMReX Community
 #
 # License: BSD-3-Clause-LBNL
 # Authors: Axel Huebl
 
+# search recursive inside a folder if a file contains tabs
+#
+# @result 0 if no files are found, else 1
+#
+
 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
 
 # Ref.: https://rocmdocs.amd.com/en/latest/Installation_Guide/Installation-Guide.html#ubuntu
 curl -O https://repo.radeon.com/rocm/rocm.gpg.key
 sudo apt-key add rocm.gpg.key
-echo 'deb [arch=amd64] https://repo.radeon.com/rocm/apt/debian/ ubuntu main' \
+echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${1-debian}/ ubuntu main" \
   | sudo tee /etc/apt/sources.list.d/rocm.list
 echo 'export PATH=/opt/rocm/llvm/bin:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/rocm/opencl/bin:$PATH' \
   | sudo tee -a /etc/profile.d/rocm.sh
@@ -34,12 +43,14 @@ sudo apt-get install -y --no-install-recommends \
     roctracer-dev   \
     rocprofiler-dev \
     rocrand-dev     \
-    rocprim-dev
+    rocprim-dev     \
+    hiprand-dev
 
 # activate
 #
 source /etc/profile.d/rocm.sh
 hipcc --version
+hipconfig --full
 which clang
 which clang++
 which flang

.github/workflows/detonation-sdc-compare.yml

@@ -5,7 +5,7 @@ jobs:
   detonation-sdc:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -26,7 +26,7 @@ jobs:
       - name: Compile Detonation
         run: |
           cd Exec/science/Detonation
-          make DIM=1 USE_MPI=FALSE -j 2 USE_SIMPLIFIED_SDC=TRUE
+          make DIM=1 USE_MPI=FALSE -j 4 USE_SIMPLIFIED_SDC=TRUE
 
       - name: Run Detonation
         run: |
@@ -36,7 +36,7 @@ jobs:
       - name: Build the fextrema tool
         run: |
           cd external/amrex/Tools/Plotfile
-          make programs=fextrema -j 2
+          make programs=fextrema -j 4
 
       - name: Check the extrema
         run: |

.github/workflows/docs-test.yml

@@ -14,26 +14,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install pandoc and doxygen
         run: |
           sudo apt install pandoc doxygen
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
-
-      - name: Cache pip
-        uses: actions/cache@v3
-        with:
-          # this path is specific to Ubuntu
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          python-version: '3.11'
+          cache: "pip"
 
       - name: Install dependencies
         run: pip install -r ./requirements.txt

.github/workflows/exact_riemann.yml

@@ -5,7 +5,7 @@ jobs:
   exact_riemann:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.github/workflows/flame_wave-compare.yml

@@ -5,7 +5,7 @@ jobs:
   flame_wave-2d:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0