From 34e198cf503413647d4cec6378c507d0b6fe0e5f Mon Sep 17 00:00:00 2001 From: Juan ESCOBAR <juan.escobar@aero.obs-mip.fr> Date: Wed, 15 Nov 2023 11:26:57 +0100 Subject: [PATCH] Juan 15/11/2023:configure, Upgrade version to MNH-V5-5-OPENACC-FFT-1 & compiler CCE/16.0.0 for ADASTRA --- src/configure | 64 +++++++-------------------------------------------- 1 file changed, 8 insertions(+), 56 deletions(-) diff --git a/src/configure b/src/configure index a154339d1..e83c6c642 100755 --- a/src/configure +++ b/src/configure @@ -8,7 +8,7 @@ if [ "x$XYZ" = "x" ] then # -export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-5} +export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-5-OPENACC-FFT} export VERSION_BUG=${VERSION_BUG:-1} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}} export VERSION_DATE=${VERSION_DATE:-"19/03/2021"} @@ -52,80 +52,32 @@ cd ${LOCAL}/conf TARG=$(uname -s -n) # case "$TARG" in -'Linux login'*) +'Linux login'*) # Adastra MI250 export ARCH=${ARCH:-LXcray} export VER_MPI=${VER_MPI:-MPICRAY} export OPTLEVEL=${OPTLEVEL:-OPENACC} export MVWORK=${MVWORK:-NO} export VER_CDF=${VER_CDF:-CDFAUTO} -if [ "${VER_MPI}" == "MPICRAY" ] -then + export MNHENV=${MNHENV:-" module purge module load craype-x86-trento module load craype-network-ofi module load PrgEnv-cray/8.3.3 -module load cce/15.0.0 -module load craype/2.7.19 -module load cray-mpich/8.1.21 +module load cce/16.0.0 +module load craype/2.7.21 +module load cray-mpich/8.1.26 module load libfabric/1.15.2.0 module load craype-accel-amd-gfx90a module load rocm/5.2.3 +module rm cray-libsci export CCE_ALIAS_NONE=:on export CCE_NO_PTR_TO_PTR_ALIAS=:on -module list -"} -else -export MNHENV=${MNHENV:-" -module purge -module use /lus/home/NAT/gda2203/SHARED/escobar/my_modules >& /dev/null -module load craype-x86-trento -module load PrgEnv-cray/8.3.3 -module load craype/2.7.19 -module load craype-accel-amd-gfx90a -export version=5.2.3 -module load rocm/${version} -module rm craype-network-ofi cray-mpich cray-libsci cray-dsmml -module load ompij/4.1.2-cray-15.0.0-ucx_rocm - -export CCE_ALIAS_NONE=:on -export CCE_NO_PTR_TO_PTR_ALIAS=:on +export LD_LIBRARY_PATH=\${CRAY_LD_LIBRARY_PATH}:\${LD_LIBRARY_PATH} module list -"} -fi - - ;; - -'Linux login2'*) - export ARCH=${ARCH:-LXcray} - export VER_MPI=${VER_MPI:-MPICRAY} - #export VER_MPI=${VER_MPI:-MPIAUTO} - #export OPTLEVEL=${OPTLEVEL:-MANAGED02} - export OPTLEVEL=${OPTLEVEL:-OPENACC} - # export OPTLEVEL=${OPTLEVEL:-OPENACCDEFONLY} - export MVWORK=${MVWORK:-NO} - export VER_CDF=${VER_CDF:-CDFAUTO} - #export VER_USER=${VER_USER:-ZSOLVER} - export MNHENV=${MNHENV:-" -module purge -module load craype-x86-trento -module load craype-network-ofi -module load PrgEnv-cray/8.3.3 - -module load libfabric/1.15.0.0 -module load xpmem/2.4.4-2.3_2.12__gff0e1d9.shasta -module load cray-pmi/6.1.2 -module load craype-accel-amd-gfx90a -module load rocm - - -ulimit -s unlimited - - -#export CRAY_ACC_DEBUG=2 "} ;; -- GitLab