Align MEDCoupling compilations options with SALOME

diff --git a/applications/MEDCOUPLING-master-MPI.pyconf b/applications/MEDCOUPLING-master-MPI.pyconf
index f231c7b93d3aed53c0c6e5abebe1726a82e0f9e9..c562a75f66e5daf9824fcb861d174bb046431c3d 100644 (file)
--- a/applications/MEDCOUPLING-master-MPI.pyconf
+++ b/applications/MEDCOUPLING-master-MPI.pyconf
@@ -30,7 +30,7 @@ APPLICATION :
         boost : '1.71.0'
         certifi : '2018.8.24'
         click : '6.7'
-        cmake : '3.25.2' 
+        cmake : '3.25.2'
         cppunit : '1.13.2'
         chardet : '3.0.4'
         Cython : '0.29.12'
@@ -47,9 +47,9 @@ APPLICATION :
         medfile : {tag : '4.1.1', hpc : 'yes'}
         mpi4py: '3.0.3'
         numpy : '1.16.4'
-        openmpi : '3.1.6'
+        openmpi : '3.1.6' # current version of hdf5 is not compatible with openmpi 4, if compiled with MPI support
         packaging : '17.1'
-        ParMetis : '3.1.1'
+        ParMetis : '4.0.3-p6'
         pockets : '0.6.2'
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
@@ -58,7 +58,7 @@ APPLICATION :
         pytz : '2017.2'
         requests : '2.19.1'
         scipy : '1.4.1'
-        scotch : '6.0.4'
+        scotch : {tag: '6.1.2', section: 'version_6_1_2_MPI', hpc: 'yes', base: 'no'}
         setuptools : '38.4.0'
         six : '1.10.0'
         snowballstemmer : '1.2.1'
@@ -71,7 +71,7 @@ APPLICATION :
 
         # SALOME MODULES :
         'CONFIGURATION'
-        'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI_STD', hpc: 'yes'} # FIXME
+        'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI_STD', hpc: 'yes', verbose: 'yes'}
     }
     test_base : 
     {

diff --git a/applications/MEDCOUPLING-master-int32.pyconf b/applications/MEDCOUPLING-master-int32.pyconf
index 452962e7a5e6505c0baa910a477561aad2a524da..7c1c0241443e999b9487b99b4d357c67ac59c965 100644 (file)
--- a/applications/MEDCOUPLING-master-int32.pyconf
+++ b/applications/MEDCOUPLING-master-int32.pyconf
@@ -19,13 +19,13 @@ APPLICATION :
         # PREREQUISITES :
         alabaster : '0.7.6'
         Babel : '2.7.0'
-        boost : '1.58.0'
+        boost : '1.71.0'
         certifi : '2018.8.24'
         click : '6.7'
         cmake : '3.25.2'
         cppunit : '1.13.2'
         chardet : '3.0.4'
-        Cython : '0.25.2'
+        Cython : '0.29.12'
         docutils : '0.12'
         doxygen : '1.8.14'
         graphviz : '2.38.0'
@@ -38,15 +38,16 @@ APPLICATION :
         markupsafe : '0.23'
         medfile : '4.1.1'
         metis : '5.1.0'
-        numpy : '1.15.1'
+        numpy : '1.16.4'
+        packaging : '17.1'
         pockets : '0.6.2'
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
         Python : '3.6.5'
-        pytz : '2015.7'
+        pytz : '2017.2'
         requests : '2.19.1'
-        scipy : '0.19.1'
-        scotch : '6.0.4'
+        scipy : '1.4.1'
+        scotch : {tag: '6.1.2', section: 'version_6_1_2_MPI', hpc: 'yes', base: 'no'}
         setuptools : '38.4.0'
         six : '1.10.0'
         snowballstemmer : '1.2.1'
@@ -55,12 +56,11 @@ APPLICATION :
         sphinxcontrib_websupport : '1.1.0'
         sphinxintl: '0.9.10'
         swig : '4.0.2'
-        packaging : '17.1'
         urllib3 : '1.23'
 
         # SALOME MODULES :
         'CONFIGURATION'
-        'MEDCOUPLING': {section: 'default_32BIT_IDS'}
+        'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_32BIT_IDS_MPI_STD', hpc: 'yes'}
     }
     test_base :
     {

diff --git a/applications/MEDCOUPLING-master-native.pyconf b/applications/MEDCOUPLING-master-native.pyconf
index 7c97515f8a875d348fd958d77b6e32c8fdf7d784..7f81aca4950b7a590713ddcae31a61d87df83bae 100644 (file)
--- a/applications/MEDCOUPLING-master-native.pyconf
+++ b/applications/MEDCOUPLING-master-native.pyconf
@@ -29,7 +29,7 @@ APPLICATION :
         boost : 'native'
         certifi : 'native'
         click : 'native'
-        cmake : '3.25.2' 
+        cmake : '3.25.2'
         cppunit : 'native'
         chardet : 'native'
         Cython : 'native'
@@ -45,17 +45,16 @@ APPLICATION :
         markupsafe : 'native'
         medfile : '4.1.1'
         metis : 'native'
-        mpi4py : 'native'
+        mpi4py: 'native'
         numpy : 'native'
         openmpi: 'native'
-        pockets : 'native'
         Pygments : 'native'
         pyparsing : 'native'
         Python : 'native'
         pytz : 'native'
         requests : 'native'
         scipy : 'native'
-        scotch : 'native'
+        scotch : {tag: '6.1.2', section: 'version_6_1_2_MPI', hpc: 'yes', base: 'no'}
         setuptools : 'native'
         six : 'native'
         snowballstemmer : 'native'
@@ -64,12 +63,11 @@ APPLICATION :
         sphinxcontrib_websupport : 'native'
         sphinxintl: 'native'
         swig : 'native'
-        packaging : 'native'
         urllib3 : 'native'
 
         # SALOME MODULES :
         'CONFIGURATION'
-        'MEDCOUPLING' : {tag:'master', base:'no', section:'default_MPI', hpc:'yes'}
+        'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
     }
     test_base : 
     {
@@ -88,8 +86,7 @@ __overwrite__ :
 [
     {
         __condition__ : "VARS.dist in ['CO8']"
-        'APPLICATION.products.sphinxintl' : '0.9.10'
-        'PRODUCTS.sphinxintl.default.properties.pip' : "no"
+        'APPLICATION.products.sphinxintl'       : {tag: '0.9.10', base: 'no', section: 'version_0_9_10_no_pip'  }
     }
     {
         __condition__ : "VARS.dist in ['UB22.04']"

diff --git a/applications/MEDCOUPLING-master-windows.pyconf b/applications/MEDCOUPLING-master-windows.pyconf
index 2f9a414205d7cb62876a964962687be1590143d4..0cf9400c7aefd62060dea18bfa54e70a198152a2 100644 (file)
--- a/applications/MEDCOUPLING-master-windows.pyconf
+++ b/applications/MEDCOUPLING-master-windows.pyconf
@@ -32,7 +32,7 @@ APPLICATION :
         boost : '1.67.0'
         certifi : '2019.6.16'
         click : '7.0'
-        cmake : '3.25.2'
+        cmake : '3.24.2'
         colorama: '0.4.1'
         cppunit : '1.13.2'
         chardet : '3.0.4'

diff --git a/applications/MEDCOUPLING-master.pyconf b/applications/MEDCOUPLING-master.pyconf
index 453637d3c89153ac101c872e993ac6e0008952b9..1960aab56a616979a3f850c5a842f797efb9d33c 100644 (file)
--- a/applications/MEDCOUPLING-master.pyconf
+++ b/applications/MEDCOUPLING-master.pyconf
@@ -26,13 +26,13 @@ APPLICATION :
         # PREREQUISITES :
         alabaster : '0.7.6'
         Babel : '2.7.0'
-        boost : '1.58.0'
+        boost : '1.71.0'
         certifi : '2018.8.24'
         click : '6.7'
         cmake : '3.25.2'
         cppunit : '1.13.2'
         chardet : '3.0.4'
-        Cython : '0.25.2'
+        Cython : '0.29.12'
         docutils : '0.12'
         doxygen : '1.8.14'
         graphviz : '2.38.0'
@@ -43,17 +43,18 @@ APPLICATION :
         lapack : '3.8.0'
         libxml2 : '2.9.1'
         markupsafe : '0.23'
-        medfile : {section: 'default_Autotools', tag: '4.1.1'}
+        medfile : '4.1.1'
         metis : '5.1.0'
-        numpy : '1.15.1'
+        numpy : '1.16.4'
         pockets : '0.6.2'
+        packaging : '17.1'
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
         Python : '3.6.5'
-        pytz : '2015.7'
+        pytz : '2017.2'
         requests : '2.19.1'
-        scipy : '0.19.1'
-        scotch : '6.0.4'
+        scipy : '1.4.1'
+        scotch : {tag: '6.1.2', section: 'version_6_1_2_MPI', hpc: 'yes', base: 'no'}
         setuptools : '38.4.0'
         six : '1.10.0'
         snowballstemmer : '1.2.1'
@@ -62,12 +63,11 @@ APPLICATION :
         sphinxcontrib_websupport : '1.1.0'
         sphinxintl: '0.9.10'
         swig : '4.0.2'
-        packaging : '17.1'
         urllib3 : '1.23'
 
         # SALOME MODULES :
         'CONFIGURATION'
-        'MEDCOUPLING'
+        'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
     }
     test_base :
     {