expand MPI support list

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 8d688c05499ec2b9bcb2c468e1d921cf46a98ea8..e23448f878bd6f7e57c578765304b08c99a9304e 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -236,7 +236,6 @@ __overwrite__ :
         'APPLICATION.products.PyFMI'     : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'}
         'APPLICATION.products.openturns' : {tag: '1.17',  base: 'no', section: 'version_1_17_FD32' }
         'APPLICATION.products.ParaView'  : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_FD32'}
-        'APPLICATION.rm_products' : ['mpi4py']
     }
     {
         # FD 34 qt5 package is qt5-qtbase-devel.
@@ -246,6 +245,5 @@ __overwrite__ :
         'APPLICATION.products.omniORBpy': '4.2.4'
         'APPLICATION.products.PyFMI'    : {tag: '2.5',    base: 'no', section: 'version_2_5_no_pip'  }
         'APPLICATION.products.root'     : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34'}
-        'APPLICATION.rm_products' : ['mpi4py']
     }
 ]

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index bcc4c645679a99b3234cebbc87ca90d5ce10caca..48372babcf167de0d8f121f946a997ceed726cc7 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -196,13 +196,18 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['FD30']"
         'APPLICATION.products.gcc' : '9.3.0'
-        'APPLICATION.rm_products' : ['openmpi', 'mpi4py']
+        'APPLICATION.products.ParaView'    : {tag:'5.9.0',  base: 'no',  section: 'version_5_9_0_MPI', hpc: 'yes'}
+        'APPLICATION.products.PARAVIS'     : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
+        'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
     }
     {
         __condition__ : "VARS.dist in ['FD32']"
         # https://github.com/scipy/scipy/issues/11611
         'APPLICATION.products.scipy' : '1.5.2'
-        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr', 'openmpi', 'mpi4py']
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.ParaView'    : {tag:'5.9.0',  base: 'no',  section: 'version_5_9_0_MPI', hpc: 'yes'}
+        'APPLICATION.products.PARAVIS'     : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
+        'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
     }
     {
         __condition__ : "VARS.dist in ['CO7']"
@@ -210,7 +215,10 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['CO8']"
-        'APPLICATION.rm_products' : ['openmpi', 'mpi4py', 'gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.ParaView'    : {tag:'5.9.0',  base: 'no',  section: 'version_5_9_0_MPI', hpc: 'yes'}
+        'APPLICATION.products.PARAVIS'     : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
+        'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
     }
     {
         __condition__ : "VARS.dist in ['DB09']"