Merge remote-tracking branch 'cels/dev' into dev

Author: hguo

.gitlab-ci.yml

@@ -44,16 +44,15 @@ intel-mpich:
     CXX: mpicxx
   before_script:
     - module load mpich/3.4.2-intel
-    - module load intel/20.2
+    - module load intel/20.4
 
 intel-mpich-hdf5:
   extends: .basic_job
   variables:
-    CMAKE_ARG: "-DFTK_USE_MPI=ON -DFTK_USE_HDF5=ON -DFTK_HDF5_DIR=/nfs/gce/software/custom/linux-ubuntu18.04-x86_64/hdf5/1.12.1-mpich-3.4.2-intel-parallel-fortran"
+    CMAKE_ARG: "-DFTK_USE_MPI=ON -DFTK_USE_HDF5=ON -DFTK_HDF5_DIR=/nfs/gce/software/custom/linux-ubuntu20.04-x86_64/hdf5/hdf5-1.12.1-mpich-3.4.2-parallel-fortran"
     CC: mpicc
     CXX: mpicxx
   before_script:
-    - module load hdf5/1.12.1-mpich-3.4.2-intel-parallel-fortran
     - module load mpich/3.4.2-intel
     - module load intel/20.4
 
@@ -62,7 +61,7 @@ cuda-compile-only:
   variables:
     CMAKE_ARG: "-DFTK_USE_CUDA=ON"
   before_script:
-    - export PATH=/nfs/gce/software/custom/linux-ubuntu18.04-x86_64/cuda/10.2/bin:$PATH
+    - export PATH=/nfs/gce/projects/PEDAL-GCE/hguo/ci/cuda-11.6/bin:$PATH
 
 python3-setup-build-only:
   before_script:
@@ -82,30 +81,29 @@ python3:
 intel-tbb:
   extends: .basic_job
   variables:
-    CMAKE_ARG: "-DFTK_USE_TBB=ON -DTBB_ROOT=/nfs/gce/software/custom/linux-ubuntu18.04-x86_64/intel/20.2/tbb"
+    CMAKE_ARG: "-DFTK_USE_TBB=ON -DTBB_ROOT=/nfs/gce/software/custom/linux-ubuntu20.4-x86_64/intel/20.4/tbb"
   before_script:
     - module load intel/20.4
 
 intel-mpich-tbb:
   extends: .basic_job
   variables:
-    CMAKE_ARG: "-DFTK_USE_MPI=ON -DFTK_USE_TBB=ON -DTBB_ROOT=/nfs/gce/software/custom/linux-ubuntu18.04-x86_64/intel/20.2/tbb"
+    CMAKE_ARG: "-DFTK_USE_MPI=ON -DFTK_USE_TBB=ON -DTBB_ROOT=/nfs/gce/software/custom/linux-ubuntu20.04-x86_64/intel/20.4/tbb"
     CC: mpicc
     CXX: mpicxx
   before_script:
     - module load mpich/3.4.2-intel
-    - module load intel/20.2
+    - module load intel/20.4
 
 intel-mpich-hdf5-tbb:
   extends: .basic_job
   variables:
-    CMAKE_ARG: "-DFTK_USE_MPI=ON -DFTK_USE_HDF5=ON -DFTK_HDF5_DIR=/nfs/gce/software/custom/linux-ubuntu18.04-x86_64/hdf5/1.12.1-mpich-3.4.2-intel-parallel-fortran -DFTK_USE_TBB=ON -DTBB_ROOT=/nfs/gce/software/custom/linux-ubuntu18.04-x86_64/intel/20.2/tbb"
+    CMAKE_ARG: "-DFTK_USE_MPI=ON -DFTK_USE_HDF5=ON -DFTK_HDF5_DIR=/nfs/gce/software/custom/linux-ubuntu20.04-x86_64/hdf5/hdf5-1.12.1-mpich-3.4.2-parallel-fortran -DFTK_USE_TBB=ON -DTBB_ROOT=/nfs/gce/software/custom/linux-ubuntu20.04-x86_64/intel/20.4/tbb"
     CC: mpicc
     CXX: mpicxx
   before_script:
-    - module load hdf5/1.12.1-mpich-3.4.2-intel-parallel-fortran
     - module load mpich/3.4.2-intel
-    - module load intel/20.2
+    - module load intel/20.4
 
 vtk:
   extends: .basic_job
@@ -114,8 +112,6 @@ vtk:
 
 paraview:
   extends: .basic_job
-  before_script:
-    - module load cmake/3.20.5-yjp2hz6
   variables:
     CMAKE_ARG: "-DFTK_BUILD_PARAVIEW=ON -DParaView_DIR=/nfs/gce/projects/PEDAL-GCE/hguo/ci/paraview-5.9.1/lib/cmake/paraview-5.9"