Revert workflow changes

ECP-WarpX · Nov 18, 2024 · cf51047 · cf51047
1 parent fbaa6f2
commit cf51047
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 71 deletions.
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
@@ -13,8 +13,6 @@ pr:
   paths:
     exclude:
     - Docs
-    - .github/workflows/**
-    - .azure-pipelines.yml
 
 jobs:
 - job:
@@ -40,6 +38,7 @@ jobs:
       # Cartesian 3D
       cartesian_3d:
         WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_PYTHON=ON
+        WARPX_HEFFTE: 'TRUE'
       # Cylindrical RZ
       cylindrical_rz:
         WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_PYTHON=ON
@@ -122,6 +121,17 @@ jobs:
           -DCMAKE_CXX_STANDARD=17                         \
           -Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON
       fi
+      if [ "${WARPX_HEFFTE:-FALSE}" == "TRUE" ]; then
+        cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/heffte.git@v2.4.0 \
+          -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache)          \
+          -DCMAKE_CXX_STANDARD=17 -DHeffte_ENABLE_DOXYGEN=OFF    \
+          -DHeffte_ENABLE_FFTW=ON -DHeffte_ENABLE_TESTING=OFF    \
+          -DHeffte_ENABLE_CUDA=OFF -DHeffte_ENABLE_ROCM=OFF      \
+          -DHeffte_ENABLE_ONEAPI=OFF -DHeffte_ENABLE_MKL=OFF     \
+          -DHeffte_ENABLE_PYTHON=OFF -DHeffte_ENABLE_FORTRAN=OFF \
+          -DHeffte_ENABLE_MAGMA=OFF                              \
+          -DCMAKE_VERBOSE_MAKEFILE=ON
+      fi
       # Python modules required for test analysis
       python3 -m pip install --upgrade -r Regression/requirements.txt
       python3 -m pip cache purge

diff --git a/.github/workflows/clang_sanitizers.yml b/.github/workflows/clang_sanitizers.yml
@@ -4,10 +4,9 @@ on:
   push:
     branches:
       - "development"
-  workflow_run:
-    workflows: [PR analysis]
-    types:
-      - completed
+  pull_request:
+    paths-ignore:
+      - "Docs/**"
 
 concurrency:
   group: ${{ github.ref }}-${{ github.head_ref }}-clangsanitizers
@@ -18,7 +17,7 @@ jobs:
     name: Clang UB sanitizer
     runs-on: ubuntu-22.04
     container: ubuntu:23.10
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     env:
       CC: clang
       CXX: clang++
@@ -84,7 +83,7 @@ jobs:
     name: Clang thread sanitizer
     runs-on: ubuntu-22.04
     container: ubuntu:23.10
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     env:
       CC: clang
       CXX: clang++

diff --git a/.github/workflows/clang_tidy.yml b/.github/workflows/clang_tidy.yml
@@ -4,10 +4,9 @@ on:
   push:
     branches:
       - "development"
-  workflow_run:
-    workflows: [PR analysis]
-    types:
-      - completed
+  pull_request:
+    paths-ignore:
+      - "Docs/**"
 
 concurrency:
   group: ${{ github.ref }}-${{ github.head_ref }}-clangtidy
@@ -21,7 +20,7 @@ jobs:
     name: clang-tidy-${{ matrix.dim }}D
     runs-on: ubuntu-22.04
     timeout-minutes: 180
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     steps:
     - uses: actions/checkout@v4
     - name: install dependencies

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,12 +2,9 @@ name: 🔍 CodeQL
 
 on:
   push:
-    branches:
-      - "development"
-  workflow_run:
-    workflows: [PR analysis]
-    types:
-      - completed
+    branches: [ "development" ]
+  pull_request:
+    branches: [ "development" ]
   schedule:
     - cron: "27 3 * * 0"
 
@@ -19,7 +16,7 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     permissions:
       actions: read
       contents: read

diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml
@@ -4,10 +4,9 @@ on:
   push:
     branches:
       - "development"
-  workflow_run:
-    workflows: [PR analysis]
-    types:
-      - completed
+  pull_request:
+    paths-ignore:
+      - "Docs/**"
 
 concurrency:
   group: ${{ github.ref }}-${{ github.head_ref }}-cuda
@@ -21,7 +20,7 @@ jobs:
   build_nvcc:
     name: NVCC 11.3 SP
     runs-on: ubuntu-20.04
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     env:
       CXXFLAGS: "-Werror"
       CMAKE_GENERATOR: Ninja
@@ -63,6 +62,16 @@ jobs:
           -DBUILD_CLI_TOOLS=OFF       \
           -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \
           -DCMAKE_VERBOSE_MAKEFILE=ON
+        cmake-easyinstall --prefix=/usr/local                    \
+          git+https://github.com/icl-utk-edu/heffte.git@v2.4.0   \
+          -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache)          \
+          -DCMAKE_CXX_STANDARD=17 -DHeffte_ENABLE_DOXYGEN=OFF    \
+          -DHeffte_ENABLE_FFTW=OFF -DHeffte_ENABLE_TESTING=OFF   \
+          -DHeffte_ENABLE_CUDA=ON -DHeffte_ENABLE_ROCM=OFF       \
+          -DHeffte_ENABLE_ONEAPI=OFF -DHeffte_ENABLE_MKL=OFF     \
+          -DHeffte_ENABLE_PYTHON=OFF -DHeffte_ENABLE_FORTRAN=OFF \
+          -DHeffte_ENABLE_MAGMA=OFF                              \
+          -DCMAKE_VERBOSE_MAKEFILE=ON
     - name: build WarpX
       run: |
         export CCACHE_COMPRESS=1
@@ -83,6 +92,7 @@ jobs:
           -DWarpX_openpmd_internal=OFF \
           -DWarpX_PRECISION=SINGLE     \
           -DWarpX_FFT=ON               \
+          -DWarpX_HEFFTE=ON            \
           -DAMReX_CUDA_ERROR_CROSS_EXECUTION_SPACE_CALL=ON \
           -DAMReX_CUDA_ERROR_CAPTURE_THIS=ON
         cmake --build build_sp -j 4
@@ -102,7 +112,7 @@ jobs:
   build_nvcc_gnumake:
     name: NVCC 11.8.0 GNUmake
     runs-on: ubuntu-20.04
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     steps:
     - uses: actions/checkout@v4
     - name: install dependencies
@@ -127,7 +137,7 @@ jobs:
         which nvcc || echo "nvcc not in PATH!"
 
         git clone https://github.com/AMReX-Codes/amrex.git ../amrex
-        cd ../amrex && git checkout --detach 456c93c7d9512f1cdffac0574973d7df41417898 && cd -
+        cd ../amrex && git checkout --detach 4b703fec6c2ff983e465c8cef0cc4947231edb07 && cd -
         make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_FFT=TRUE USE_CCACHE=TRUE -j 4
 
         ccache -s
@@ -136,7 +146,7 @@ jobs:
   build_nvhpc24-1-nvcc:
     name: NVHPC@24.1 NVCC/NVC++ Release [tests]
     runs-on: ubuntu-20.04
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     #env:
     #  # For NVHPC, Ninja is slower than the default:
     #  CMAKE_GENERATOR: Ninja

diff --git a/.github/workflows/dependencies/hip.sh b/.github/workflows/dependencies/hip.sh
@@ -79,3 +79,16 @@ sudo curl -L -o /usr/local/bin/cmake-easyinstall https://raw.githubusercontent.c
 sudo chmod a+x /usr/local/bin/cmake-easyinstall
 export CEI_SUDO="sudo"
 export CEI_TMP="/tmp/cei"
+
+# heFFTe
+#
+cmake-easyinstall --prefix=/usr/local                      \
+    git+https://github.com/icl-utk-edu/heffte.git@v2.4.0   \
+    -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache)          \
+    -DCMAKE_CXX_STANDARD=17 -DHeffte_ENABLE_DOXYGEN=OFF    \
+    -DHeffte_ENABLE_FFTW=OFF -DHeffte_ENABLE_TESTING=OFF   \
+    -DHeffte_ENABLE_CUDA=OFF -DHeffte_ENABLE_ROCM=ON       \
+    -DHeffte_ENABLE_ONEAPI=OFF -DHeffte_ENABLE_MKL=OFF     \
+    -DHeffte_ENABLE_PYTHON=OFF -DHeffte_ENABLE_FORTRAN=OFF \
+    -DHeffte_ENABLE_MAGMA=OFF                              \
+    -DCMAKE_VERBOSE_MAKEFILE=ON
diff --git a/.github/workflows/hip.yml b/.github/workflows/hip.yml
@@ -4,10 +4,9 @@ on:
   push:
     branches:
       - "development"
-  workflow_run:
-    workflows: [PR analysis]
-    types:
-      - completed
+  pull_request:
+    paths-ignore:
+      - "Docs/**"
 
 concurrency:
   group: ${{ github.ref }}-${{ github.head_ref }}-hip
@@ -20,7 +19,7 @@ jobs:
     env:
       CXXFLAGS: "-Werror -Wno-deprecated-declarations -Wno-error=pass-failed"
       CMAKE_GENERATOR: Ninja
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     steps:
     - uses: actions/checkout@v4
     - name: install dependencies
@@ -62,7 +61,8 @@ jobs:
           -DWarpX_MPI=ON              \
           -DWarpX_OPENPMD=ON          \
           -DWarpX_PRECISION=SINGLE    \
-          -DWarpX_FFT=ON
+          -DWarpX_FFT=ON              \
+          -DWarpX_HEFFTE=ON
         cmake --build build_sp -j 4
 
         export WARPX_MPI=OFF
@@ -79,7 +79,7 @@ jobs:
     env:
       CXXFLAGS: "-Werror -Wno-deprecated-declarations -Wno-error=pass-failed"
       CMAKE_GENERATOR: Ninja
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     steps:
     - uses: actions/checkout@v4
     - name: install dependencies
@@ -122,7 +122,8 @@ jobs:
           -DWarpX_MPI=ON              \
           -DWarpX_OPENPMD=ON          \
           -DWarpX_PRECISION=DOUBLE    \
-          -DWarpX_FFT=ON
+          -DWarpX_FFT=ON              \
+          -DWarpX_HEFFTE=ON
         cmake --build build_2d -j 4
 
         export WARPX_MPI=OFF

diff --git a/.github/workflows/insitu.yml b/.github/workflows/insitu.yml
@@ -4,10 +4,9 @@ on:
   push:
     branches:
       - "development"
-  workflow_run:
-    workflows: [PR analysis]
-    types:
-      - completed
+  pull_request:
+    paths-ignore:
+      - "Docs/**"
 
 concurrency:
   group: ${{ github.ref }}-${{ github.head_ref }}-insituvis
@@ -17,7 +16,7 @@ jobs:
   sensei:
     name: SENSEI
     runs-on: ubuntu-20.04
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     env:
       CXX: clang++
       CC: clang
@@ -43,7 +42,7 @@ jobs:
   ascent:
     name: Ascent
     runs-on: ubuntu-20.04
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     env:
       CXX: g++
       CC: gcc
@@ -83,7 +82,7 @@ jobs:
   catalyst:
     name: Catalyst
     runs-on: ubuntu-22.04
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     env:
       CXX: g++
       CC: gcc

diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml
@@ -4,10 +4,9 @@ on:
   push:
     branches:
       - "development"
-  workflow_run:
-    workflows: [PR analysis]
-    types:
-      - completed
+  pull_request:
+    paths-ignore:
+      - "Docs/**"
 
 concurrency:
   group: ${{ github.ref }}-${{ github.head_ref }}-intel
@@ -19,7 +18,7 @@ jobs:
   build_icc:
     name: oneAPI ICC SP&DP
     runs-on: ubuntu-20.04
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     # For oneAPI, Ninja is slower than the default:
     #env:
     #  CMAKE_GENERATOR: Ninja
@@ -87,7 +86,7 @@ jobs:
       CXXFLAGS: "-Werror -Wno-error=pass-failed -Wno-tautological-constant-compare"
     # For oneAPI, Ninja is slower than the default:
     #  CMAKE_GENERATOR: Ninja
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     steps:
     - uses: actions/checkout@v4
     - name: install dependencies
@@ -152,7 +151,7 @@ jobs:
       CXXFLAGS: "-Werror -Wno-tautological-constant-compare"
     # For oneAPI, Ninja is slower than the default:
     #  CMAKE_GENERATOR: Ninja
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     steps:
     - uses: actions/checkout@v4
     - name: install dependencies

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -4,10 +4,9 @@ on:
   push:
     branches:
       - "development"
-  workflow_run:
-    workflows: [PR analysis]
-    types:
-      - completed
+  pull_request:
+    paths-ignore:
+      - "Docs/**"
 
 concurrency:
   group: ${{ github.ref }}-${{ github.head_ref }}-macos
@@ -17,8 +16,7 @@ jobs:
   build_appleclang:
     name: AppleClang
     runs-on: macos-latest
-    if: 0
-    #if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
+    if: github.event.pull_request.draft == false
     env:
       HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: TRUE
       # For macOS, Ninja is slower than the default: