Merge pull request #234 from vincentcasseau/main

Envs: adding prod sator_gcc
onera · Dec 11, 2024 · 38b080d · 38b080d
2 parents e101702 + 6bde320
commit 38b080d
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 4 deletions.
diff --git a/Cassiopee/Converter/Converter/kpython b/Cassiopee/Converter/Converter/kpython
@@ -170,14 +170,19 @@ else
             mpirun $ARGS -n $NPROCS -genv OMP_NUM_THREADS=$NTHREADS -l $PYTHONEXE $SCRIPT
             [ $? != 0 ] && exit 1;
             ;;
-        'sat_r8' ) # sator
+        'sat_cas_r8' | 'sat_cas_r8_*' | 'sat_r8' | 'sat_sph' | 'sat_sph_*' ) # sator, sator-new
             # intelMpi
             mpirun $ARGS -n $NPROCS -l -ordered-output $PYTHONEXE $SCRIPT
             [ $? != 0 ] && exit 1;
             ;;
-        'sat_cas_r8' | 'sat_cas_r8_*' ) # sator-new
-            # intelMpi
-            mpirun $ARGS -n $NPROCS -l -ordered-output $PYTHONEXE $SCRIPT
+        'sat_gcc' | 'sat_gcc_*' ) # sator
+            # openMpi
+            if [ $SANITIZE = '1' ]
+            then
+                mpirun $ARGS -x OMP_NUM_THREADS=$NTHREADS -np $NPROCS -x LD_PRELOAD=$ASAN_LIB $PYTHONEXE $SCRIPT
+            else
+                mpirun $ARGS -x OMP_NUM_THREADS=$NTHREADS -np $NPROCS $PYTHONEXE $SCRIPT
+            fi
             [ $? != 0 ] && exit 1;
             ;;
         'spiro_el8' | 'spiro_el8_*' | 'spiro_amdrm_r8' | 'spiro_amdnp_r8' | 'spiro_sky_r8' | 'spiro_cas_r8' ) # spiro

diff --git a/Cassiopee/Envs/env_Cassiopee_local b/Cassiopee/Envs/env_Cassiopee_local
@@ -823,6 +823,26 @@ else if ($MAC == "sator_sph") then
         setenv PYTHONEXE python3
         setenv PRODMODE 1
         setenv PIP_DISABLE_PIP_VERSION_CHECK 1
+
+else if ($MAC == "sator_gcc") then
+#------------------------------- sator gcc ------------------------------------
+        setenv ELSAPROD sat_gcc
+        setenv ELSAPROD "$ELSAPROD$EXT"
+        # Number of threads
+        setenv OMP_NUM_THREADS 48
+        source /etc/profile.d/modules-onera.csh
+        module purge
+        module load socle-cfd/7.0-gnu850-ompi502
+        module load occt/7.6.1-gnu831
+        module load subversion/1.14.1-gnu831
+        module load emacs/27.2-gnu831
+        setenv OMP_PLACES cores
+        setenv PYTHONEXE python3
+        setenv PRODMODE 1
+        setenv PIP_DISABLE_PIP_VERSION_CHECK 1
+        setenv ASAN_OPTIONS verify_asan_link_order=false
+        setenv LSAN_OPTIONS suppressions="$CASSIOPEE"/Dist/bin/"$ELSAPROD"/asan.supp:print_suppressions=0
+        setenv ASAN_LIB /opt/tools/gcc/12.1.0-gnu831/lib64/libasan.so
 endif
 #---------------------------Common---------------------------------------------
 

diff --git a/Cassiopee/Envs/sh_Cassiopee_local b/Cassiopee/Envs/sh_Cassiopee_local
@@ -740,6 +740,27 @@ elif [ "$MAC" = "sator_sph" ]; then
     export PYTHONEXE=python3
     export PRODMODE=1
     export PIP_DISABLE_PIP_VERSION_CHECK=1
+
+elif [ "$MAC" = "sator_gcc" ]; then
+#----------------------------- sator gcc ---------------------------------------
+    export ELSAPROD=sat_gcc
+    export ELSAPROD=$ELSAPROD$EXT
+    # Nbre de threads
+    export OMP_NUM_THREADS=48
+    # modules
+    source /opt/tools/Modules/init/bash
+    module purge
+    module load socle-cfd/7.0-gnu850-ompi502
+    module load occt/7.6.1-gnu831
+    module load subversion/1.14.1-gnu831
+    module load emacs/27.2-gnu831
+    export OMP_PLACES=cores
+    export PYTHONEXE=python3
+    export PRODMODE=1
+    export PIP_DISABLE_PIP_VERSION_CHECK=1
+    export ASAN_OPTIONS=verify_asan_link_order=false
+    export LSAN_OPTIONS=suppressions=$CASSIOPEE/Dist/bin/"$ELSAPROD"/asan.supp:print_suppressions=0
+    export ASAN_LIB=/opt/tools/gcc/12.1.0-gnu831/lib64/libasan.so
 
 elif [ "$MAC" = "adastra_cpu" ]; then
 #----------------------------- adastra cpu  ---------------------------------------

diff --git a/Cassiopee/KCore/installBase.py b/Cassiopee/KCore/installBase.py
@@ -922,6 +922,21 @@
                  [] # NvccAdditionalOptions
                  ],
     ###############################################################################
+    'sat_gcc': [ 'Cluster de calcul Sator Saphire (Onera)',
+                 'gfortran', # f77compiler
+                 'gfortran', # f90compiler
+                 'gcc', # Cppcompiler
+                 ['-DCACHELINE=64','-DNB_SOCKET=2','-DCORE_PER_SOCK=48','-DSIMD=AVX2P512'], # CppAdditionalOptions
+                 [], # f77AdditionalOptions
+                 True, # useOMP
+                 False, # static
+                 [], # additionalIncludePaths
+                 [], # additionalLibs
+                 [], # additionalLibPaths
+                 False, # useCuda
+                 [] # NvccAdditionalOptions
+                 ],
+    ###############################################################################
     'spiro_sky': [ 'Machine dev Spiro (proc skylake)',
                    'ifort', # f77compiler
                    'ifort', # f90compiler