From 6f7d29d1193136771b30ad29f8cebb9b2aae6596 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 7 Dec 2022 18:05:38 +0100 Subject: [PATCH] SALOME 9.10.0-MPI add dedicated sections --- applications/SALOME-9.10.0-MPI.pyconf | 2 +- products/FIELDS.pyconf | 11 +++++++++++ products/HEXABLOCK.pyconf | 26 +++++++++++++++++++++++++ products/HOMARD.pyconf | 6 ++++++ products/JOBMANAGER.pyconf | 23 ++++++++++++++++++++++ products/KERNEL.pyconf | 25 ++++++++++++++++++++++++ products/MEDCOUPLING.pyconf | 26 +++++++++++++++++++++++++ products/PARAVIS.pyconf | 28 +++++++++++++++++++++++++++ products/SOLVERLAB.pyconf | 19 ++++++++++++++++++ 9 files changed, 165 insertions(+), 1 deletion(-) diff --git a/applications/SALOME-9.10.0-MPI.pyconf b/applications/SALOME-9.10.0-MPI.pyconf index fb4994c..9897204 100644 --- a/applications/SALOME-9.10.0-MPI.pyconf +++ b/applications/SALOME-9.10.0-MPI.pyconf @@ -182,7 +182,7 @@ APPLICATION : 'OPENTURNS_SALOME' 'YDEFX' 'pmml' - 'SOLVERLAB': {tag:'V9_10_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'SOLVERLAB': {tag:'V9_10_0rc1', base: 'no', section: 'version_V9_10_0_MPI', hpc: 'yes'} 'TopIIVolMesh' 'CEATESTBASE' } diff --git a/products/FIELDS.pyconf b/products/FIELDS.pyconf index 295722f..4e0ee6c 100755 --- a/products/FIELDS.pyconf +++ b/products/FIELDS.pyconf @@ -40,6 +40,17 @@ default_MPI : ] } +version_V9_10_0_MPI : +{ + cmake_options : "-DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON" + depend : [ + "GUI", + "KERNEL", + "MEDCOUPLING", + "openmpi" + ] +} + version_V9_9_0_MPI : { cmake_options : "-DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON" diff --git a/products/HEXABLOCK.pyconf b/products/HEXABLOCK.pyconf index e305066..fa30679 100644 --- a/products/HEXABLOCK.pyconf +++ b/products/HEXABLOCK.pyconf @@ -72,6 +72,32 @@ default_MPI : ] } +version_V9_10_0_MPI : +{ + cmake_options : "-DSALOME_USE_MPI=ON" + depend : [ + "KERNEL", + "GUI", + "GEOM", + "boost", + "CAS", + "Python", + "omniORB", + "qt", + "ParaView", + "docutils", + "libxml2", + "Sphinx", + "Jinja2", + "setuptools", + "Pygments", + "six", + "pytz", + "markupsafe", + "openmpi" + ] +} + version_V9_9_0_MPI : { cmake_options : "-DSALOME_USE_MPI=ON" diff --git a/products/HOMARD.pyconf b/products/HOMARD.pyconf index a7b7440..4b5964f 100644 --- a/products/HOMARD.pyconf +++ b/products/HOMARD.pyconf @@ -40,6 +40,12 @@ default_MPI : opt_depend : ['openmpi'] } +version_V9_10_0_MPI : +{ + cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} -DSALOME_USE_MPI=ON " + opt_depend : ['openmpi'] +} + version_V9_9_0_MPI : { cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} -DSALOME_USE_MPI=ON " diff --git a/products/JOBMANAGER.pyconf b/products/JOBMANAGER.pyconf index 0abc12c..96c7e40 100644 --- a/products/JOBMANAGER.pyconf +++ b/products/JOBMANAGER.pyconf @@ -64,6 +64,29 @@ default_MPI : ] } +version_V9_10_0_MPI : +{ + cmake_options : "-DSALOME_USE_MPI=ON" + depend : [ + "LIBBATCH", + "KERNEL", + "GUI", + "Python", + "qt", + "omniORB", + "boost", + "Sphinx", + "Jinja2", + "setuptools", + "Pygments", + "docutils", + "six", + "pytz", + "markupsafe", + "openmpi" + ] +} + version_V9_9_0_MPI : { cmake_options : "-DSALOME_USE_MPI=ON" diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf index a7a536e..49de209 100644 --- a/products/KERNEL.pyconf +++ b/products/KERNEL.pyconf @@ -98,6 +98,31 @@ default_32BIT_IDS : cmake_options : "-DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_CMAKE_DEBUG=ON -DSALOME_USE_64BIT_IDS=OFF" } +version_V9_10_0_MPI : +{ + cmake_options : "-DSALOME_USE_MPI=ON -DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_USE_64BIT_IDS=ON " + depend : ["Python", + "boost", + "numpy", + "lapack", + "hdf5", + "omniORB", + "omniORBpy", + "docutils", + "libxml2", + "Sphinx", + "sphinxintl", + "Jinja2", + "setuptools", + "Pygments", + "pytz", + "cppunit", + "openmpi", + "LIBBATCH", + "psutil" + ] +} + version_V9_9_0_MPI : { cmake_options : "-DSALOME_USE_MPI=ON -DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_USE_64BIT_IDS=ON " diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf index aadc12e..fb9cce9 100644 --- a/products/MEDCOUPLING.pyconf +++ b/products/MEDCOUPLING.pyconf @@ -187,6 +187,32 @@ default_32BIT_IDS_MPI_STD : opt_depend : ["ParMetis", "metis"] } +version_V9_10_0_MPI_STD : +{ + 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_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}" + depend : [ + "boost", + "cppunit", + "Python", + "hdf5", + "medfile", + "scotch", + "docutils", + "libxml2", + "Sphinx", + "sphinxintl", + "setuptools", + "six", + "pytz", + "numpy", + "scipy", + "lapack", + "CONFIGURATION", + "openmpi" + ] + opt_depend : ["ParMetis"] +} + version_V9_9_0_MPI: { cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PTSCOTCH=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} -DSCOTCH_ROOT_DIR=${SCOTCH_ROOT_DIR} -DPTSCOTCH_ROOT_DIR=${PTSCOTCH_ROOT_DIR} -DPTSCOTCH_INCLUDE_DIRS=${PTSCOTCH_INCLUDE_DIR}" diff --git a/products/PARAVIS.pyconf b/products/PARAVIS.pyconf index 041252f..0fe6a29 100644 --- a/products/PARAVIS.pyconf +++ b/products/PARAVIS.pyconf @@ -100,11 +100,39 @@ default_MPI : patches : [] } + version_V9_7_0_to_V9_8_0 : { cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DBUILD_TESTING=ON" } +version_V9_10_0_MPI : +{ + cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} " + depend : [ + "KERNEL", + "GUI", + "MEDCOUPLING", + "FIELDS", + "GEOM", + "SMESH", + "Python", + "qt", + "boost", + "hdf5", + "medfile", + "ParaView", + "CAS", + "omniORB", + "docutils", + "libxml2", + "six", + "pytz", + "openmpi" + ] + patches : [] +} + version_V9_9_0_MPI : { cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} " diff --git a/products/SOLVERLAB.pyconf b/products/SOLVERLAB.pyconf index 0980f8a..0e1d262 100644 --- a/products/SOLVERLAB.pyconf +++ b/products/SOLVERLAB.pyconf @@ -60,6 +60,25 @@ default_MPI : opt_depend : ['mpi4py'] } +version_V9_10_0_MPI : +{ + depend : + [ + 'hdf5', + 'matplotlib', + 'medfile', + 'numpy', + 'ParaView', + 'petsc', + 'Python', + 'KERNEL', + 'GUI', + 'MEDCOUPLING', + 'openmpi' + ] + opt_depend : ['mpi4py'] +} + version_V9_9_0_MPI : { depend : -- 2.39.2