From 1ef81c4da8e18ed25f0f0a4f7d2a3091eadc8272 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Sun, 31 Mar 2024 11:37:40 +0200
Subject: [PATCH] GitHub Actions for PETSc 3.21.0

---
 .github/workflows/Fortran.yml | 19 +++++++++++++------
 .github/workflows/Python.yml  |  4 ++--
 PRIVATE                       |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/Fortran.yml b/.github/workflows/Fortran.yml
index 3a7548b2f..b6450e5c4 100644
--- a/.github/workflows/Fortran.yml
+++ b/.github/workflows/Fortran.yml
@@ -2,7 +2,7 @@ name: Grid and Mesh Solver
 on: [push]
 
 env:
-  PETSC_VERSION: '3.20.5'
+  PETSC_VERSION: '3.21.0'
   HOMEBREW_NO_ANALYTICS: 'ON'     # Make Homebrew installation a little quicker
   HOMEBREW_NO_AUTO_UPDATE: 'ON'
   HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 'ON'
@@ -67,7 +67,7 @@ jobs:
         run: |
           cd petsc-${PETSC_VERSION}
           ./configure --with-fc=gfortran --with-cc=gcc --with-cxx=g++ \
-          --download-openmpi --download-fftw --download-hdf5 --download-hdf5-fortran-bindings=1 --download-zlib \
+          --download-openmpi --download-fftw --download-hdf5 --with-hdf5-fortran-bindings=1 --download-zlib \
           --with-mpi-f90module-visibility=1
           make all
 
@@ -108,8 +108,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install \
           intel-basekit \
-          intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-compiler-fortran \
-          intel-oneapi-openmp intel-oneapi-mkl-devel
+          intel-hpckit
           source /opt/intel/oneapi/setvars.sh
           printenv >> $GITHUB_ENV
 
@@ -128,7 +127,7 @@ jobs:
       - name: PETSc - Prepare
         run: |
           tar -xf download/petsc-${PETSC_VERSION}.tar.gz -C .
-          sed -i "1800s/if not os.path.isfile(os.path.join(self.packageDir,self.configureName)):/if True:/g" \
+          sed -i "1802s/if not os.path.isfile(os.path.join(self.packageDir,self.configureName)):/if True:/g" \
           ./petsc-${PETSC_VERSION}/config/BuildSystem/config/package.py
           export PETSC_DIR=${PWD}/petsc-${PETSC_VERSION}
           export PETSC_ARCH=intel
@@ -143,14 +142,22 @@ jobs:
 
       - name: PETSc - Install
         run: |
+          mpiifx -show
           cd petsc-${PETSC_VERSION}
           ./configure \
           --with-fc=mpiifx \
           --with-cc=mpiicx \
           --with-cxx=mpiicpx \
-          --download-fftw --download-hdf5 --download-hdf5-fortran-bindings=1 --download-zlib
+          --download-fftw --download-hdf5 --with-hdf5-fortran-bindings=1 --download-zlib
           make all
 
+      - name: PETSc - Save log
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: configure.log
+          path: petsc-3.21.0/configure.log
+
       - name: DAMASK - Compile
         run: |
           cmake -B build/grid -DDAMASK_SOLVER=grid -DCMAKE_INSTALL_PREFIX=${PWD}
diff --git a/.github/workflows/Python.yml b/.github/workflows/Python.yml
index 1e0a3c1ce..489d8f317 100644
--- a/.github/workflows/Python.yml
+++ b/.github/workflows/Python.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
@@ -63,7 +63,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install pytest
         run: |
diff --git a/PRIVATE b/PRIVATE
index ff290d2d7..f20340ab2 160000
--- a/PRIVATE
+++ b/PRIVATE
@@ -1 +1 @@
-Subproject commit ff290d2d768e16e837933bc7c858f514d175f26e
+Subproject commit f20340ab26f56f9264f9893642ebeb8308ef483b