Update against upstream

.github/workflows/Build.yml

@@ -18,17 +18,23 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     # Runs a single command using the runners shell
     - name: Install requirements
       run: |
         sudo apt-get update
-        sudo apt-get install -y gfortran openmpi-bin libopenmpi-dev
+        sudo apt-get install -y gfortran openmpi-bin libopenmpi-dev cmake
 
     # Runs a set of commands using the runners shell
     - name: Compile
-      run: make BUILD=dev
+      run: |
+        export FC=mpif90
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=dev -DBUILD_TESTING=ON
+        cmake --build build --target decomp2d
 
     - name: Examples
-      run: make examples
+      run: |
+        export FC=mpif90
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=dev -DBUILD_TESTING=ON
+        cmake --build build

.github/workflows/Build_all.yml

@@ -18,17 +18,52 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     # Runs a single command using the runners shell
     - name: Install requirements
       run: |
         sudo apt-get update
-        sudo apt-get install -y gfortran openmpi-bin libopenmpi-dev
+        sudo apt-get install -y gfortran openmpi-bin libopenmpi-dev cmake
 
     # Runs a set of commands using the runners shell
     - name: Compile
-      run: make BUILD=dev && make examples
+      run: |
+        export FC=mpif90.openmpi
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Dev -DBUILD_TESTING=ON
+        cmake --build build --verbose
+
+    # Runs a set of commands using the runners shell
+    - name: Single precision
+      run: |
+        export FC=mpif90.openmpi
+        rm -rf ./build
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Dev -DBUILD_TESTING=ON -DDOUBLE_PRECISION=OFF
+        cmake --build build --verbose
+
+    # Runs a set of commands using the runners shell
+    - name: Double precision with single precision IO
+      run: |
+        export FC=mpif90.openmpi
+        rm -rf ./build
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Dev -DBUILD_TESTING=ON -DSINGLE_PRECISION_OUTPUT=ON
+        cmake --build build --verbose
+
+    # Runs a set of commands using the runners shell
+    - name: Padded alltoall transpose operations
+      run: |
+        export FC=mpif90.openmpi
+        rm -rf ./build
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Dev -DBUILD_TESTING=ON -DEVEN=ON
+        cmake --build build --verbose
+
+    # Runs a set of commands using the runners shell
+    - name: Debug flag for halo operations
+      run: |
+        export FC=mpif90.openmpi
+        rm -rf ./build
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Dev -DBUILD_TESTING=ON -DHALO_DEBUG=ON
+        cmake --build build --verbose
 
   bld_gnu_mpich:
     # The type of runner that the job will run on
@@ -37,45 +72,46 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     # Runs a single command using the runners shell
     - name: Install requirements
       run: |
         sudo apt-get update
-        sudo apt-get install -y gfortran mpich libmpich-dev
+        sudo apt-get install -y gfortran mpich libmpich-dev cmake
 
     # Runs a set of commands using the runners shell
     - name: Compile
-      run: make BUILD=dev && make examples
-
-###  bld_nvidia:
-###    # The type of runner that the job will run on
-###    runs-on: ubuntu-latest
-###    env:
-###      TMP: /opt/nvidia/hpc_sdk/Linux_x86_64/22.7/comm_libs/mpi/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/22.7/compilers/bin
-###
-###    # Steps represent a sequence of tasks that will be executed as part of the job
-###    steps:
-###    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-###    - uses: actions/checkout@v3
-###
-###    # Add Nvidia HPC SDK
-###    - name: setup repo
-###      run: |
-###        echo 'deb [trusted=yes] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' | sudo tee /etc/apt/sources.list.d/nvhpc.list
-###    # Install dependencies
-###    - name: install
-###      run: |
-###        sudo apt-get update  -y
-###        sudo apt-get install -y nvhpc-22-7-cuda-multi
-###
-###    # Runs a set of commands using the runners shell
-###    - name: CPU version
-###      run: |
-###        PATH=$TMP:$PATH make CMP=nvhpc BUILD=debug
-###        PATH=$TMP:$PATH make examples
-###
+      run: |
+        export FC=mpif90.mpich
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Dev -DBUILD_TESTING=ON
+        cmake --build build --verbose
+
+  bld_nvidia:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+    env:
+      TMP: /opt/nvidia/hpc_sdk/Linux_x86_64/24.11/comm_libs/mpi/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/24.11/compilers/bin
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v4
+
+    # Add Nvidia HPC SDK
+    - name: setup repo
+      run: |
+        echo 'deb [trusted=yes] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' | sudo tee /etc/apt/sources.list.d/nvhpc.list
+    # Install dependencies
+    - name: install
+      run: |
+        sudo apt-get update  -y
+        sudo apt-get install -y nvhpc-24-11
+    # Runs a set of commands using the runners shell
+    - name: CPU version
+      run: |
+        PATH=$TMP:$PATH FC=mpif90 cmake -S . -B build -DCMAKE_BUILD_TYPE=Dev -DBUILD_TESTING=ON
+        PATH=$TMP:$PATH cmake --build build --verbose
+
 ###    - name: GPU version
 ###      run: |
 ###        PATH=$TMP:$PATH make clean
@@ -88,7 +124,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     # Add Intel OneApi
     - name: setup repo
@@ -98,15 +134,25 @@ jobs:
     - name: install
       run: |
         sudo apt-get update
-        sudo apt-get install -y intel-oneapi-common-vars intel-oneapi-compiler-fortran intel-oneapi-mkl intel-oneapi-mkl-devel intel-oneapi-mpi intel-oneapi-mpi-devel
+        sudo apt-get install -y intel-oneapi-common-vars intel-oneapi-compiler-fortran intel-oneapi-mkl intel-oneapi-mkl-devel intel-oneapi-mpi intel-oneapi-mpi-devel cmake
 
     # Runs a set of commands using the runners shell
     - name: Compile
-      run: source /opt/intel/oneapi/setvars.sh && make CMP=intel BUILD=debug && make examples
+      run: |
+        source /opt/intel/oneapi/setvars.sh
+        export FC=mpiifx
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Dev -DBUILD_TESTING=ON
+        cmake --build build --verbose
 
     # Runs a set of commands using the runners shell
     - name: Compile
-      run: source /opt/intel/oneapi/setvars.sh && make clean && make CMP=intel FFT=mkl BUILD=debug && make examples
+      run: |
+        source /opt/intel/oneapi/setvars.sh
+        export FC=mpiifx
+        export MKL_DIR=${MKLROOT}/lib/cmake/mkl
+        rm -rf ./build
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Dev -DFFT_Choice=mkl -DBUILD_TESTING=ON
+        cmake --build build --verbose
 
   bld_fftw3:
     # The type of runner that the job will run on
@@ -115,7 +161,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     # Runs a single command using the runners shell
     - name: Install requirements
@@ -126,15 +172,16 @@ jobs:
     # Runs a set of commands using the runners shell
     - name: Regular FFTW3
       run: |
-        make clean
-        make BUILD=dev FFT=fftw3 FFTW3_PATH_INCLUDE=/usr/include FFTW3_PATH_LIB=/usr/lib/x86_64-linux-gnu
-        make examples
+        export FC=mpif90
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Dev -DFFT_Choice=fftw -DBUILD_TESTING=ON
+        cmake --build build --verbose
 
     - name: New FFTW3
       run: |
-        make clean
-        make BUILD=dev FFT=fftw3_f03 FFTW3_PATH_INCLUDE=/usr/include FFTW3_PATH_LIB=/usr/lib/x86_64-linux-gnu
-        make examples
+        export FC=mpif90
+        rm -rf ./build
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Dev -DFFT_Choice=fftw_f03 -DBUILD_TESTING=ON
+        cmake --build build --verbose
 
   bld_caliper:
     # The type of runner that the job will run on
@@ -143,7 +190,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     # Runs a single command using the runners shell
     - name: Install requirements
@@ -154,14 +201,16 @@ jobs:
     # Runs a set of commands using the runners shell
     - name: Compile caliper
       run: |
-        wget --no-check-certificate https://github.com/LLNL/Caliper/archive/refs/tags/v2.8.0.tar.gz
-        tar xzf v2.8.0.tar.gz && cd Caliper-2.8.0
+        wget --no-check-certificate https://github.com/LLNL/Caliper/archive/refs/tags/v2.12.1.tar.gz
+        tar xzf v2.12.1.tar.gz && cd Caliper-2.12.1
         mkdir build && cd build
-        cmake -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_INSTALL_PREFIX=../../Caliper-2.8.0_bld -DWITH_FORTRAN=yes -DWITH_MPI=yes ../
+        echo ${PWD}
+        cmake -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_INSTALL_PREFIX=${HOME}/Caliper-2.12.1_bld -DWITH_FORTRAN=yes -DWITH_MPI=yes ../
         make -j && make install
         cd ../../
 
     - name: Compile
       run: |
-        make clean
-        make BUILD=dev PROFILER=caliper CALIPER_PATH=./Caliper-2.8.0_bld
+        export caliper_DIR=${HOME}/Caliper-2.12.1_bld/share/cmake/caliper
+        FC=mpif90 cmake -S . -B build -DCMAKE_BUILD_TYPE=Dev -DENABLE_PROFILER=caliper -DBUILD_TESTING=ON
+        cmake --build build --verbose

.github/workflows/RunnerFastCI.yml

@@ -0,0 +1,92 @@
+# This is a basic workflow to help you get started with Actions
+name: FastCI4Push
+
+defaults:
+  run:
+    shell: bash 
+
+# Controls when the action will run. Triggers the workflow on pull request
+# events but only for the master branch
+on: [push, fork]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a job called "bld_gnu_ompi"
+  Full_CI_workflow:
+    # The type of runner that the job will run on
+    runs-on: [self-hosted, linux, x64]
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v3
+      with: 
+        clean: true
+
+    # Configure-Build-Run-Run on 4 cores 
+    - name: Compile NHVHPC CPU
+      run: |
+        ls -ltr ~/.bashrc
+        source /etc/profile.d/lmod.sh
+        source ~/.bash_aliases
+        module load nvhpc
+        export FC=mpif90
+        cmake -S . -B build -DBUILD_TESTING=ON
+        cmake -S . -B build -DMPIEXEC_MAX_NUMPROCS=4
+        cmake --build build -j 4
+        cmake --install build 
+        ctest --test-dir build
+        rm -rf build  
+
+    # Configure-Build-Run 
+    - name: Compile NHVHPC GPU NCCL
+      run: |
+        ls -ltr ~/.bashrc
+        source /etc/profile.d/lmod.sh
+        source ~/.bash_aliases
+        module load nvhpc
+        export FC=mpif90
+        cmake -S . -B build -DBUILD_TESTING=ON -DBUILD_TARGET=gpu -DENABLE_NCCL=yes
+        cmake --build build -j 4
+        cmake --install build 
+        ctest --test-dir build 
+        rm -rf build  
+
+    # Configure-Build-Run-Run on 4 cores 
+    - name: Compile GNU_Dev openMPI FFTW_F03 ADIOS2 CPU
+      run: |
+        ls -ltr ~/.bashrc
+        source /etc/profile.d/lmod.sh
+        source ~/.bash_aliases
+        module load foss
+        export FC=mpif90
+        export CC=mpicc
+        export CXX=mpicxx
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Dev -DBUILD_TESTING=ON -DIO_BACKEND=adios2 -Dadios2_DIR=~/GIT/ADIOS2/build/build_foss2023b/opt/lib/cmake/adios2 -DFFT_Choice=fftw_f03
+        cmake -S . -B build -DMPIEXEC_MAX_NUMPROCS=4
+        cmake --build build -j 4
+        cmake --install build 
+        ctest --test-dir build
+        rm -rf build  
+
+    # Configure-Build-Run-Run on 4 cores 
+    - name: Compile IntelLLVM MKL CPU
+      run: |
+        ls -ltr ~/.bashrc
+        source /etc/profile.d/lmod.sh
+        source ~/.bash_aliases
+        ml tbb
+        ml compiler-rt
+        ml umf
+        ml compiler
+        ml mpi
+        ml mkl
+        export FC=mpiifx
+        export MKL_DIR=${MKLROOT}/lib/cmake/mkl
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Dev -DBUILD_TESTING=ON -DFFT_Choice=mkl
+        cmake -S . -B build -DMPIEXEC_MAX_NUMPROCS=4
+        cmake --build build -j 4
+        cmake --install build 
+        ctest --test-dir build
+        rm -rf build 
+