SALOME 9.9.0-MPI compilation issue

diff --git a/applications/SALOME-9.9.0-MPI.pyconf b/applications/SALOME-9.9.0-MPI.pyconf
index ecfc6bc7340dce91974c78cd83a08e96061236af..8e76a465e65d7222b610b5d163c5fce6a5e192cc 100644 (file)
--- a/applications/SALOME-9.9.0-MPI.pyconf
+++ b/applications/SALOME-9.9.0-MPI.pyconf
@@ -58,7 +58,7 @@ APPLICATION :
         mpc : 'native'
         gmp : 'native'
         mpfr : 'native'
-        gdal : '2.4.0'
+        gdal :  {tag : '2.4.0', hpc : 'yes'}
         gmsh : '4.8.4'
         graphviz : '2.38.0'
         hdf5 : {tag : '1.10.3', hpc : 'yes'}
@@ -80,7 +80,7 @@ APPLICATION :
         netgen : '5.3.1_with_CAS_7.2'
         # comment out above line and uncomment the line below to use Netgen 6.
         #netgen : '6.2.2101'
-        netcdf : '4.6.2'
+        netcdf : {tag : '4.6.2', hpc : 'yes'}
         nlopt : '2.5.0'
         nose: '1.3.7'
         numpy : '1.16.4'
@@ -89,7 +89,7 @@ APPLICATION :
         omniORBpy : '4.2.2'
         opencv : '3.2.0'
         openmpi : '3.1.6'
-        openturns: '1.18'
+        openturns:  {tag : '1.18', hpc : 'yes'}
         openVKL: '0.11.0'
         ospray : '2.4.0'
         packaging : '17.1'

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index 3595950c801cd4a2e03e9b760fee9edc397e4bd8..46ad9147945e41f1f60a9866500f1ee2cdb0067e 100644 (file)
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -15,16 +15,19 @@ APPLICATION :
     {
         build : 
         {
-            CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
-            RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
-            SALOME_USE_64BIT_IDS : '1'
-            VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches
+           CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
+           RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
+           SALOME_USE_64BIT_IDS : '1'
+           VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches
+           SALOME_GMSH_HEADERS_STD : '1'
+        }
+        launch :
+        {
+            PYTHONIOENCODING:"UTF_8",
+            SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"
         }
-        launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
         SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui
-        SALOME_ACTOR_DELEGATE_TO_VTK : '1'
-        SALOME_GMSH_HEADERS_STD : '1'
     }
     products :
     {
@@ -55,7 +58,7 @@ APPLICATION :
         mpc : 'native'
         gmp : 'native'
         mpfr : 'native'
-        gdal : '2.4.0'
+        gdal :  {tag : '2.4.0', hpc : 'yes'}
         gmsh : '4.8.4'
         graphviz : '2.38.0'
         hdf5 : {tag : '1.10.3', hpc : 'yes'}
@@ -74,8 +77,10 @@ APPLICATION :
         MeshGems : {tag : '2.14-4', hpc : 'yes'}
         mpi4py: '3.0.3'
         ParMetis : '3.1.1'
-        netgen : '6.2.2101'
-        netcdf : '4.6.2'
+        netgen : '5.3.1_with_CAS_7.2'
+        # comment out above line and uncomment the line below to use Netgen 6.
+        #netgen : '6.2.2101'
+        netcdf : {tag : '4.6.2', hpc : 'yes'}
         nlopt : '2.5.0'
         nose: '1.3.7'
         numpy : '1.16.4'
@@ -84,14 +89,14 @@ APPLICATION :
         omniORBpy : '4.2.2'
         opencv : '3.2.0'
         openmpi : '3.1.6'
-        openturns: '1.18'
+        openturns:  {tag : '1.18', hpc : 'yes'}
         openVKL: '0.11.0'
         ospray : '2.4.0'
         packaging : '17.1'
         pandas : '0.25.2'
         patsy : '0.5.2'
-        ParaView : {tag : '5.9.0', hpc : 'yes', section: 'version_5_9_0_MPI'}
-        PERSALYS: 'v11.0'
+        ParaView : {tag:'5.9.0', base: 'no',  section: 'version_5_9_0_MPI', hpc: 'yes'}
+        PERSALYS: 'v12.0'
         petsc : {tag : '3.16.0', section: 'version_3_16_0'}
         Pillow : '7.1.1'
         planegcs : '0.18-3cb6890'
@@ -100,7 +105,6 @@ APPLICATION :
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
         PyQt : '5.15.3'
-        #PyQtChart : '5.9'
         pyreadline : '2.0'
         Python : '3.6.5'
         pytz : '2017.2'
@@ -111,7 +115,7 @@ APPLICATION :
         root: '6.22.02'
         salome_system : 'native'
         scipy : '1.4.1'
-        scotch : '6.1.2'
+        scotch : {tag: '6.1.2', section: 'version_6_1_2_MPI', hpc: 'yes', base: 'no'}
         setuptools : '38.4.0'
         sip : '5.5.0'
         six : '1.10.0'

diff --git a/products/compil_scripts/gdal-2.4.0.sh b/products/compil_scripts/gdal-2.4.0.sh
index b63abb69c93eeab46a3aa1cefdf259a925740a8c..3a1cd6d571c8abf95654da2f13c946203fa2dba7 100755 (executable)
--- a/products/compil_scripts/gdal-2.4.0.sh
+++ b/products/compil_scripts/gdal-2.4.0.sh
@@ -4,6 +4,12 @@ echo "##########################################################################
 echo "gdal" $VERSION
 echo "##########################################################################"
 
+if [ -n "$SAT_HPC" ]  && [ -n "$MPI_ROOT_DIR" ]; then
+   echo "WARNING: setting CC and CXX environment variables and target MPI wrapper"
+   export CXX=${MPI_CXX_COMPILER}
+   export C=${MPI_C_COMPILER}
+fi
+
 CONFIGURE_FLAGS=
 CONFIGURE_FLAGS+=" --with-pcraster=internal"
 CONFIGURE_FLAGS+=" --with-png=internal"

diff --git a/products/compil_scripts/hdf5-1.10.3.sh b/products/compil_scripts/hdf5-1.10.3.sh
index a53a0c003751c77382328bf43e82e4d6f672e82a..4ff1be05fcc4b5e33f78e817db9a808fd43f577b 100755 (executable)
--- a/products/compil_scripts/hdf5-1.10.3.sh
+++ b/products/compil_scripts/hdf5-1.10.3.sh
@@ -19,6 +19,8 @@ CMAKE_OPTIONS+=" -DHDF5_BUILD_HL_LIB:BOOL=ON"
 
 if [ -n "$SAT_HPC" ]
 then
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
     CMAKE_OPTIONS+=" -DHDF5_ENABLE_PARALLEL:BOOL=ON"
     CMAKE_OPTIONS+=" -DHDF5_BUILD_CPP_LIB:BOOL=ON"
     CMAKE_OPTIONS+=" -DHDF5_BUILD_TOOLS:BOOL=ON"

diff --git a/products/netcdf.pyconf b/products/netcdf.pyconf
index 2d9fa6ea018deee36c5d39130c00fd48a304f094..22ea2287a9730717e1febe05516250b452a67415 100644 (file)
--- a/products/netcdf.pyconf
+++ b/products/netcdf.pyconf
@@ -38,6 +38,10 @@ default_win :
 
 version_4_6_2:
 {
-    compil_script :  'netcdf-4.6.2' + $VARS.scriptExtension
+    archive_info :
+    {
+      archive_name  : "netcdf-c-4.6.2.tar.gz"
+    }
+    compil_script :  "netcdf-4.6.2.sh"
     patches : ['netcdf-4.6.2-001.patch']
 }