Merge branch 'devel' into hdf5_update

Author: mnagaso

.azure-pipelines.yml

@@ -84,7 +84,7 @@ jobs:
     displayName: 'Run checks'
 
 - job: compilation_default
-  # ubuntu-latest: ubuntu-22.04 w/ GCC 11
+  # ubuntu-latest: ubuntu-24.04 w/ GCC 13.3
   displayName: 'Compilation Default GCC'
   steps:
   - template: .azure-pipelines/install-template.yml
@@ -96,14 +96,14 @@ jobs:
       CUDA: false
       BUILD: true
 
-- job: compilation_default_gcc9
-  displayName: 'Compilation Default GCC 9'
+- job: compilation_default_gcc10
+  displayName: 'Compilation Default GCC 10'
   pool:
-    vmImage: 'ubuntu-20.04'
+    vmImage: 'ubuntu-22.04'
   variables:
-    CC: gcc-9
-    CXX: g++-9
-    FC: gfortran-9
+    CC: gcc-10
+    CXX: g++-10
+    FC: gfortran-10
   steps:
   - template: .azure-pipelines/install-template.yml
     parameters:
@@ -114,14 +114,14 @@ jobs:
       CUDA: false
       BUILD: true
 
-- job: compilation_default_gcc10
-  displayName: 'Compilation Default GCC 10'
+- job: compilation_default_gcc11
+  displayName: 'Compilation Default GCC 11'
   pool:
-    vmImage: 'ubuntu-20.04'
+    vmImage: 'ubuntu-22.04'
   variables:
-    CC: gcc-10
-    CXX: g++-10
-    FC: gfortran-10
+    CC: gcc-11
+    CXX: g++-11
+    FC: gfortran-11
   steps:
   - template: .azure-pipelines/install-template.yml
     parameters:
@@ -132,52 +132,52 @@ jobs:
       CUDA: false
       BUILD: true
 
-- job: compilation_CUDA11_gcc9
-  displayName: 'Compilation CUDA 11 GCC 9'
+- job: compilation_CUDA11_gcc10
+  displayName: 'Compilation CUDA 11 GCC 10'
   pool:
-    vmImage: 'ubuntu-20.04'
+    vmImage: 'ubuntu-22.04'
   variables:
-    CC: gcc-9
-    CXX: g++-9
-    FC: gfortran-9
+    CC: gcc-10
+    CXX: g++-10
+    FC: gfortran-10
   steps:
   - template: .azure-pipelines/install-template.yml
     parameters:
       CUDA: true
-      CUDA_V: '11.4'
+      CUDA_V: '11.7'
   - template: .azure-pipelines/configure-template.yml
     parameters:
-      TESTFLAGS: '--with-mpi --enable-vectorization --with-cuda=cuda10'
+      TESTFLAGS: '--with-mpi --enable-vectorization --with-cuda=cuda11'
       CUDA: true
       BUILD: true
 
-- job: compilation_CUDA11_gcc10
-  displayName: 'Compilation CUDA 11 GCC 10'
+- job: compilation_CUDA11_gcc11
+  displayName: 'Compilation CUDA 11 GCC 11'
   pool:
-    vmImage: 'ubuntu-20.04'
+    vmImage: 'ubuntu-22.04'
   variables:
-    CC: gcc-10
-    CXX: g++-10
-    FC: gfortran-10
+    CC: gcc-11
+    CXX: g++-11
+    FC: gfortran-11
   steps:
   - template: .azure-pipelines/install-template.yml
     parameters:
       CUDA: true
-      CUDA_V: '11.4'
+      CUDA_V: '11.7'
   - template: .azure-pipelines/configure-template.yml
     parameters:
-      TESTFLAGS: '--with-mpi --enable-vectorization --with-cuda=cuda11'
+      TESTFLAGS: '--with-mpi --enable-vectorization --with-cuda=cuda10'
       CUDA: true
       BUILD: true
 
 - job: compilation_CUDA12
-  displayName: 'Compilation CUDA 12 GCC 10'
+  displayName: 'Compilation CUDA 12 GCC 12'
   pool:
-    vmImage: 'ubuntu-20.04'
+    vmImage: 'ubuntu-22.04'
   variables:
-    CC: gcc-10
-    CXX: g++-10
-    FC: gfortran-10
+    CC: gcc-12
+    CXX: g++-12
+    FC: gfortran-12
   steps:
   - template: .azure-pipelines/install-template.yml
     parameters:
@@ -195,7 +195,7 @@ jobs:
   - template: .azure-pipelines/install-template.yml
     parameters:
       CUDA: true
-      CUDA_V: '12.1'
+      CUDA_V: '12.9'
   - template: .azure-pipelines/configure-template.yml
     parameters:
       TESTFLAGS: '--with-mpi --enable-vectorization --with-cuda=cuda12'

.azure-pipelines/install-template.yml

@@ -6,9 +6,9 @@
 # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
 # ubuntu-20.04:
 # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md
-# ubuntu-22.04 "ubuntu-latest":
+# ubuntu-22.04:
 # https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md
-#
+# ubuntu-24.04: "ubuntu-latest"
 parameters:
 - name: CUDA
   type: boolean
@@ -118,35 +118,38 @@ steps:
       #UBUNTU_VERSION=ubuntu2004
       ## distribution jammy: from ubuntu 22.04
       #UBUNTU_VERSION=ubuntu2204
+      ## distribution noble: from ubuntu 24.04
+      #UBUNTU_VERSION=ubuntu2204
 
       # default
-      UBUNTU_VERSION=ubuntu2004
+      UBUNTU_VERSION=ubuntu2204
 
       # CUDA_VERSION - specifies CUDA toolkit version
       echo "CUDA version: $CUDA_V"
       # http://developer.download.nvidia.com/compute/cuda/repos/
       if [ "$CUDA_V" == "6.5" ]; then
-        ## trusty
         CUDA_VERSION=6.5-14
       elif [ "$CUDA_V" == "9.2" ]; then
-        ## xenial
         CUDA_VERSION=9.2.148-1
       elif [ "$CUDA_V" == "10.2" ]; then
-        ## bionic
         CUDA_VERSION=10.2.89-1
       elif [ "$CUDA_V" == "11.4" ]; then
-        ## focal
         CUDA_VERSION=11.4.0-1
+      elif [ "$CUDA_V" == "11.7" ]; then
+        CUDA_VERSION=11.7.0-1
       elif [ "$CUDA_V" == "12.1" ]; then
-        ## focal
         CUDA_VERSION=12.1.1-1
+      elif [ "$CUDA_V" == "12.9" ]; then
+        CUDA_VERSION=12.9.0-1
       else
         # note: - on azure VM nodes with ubuntu 18.04, default gcc version is 9.3;
         #       needs at least CUDA version 10.x
         #       - on azure VM nodes with ubuntu 20.04, default gcc version is 10.3;
         #       needs at least CUDA version 11.x
-        #       - on azure VM nodes with ubuntu-latest (22.04), default gcc version is 11.3;
+        #       - on azure VM nodes with ubuntu 22.04, default gcc version is 11.3;
         #       needs at least CUDA version 11.7
+        #       - on azure VM nodes with ubuntu 24.04 (ubuntu-latest), default gcc version is 13.3;
+        #       needs at least CUDA version ?
         CUDA_VERSION=12.1.1-1
       fi
       echo

.github/scripts/run_build.sh

@@ -40,14 +40,52 @@ else
   adios=()
 fi
 
+## HDF5
+if [ "${HDF5}" == "true" ]; then
+  echo
+  echo "enabling HDF5"
+  echo
+  hdf=(--with-hdf5 HDF5_INC="/usr/include/hdf5/openmpi/" HDF5_LIBS="-L/usr/lib/x86_64-linux-gnu/hdf5/openmpi")
+else
+  hdf=()
+fi
+
+## HIP
+if [ "${HIP}" == "true" ]; then
+  echo
+  echo "enabling HIP"
+  echo
+  hip=(--with-hip HIPCC=g++ HIP_FLAGS="-O2 -g -std=c++17" HIP_PLATFORM=cpu HIP_INC=./external_libs/ROCm-HIP-CPU/include HIP_LIBS="-ltbb -lpthread -lstdc++")
+else
+  hip=()
+fi
+
+## special testflags
+if [ "${TESTFLAGS}" == "check-mcmodel-medium" ]; then
+  # note: this is a work-around as using the 'env:' parameter in the workflow 'CI.yml' with TESTFLAGS: FLAGS_CHECK=".."
+  #       won't work as the FLAGS_CHECK string will then get split up and ./configure .. complains about unknown parameters.
+  #       here, we re-define TESTFLAGS with a single quote around FLAGS_CHECK=".." to avoid the splitting.
+  # use FLAGS_CHECK
+  flags=(FLAGS_CHECK="-O3 -mcmodel=medium -std=f2008 -Wall -Wno-do-subscript -Wno-conversion -Wno-maybe-uninitialized")
+  TESTFLAGS=""  # reset
+else
+  flags=()
+fi
+
 # configuration
 echo
 echo "configuration:"
 echo
 
+# split TESTFLAGS into individual items
+set -- ${TESTFLAGS}
+
 ./configure \
-${adios[@]} \
-FC=gfortran MPIFC=mpif90 CC=gcc ${TESTFLAGS}
+"${adios[@]}" \
+"${hdf[@]}" \
+"${hip[@]}" \
+"${flags[@]}" \
+FC=gfortran MPIFC=mpif90 CC=gcc "$@"
 
 # checks
 if [[ $? -ne 0 ]]; then echo "configuration failed:"; cat config.log; echo ""; echo "exiting..."; exit 1; fi
@@ -62,8 +100,14 @@ sed -i "s:IMAIN .*:IMAIN = ISTANDARD_OUTPUT:" setup/constants.h
 
 # compilation
 echo
-echo "compilation:"
-make clean; make -j2 all
+echo "clean"
+echo
+make clean
+
+echo
+echo "compilation"
+echo
+make -j4 all
 
 # checks
 if [[ $? -ne 0 ]]; then exit 1; fi

.github/scripts/run_install.sh

@@ -15,10 +15,10 @@ if [[ $? -ne 0 ]]; then exit 1; fi
 # fortran/openMPI compiler
 sudo apt-get install -yq --no-install-recommends gfortran g++ openmpi-bin libopenmpi-dev
 
-# parallel hdf5
-if [[ "${TEST}" == *"with-hdf5"* ]]; then
+## parallel HDF5
+if [ "${HDF5}" == "true" ]; then
   echo
-  echo "additional installation: ${TEST}"
+  echo "HDF5 additional installation:"
   echo
   sudo apt-get install -yq --no-install-recommends libhdf5-mpi-dev
   ## checks installation paths
@@ -34,6 +34,14 @@ if [[ "${TEST}" == *"with-hdf5"* ]]; then
   #echo
 fi
 
+## HIP
+if [ "${HIP}" == "true" ]; then
+  echo
+  echo "HIP additionals installation:"
+  echo
+  sudo apt-get install -yq --no-install-recommends libtbb-dev
+fi
+
 # checks exit code
 if [[ $? -ne 0 ]]; then exit 1; fi
 echo