fix SALOME 9.6.0 - MPI compilation issue

diff --git a/applications/SALOME-9.6.0-MPI.pyconf b/applications/SALOME-9.6.0-MPI.pyconf
index 166b43a36fcaa14382ca0fe7076ac50b85aa856d..bc3cf01d068bf8f2f35f169fba1fd3a6abf00b68 100644 (file)
--- a/applications/SALOME-9.6.0-MPI.pyconf
+++ b/applications/SALOME-9.6.0-MPI.pyconf
@@ -61,7 +61,7 @@ APPLICATION :
         matplotlib : '2.2.2'
         medfile : {tag : '4.1.0', hpc : 'yes', section : 'default_Autotools' }
         mesa : '19.0.8'
-        MeshGems : {tag : '2.10-4', hpc : 'yes'}
+        MeshGems : {tag : '2.11-5', hpc : 'yes'}
         ParMetis : '3.1.1'
         netgen : '5.3.1_with_CAS_7.2'
         nlopt : '2.4.2'
@@ -165,7 +165,7 @@ APPLICATION :
         repo_dev : "yes"
         pip : 'yes'
         pip_install_dir : 'python'
-        single_install_dir : "yes"
+        single_install_dir : "no"
     }
 }
 __overwrite__ :
@@ -187,9 +187,9 @@ __overwrite__ :
   }
 
   {
-    #
-    __condition__ : "VARS.dist in ['FD26']"
-    'APPLICATION.products.tbb'    : '2017-7'
-    'APPLICATION.products.embree' : '3.5.2'
-   }
+     #
+     __condition__ : "VARS.dist in ['FD26']"
+     'APPLICATION.products.tbb'    : '2017-7'
+     'APPLICATION.products.embree' : '3.5.2'
+  }
 ]

diff --git a/products/FIELDS.pyconf b/products/FIELDS.pyconf
index 5a7fafcb945fe81a9a50c724c9911886f0cf7c61..014cd6b182ae7bd0fa0f62d3307c7704217c1916 100755 (executable)
--- a/products/FIELDS.pyconf
+++ b/products/FIELDS.pyconf
@@ -17,13 +17,12 @@ default :
       "KERNEL", 
       "MEDCOUPLING"
     ]
-    opt_depend : [
-      "Pillow"
-    ]
+    opt_depend : ["Pillow"]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     properties:
     {
+        incremental : "yes"
         has_salome_gui : "yes"
         is_SALOME_module : "yes"
         has_unit_tests
@@ -32,31 +31,11 @@ default :
 
 default_MPI :
 {
-    name : "FIELDS"
-    build_source : "cmake"
-    cmake_options : "-DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
-    get_source : "git"
-    git_info:
-    {
-        repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/med.git"
-        repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "med.git"
-    }
-    environ :
-    {
-        SalomeAppConfig_ : $install_dir + $VARS.sep + "share" + $VARS.sep + "salome" + $VARS.sep + "resources" + $VARS.sep + "fields"
-    }
+    cmake_options : "-DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON"
     depend : [
       "GUI", 
       "KERNEL", 
       "MEDCOUPLING",
       "openmpi"
-             ]
-    source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
-    build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-    properties:
-    {
-        has_salome_gui : "yes"
-        is_SALOME_module : "yes"
-        has_unit_tests
-    }
+    ]
 }

diff --git a/products/HEXABLOCK.pyconf b/products/HEXABLOCK.pyconf
index 4583da0e14b8dbb9e7dd976eb03d51e78bf81350..a9aa7f5ea183cde6c2fce4478e5f6524b9011223 100644 (file)
--- a/products/HEXABLOCK.pyconf
+++ b/products/HEXABLOCK.pyconf
@@ -38,6 +38,7 @@ default :
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     properties:
     {
+        incremental : "yes"
         has_salome_gui : "yes"
         is_SALOME_module : "yes"
         has_unit_tests
@@ -46,18 +47,7 @@ default :
 
 default_MPI :
 {
-    name : "HEXABLOCK"
-    build_source : "cmake"
-    cmake_options : "-DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
-    get_source : "git"
-    git_info:
-    {
-        repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/hexablock.git"
-        repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "hexablock.git"
-    }
-    environ :
-    {
-    }
+    cmake_options : "-DSALOME_USE_MPI=ON"
     depend : [
              "KERNEL", 
              "GUI", 
@@ -78,15 +68,6 @@ default_MPI :
              "pytz",    
              "markupsafe",
              "openmpi"
-              ]
-    build_depend : ["cmake", "cppunit"]
-    source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
-    build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-    properties:
-    {
-        has_salome_gui : "yes"
-        is_SALOME_module : "yes"
-        has_unit_tests
-    }
+            ]
 } 
 

diff --git a/products/JOBMANAGER.pyconf b/products/JOBMANAGER.pyconf
index 7a2e8f26016d7ac7d159eaf179e3d664ee16cc3b..2de9d8160ede92d1b918580a6d2d03f471f8ec43 100644 (file)
--- a/products/JOBMANAGER.pyconf
+++ b/products/JOBMANAGER.pyconf
@@ -30,10 +30,12 @@ default :
              "markupsafe"
              ]
     build_depend : ["cmake", "cppunit"]
+    opt_depend : []
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     properties:
     {
+        incremental : "yes"
         has_salome_gui : "yes"
         is_SALOME_module : "yes"
     }
@@ -41,18 +43,7 @@ default :
 
 default_MPI :
 {
-    name : "JOBMANAGER"
-    build_source : "cmake"
-    cmake_options : "-DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
-    get_source : "git"
-    git_info:
-    {
-        repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/jobmanager.git"
-        repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "jobmanager.git"
-    }
-    environ :
-    {
-    }
+    cmake_options : "-DSALOME_USE_MPI=ON"
     depend : [
              "LIBBATCH", 
              "KERNEL", 
@@ -70,13 +61,5 @@ default_MPI :
              "pytz", 
              "markupsafe",
              "openmpi"
-              ]
-    build_depend : ["cmake", "cppunit"]
-    source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
-    build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-    properties:
-    {
-        has_salome_gui : "yes"
-        is_SALOME_module : "yes"
-    }
+             ]
 }

diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf
index 98a6b78c8a0629ccbf133e02404146ea4a856923..ee760903ceff82479af08a1017acd901970c94f4 100644 (file)
--- a/products/KERNEL.pyconf
+++ b/products/KERNEL.pyconf
@@ -3,6 +3,7 @@ default :
 {
     name : "KERNEL"
     build_source : "cmake"
+    cmake_options : "-DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_CMAKE_DEBUG=ON"
     get_source : "git"
     git_info:
     {
@@ -33,7 +34,6 @@ default :
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-    cmake_options : "-DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_CMAKE_DEBUG=ON"
     properties:
     {
         is_SALOME_module : "yes"
@@ -66,6 +66,30 @@ default_win :
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
 }
 
+default_MPI :
+{
+    cmake_options : "-DSALOME_USE_MPI=ON -DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
+    depend : ["Python",
+              "boost",
+              "numpy",
+              "lapack",
+              "hdf5",
+              "omniORB",
+              "omniORBpy",
+              "docutils",
+              "libxml2",
+              "Sphinx",
+              "sphinxintl",
+              "Jinja2",
+              "setuptools",
+              "Pygments",
+              "pytz",
+              "cppunit",
+              "openmpi",
+              "LIBBATCH"
+              ]
+}
+
 version_7_8_0_to_8_4_0 :
 {
     depend : ["Python",
@@ -206,34 +230,6 @@ ALAMOS :
     }
 }
 
-# Default section for MPI version, for SALOME-8.5.0-MPI and later 
-# (adding sphinxintl prerequisite to previous MPI section).
-
-default_MPI :
-{
-    cmake_options : "-DSALOME_USE_MPI=ON -DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
-    depend : ["Python",
-              "boost",
-              "numpy",
-              "lapack",
-              "hdf5",
-              "omniORB",
-              "omniORBpy",
-              "docutils",
-              "libxml2",
-              "Sphinx",
-              "sphinxintl",
-              "Jinja2",
-              "setuptools",
-              "Pygments",
-              "pytz",
-              "cppunit",
-              "openmpi",
-              "LIBBATCH"
-              ]
-    build_depend : ["cmake", "swig", "doxygen", "cppunit"]
-}
-
 version_V6_6_0 :
 {
     name : "KERNEL"

diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf
index 23649704f39657f174c4cb8c7376d1c92a2317fa..e9bed61802cc0f5b7747c981cccaa91ca299ce5e 100644 (file)
--- a/products/MEDCOUPLING.pyconf
+++ b/products/MEDCOUPLING.pyconf
@@ -30,18 +30,18 @@ default :
               "CONFIGURATION"
               ]
     build_depend : ["cmake", "swig", "doxygen", "graphviz", "cppunit"]
+    opt_depend : []
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     properties:
     {
+        incremental : "yes"
         is_SALOME_module : "yes"
         has_unit_tests
         fhs : "yes"
-        incremental : "yes"
     }
 }
 
-
 default_win :
 {
     cmake_options : '  -DMEDCOUPLING_USE_64BIT_IDS=ON -DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF '
@@ -65,6 +65,32 @@ default_win :
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
 }
 
+default_MPI :
+{
+    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON"
+    depend : [
+              "boost",
+              "cppunit",
+              "Python",
+              "hdf5",
+              "medfile",
+              "scotch",
+              "ParMetis",
+              "docutils",
+              "libxml2",
+              "Sphinx",
+              "sphinxintl",
+              "setuptools",
+              "six",
+              "pytz",
+              "numpy",
+              "scipy",
+              "lapack",
+              "CONFIGURATION",
+              "openmpi"
+              ]
+}
+
 default_int64:
 { 
     cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF -DMEDCOUPLING_USE_64BIT_IDS=ON"
@@ -99,33 +125,6 @@ version_7_8_2_to_8_4_0 :
               ]
 }
 
-# Default section for MPI version, for SALOME-8.5.0-MPI and later
-default_MPI :
-{
-    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
-    depend : [
-              "boost",
-              "Python",
-              "hdf5",
-              "medfile",
-              "scotch",
-              "docutils",
-              "libxml2",
-              "ParMetis",
-              "Sphinx",
-              "sphinxintl",
-              "setuptools",
-              "six",
-              "pytz",
-              "numpy",
-              "scipy",
-              "lapack",
-              "openmpi",
-              "cppunit",
-              "CONFIGURATION"
-              ]
-}
-
 version_V7_8_0 :
 {
     cmake_options : "-DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF"

diff --git a/products/PARAVIS.pyconf b/products/PARAVIS.pyconf
index 707e960a29e6c9a637a48c632e272a317348ad3f..c9c3f4f08143be4b5d764e98d360c2123b6107ce 100644 (file)
--- a/products/PARAVIS.pyconf
+++ b/products/PARAVIS.pyconf
@@ -72,7 +72,7 @@ default_win:
 
 default_MPI :
 {
-    cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON  -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON"
     depend : [
        "KERNEL",
        "GUI",
@@ -122,7 +122,7 @@ version_7_8_0_to_9_1_0 :
 
 version_9_5_0_MPI :
 {
-    cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON  -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON"
     patches : ['PARAVIS-MEDReader-CMakeLists.patch'] # backporting bos #20031 
     depend : [
        "KERNEL",

diff --git a/products/SMESH.pyconf b/products/SMESH.pyconf
index 0d95b625e206dd3ba04bfd0cbcb68340b1846709..c476d383829c49a4cec0cff0da16ab45bab173c2 100644 (file)
--- a/products/SMESH.pyconf
+++ b/products/SMESH.pyconf
@@ -43,6 +43,7 @@ default :
               "tbb"
              ]
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
+    opt_depend : []
     patches : []
     check_install : ["share/doc/salome/gui/SMESH/yams/index.html"]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
@@ -90,6 +91,38 @@ default_win :
             ]
 }
 
+default_MPI :
+{
+    depend : ["KERNEL",
+              "GUI",
+              "GEOM",
+              "MEDCOUPLING",
+              "Python",
+              "qt",
+              "PyQt",
+              "boost",
+              "CAS",
+              "hdf5",
+              "medfile",
+              "qwt",
+              "ParaView",
+              "libxml2",
+              "omniORB",
+              "docutils",
+              "Sphinx",
+              "Jinja2",
+              "setuptools",
+              "Pygments",
+              "cgns",
+              "six",
+              "pytz",
+              "sphinxintl",
+              "sphinxcontrib_napoleon",
+              "tbb",
+             "openmpi"
+             ]
+}
+
 # Starting from SALOME 9.4.0, we use tbb as product and build SMESH using it to accelerate its performances
 version_8_5_0_to_9_3_0 :
 {

diff --git a/products/compil_scripts/hdf5-1.10.3.sh b/products/compil_scripts/hdf5-1.10.3.sh
index 3b311b58e446a11e813618ecb2f9b5e4a12b8d01..c59b335087cd2553c167f247ae68aa0230bc6fc4 100755 (executable)
--- a/products/compil_scripts/hdf5-1.10.3.sh
+++ b/products/compil_scripts/hdf5-1.10.3.sh
@@ -13,6 +13,7 @@ CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
 #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_USE_16_API_DEFAULT:BOOL=ON"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ALLOW_EXTERNAL_SUPPORT:BOOL=ON"
+
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_BUILD_HL_LIB:BOOL=ON"
 
 
@@ -21,8 +22,6 @@ then
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ENABLE_PARALLEL:BOOL=ON"
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_BUILD_CPP_LIB:BOOL=OFF"
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_BUILD_TOOLS:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
 else
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ENABLE_PARALLEL:BOOL=OFF"
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_BUILD_CPP_LIB:BOOL=ON"