From a621df854ffab3b0136529478f859c7709a43893 Mon Sep 17 00:00:00 2001 From: jourdain Date: Thu, 25 Nov 2021 16:21:20 +0100 Subject: [PATCH] clean envs, add scalability possibility in compile.sh --- specfem3d/compile.sh | 9 ++++++--- specfem3d/env/env_vega-cpu | 14 ++------------ specfem3d/env/env_vega-gpu | 20 ++++---------------- 3 files changed, 12 insertions(+), 31 deletions(-) diff --git a/specfem3d/compile.sh b/specfem3d/compile.sh index 5a40c6a..06ba484 100755 --- a/specfem3d/compile.sh +++ b/specfem3d/compile.sh @@ -18,7 +18,8 @@ echo " - vega-gpu" echo " - vega-cpu" read machine - +export NEX_XI=384 #384 #416 #352 #320 #288 #256 #224 #192 #160 #128 #96 #288 +export NPROC_XI=4 source ./env/env_${machine} Untar(){ @@ -69,8 +70,10 @@ Install(){ mkdir -p $install_dir mv $install_dir/../specfem3d_globe $install_dir/. cp test_cases/SPECFEM3D_TestCaseA/* $install_dir/specfem3d_globe/DATA/. - sed -i s/"NEX_XI = 384"/"NEX_XI = $NEX_XI"/g $install_dir/specfem3d_globe/DATA/Par_file - sed -i s/"NEX_ETA = 384"/"NEX_ETA = $NEX_XI"/g $install_dir/specfem3d_globe/DATA/Par_file + sed -i s/"NEX_XI = 384"/"NEX_XI = $NEX_XI"/g $install_dir/specfem3d_globe/DATA/Par_file + sed -i s/"NEX_ETA = 384"/"NEX_ETA = $NEX_XI"/g $install_dir/specfem3d_globe/DATA/Par_file + sed -i s/"NPROC_XI = 4"/"NPROC_XI = $NPROC_XI"/g $install_dir/specfem3d_globe/DATA/Par_file + sed -i s/"NPROC_ETA = 4"/"NPROC_ETA = $NPROC_XI"/g $install_dir/specfem3d_globe/DATA/Par_file elif [ $answer = "3" ]; then echo "===> Copy test case B" export install_dir=$install_dir/TestCaseB diff --git a/specfem3d/env/env_vega-cpu b/specfem3d/env/env_vega-cpu index e1c4899..9b31b68 100644 --- a/specfem3d/env/env_vega-cpu +++ b/specfem3d/env/env_vega-cpu @@ -5,6 +5,8 @@ export machine=vega-cpu export software=specfem3d_globe export version=31octobre +export NEX_XI=384 #384 #416 #352 #320 #288 #256 #224 #192 #160 #128 #96 #288 +export NPROC_XI=4 MYSCRATCH=/exa5/scratch/user/eucedricj export install_dir=$MYSCRATCH//benchmarks/$machine/$software/$version/cpu-znver2/ echo "install_dir = " $install_dir @@ -14,17 +16,5 @@ export FC=mpif90 #mpif90 #mpiifort export MPIFC=$FC # gnu -#Test done with those flags 01/10/21 export FCFLAGS=" -O3 -fopenmp -march=znver2 -mtune=znver2 -flto -funroll-all-loops -ffast-math -mfma -mavx2 -m3dnow -fomit-frame-pointer -DUSE_FP32 -DOPT_STREAMS -mcmodel=large" export CFLAGS=" -O3 -fopenmp -march=znver2 -mtune=znver2 -flto -funroll-all-loops -ffast-math -mfma -mavx2 -m3dnow -fomit-frame-pointer" -# Test Ok but not better than upper flags -#export FCFLAGS=" -O3 -fopenmp -march=znver2 -flto -ffast-math -mfma -mavx2 -fomit-frame-pointer -DUSE_FP32 -DOPT_STREAMS -mcmodel=large" -#export CFLAGS=" -O3 -fopenmp -march=znver2 -flto -ffast-math -mfma -mavx2 -fomit-frame-pointer" - -#INTEL -#export FCFLAGS=" -O3 -qopenmp -march=core-avx2 -mtune=core-avx2 -ipo -no-prec-div -no-prec-sqrt -fma -qopt-prefetch -use-intel-optimized-headers -DUSE_FP32 -DOPT_STREAMS -fp-model fast=2 -mcmodel=large" -#export CFLAGS=" -O3 -qopenmp -march=core-avx2 -mtune=core-avx2 -ipo -no-prec-div -no-prec-sqrt -fma -qopt-prefetch -use-intel-optimized-headers" - -# aocc -#export FCFLAGS="-O3 -march=znver2 -mtune=znver2 -fopenmp -flto -DUSE_FP32 -DOPT_STREAMS -mcmodel=large" -#export CFLAGS=" -O3 -march=znver2 -mtune=znver2 -fopenmp -flto" diff --git a/specfem3d/env/env_vega-gpu b/specfem3d/env/env_vega-gpu index 08cae92..166db4b 100644 --- a/specfem3d/env/env_vega-gpu +++ b/specfem3d/env/env_vega-gpu @@ -1,19 +1,15 @@ #!/bin/bash - module purge -#module load GCC/10.2.0 OpenMPI/4.0.5-gcccuda-2020b #compilaton error... -#module load GCC/8.3.0 OpenMPI/3.1.4-gcccuda-2019b -#module load oneapi/compiler/2021.2.0 openmpi/intel/4.0.5.2 CUDA/10.1.105 #oneapi/intel_ipp_intel64/2021.2.0 #oneapi/intel_ipp_ia32/2021.2.0 -#module load GCC/10.2.0 openmpi/gnu/4.0.5.2 CUDA/11.1.1-GCC-10.2.0 #Compilation Error: Rank mismatch between actual argument at (1) and actual argument at (2).. module load GCC/9.3.0 openmpi/gnu/4.0.5.2 CUDA/11.0.2-GCC-9.3.0 export machine=vega-gpu export software=specfem3d_globe export version=31octobre -MYSCRATCH=/exa5/scratch/user/eucedricj -export NEX_XI=384 #416 #352 #320 #288 #256 #224 #192 #160 #128 #96 #288 -export install_dir=$MYSCRATCH//benchmarks/$machine/$software/$version/strong-scaling/$NEX_XI +export NEX_XI=384 #384 #416 #352 #320 #288 #256 #224 #192 #160 #128 #96 #288 +export NPROC_XI=4 +MYSCRATCH=/exa5/scratch/user/eucedricj +export install_dir=$MYSCRATCH//benchmarks/$machine/$software/$version echo "install_dir = " $install_dir export CC=mpicc #mpiicc @@ -26,11 +22,3 @@ export CFLAGS=" -O3 -flto -march=znver2 -mtune=znver2 -ffast-math -mfma -mavx2 - export CUDA_LIB=$CUDA_HOME/lib64 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/ export LDFLAGS="$LDFLAGS -lpthread" - -#INTEL -#export FCFLAGS=" -O3 -qopenmp -march=core-avx2 -mtune=core-avx2 -ipo -no-prec-div -no-prec-sqrt -fma -qopt-prefetch -use-intel-optimized-headers -DUSE_FP32 -DOPT_STREAMS -fp-model fast=2 -mcmodel=large" -#export CFLAGS=" -O3 -qopenmp -march=core-avx2 -mtune=core-avx2 -ipo -no-prec-div -no-prec-sqrt -fma -qopt-prefetch -use-intel-optimized-headers" - -# aocc -#export FCFLAGS="-O3 -march=znver2 -mtune=znver2 -fopenmp -flto -DUSE_FP32 -DOPT_STREAMS -mcmodel=large" -#export CFLAGS=" -O3 -march=znver2 -mtune=znver2 -fopenmp -flto" -- GitLab