From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Thu, 9 Jun 2022 10:33:14 +0000 (+0200)
Subject: bos #30252: use Scotch instead of PTScotch until MEDCOUPLING fullly migrated
X-Git-Tag: V9_11_0~360
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=486faccf036a60e7df169532be176eb3b4b1ed9c;p=tools%2Fsat_salome.git

bos #30252: use Scotch instead of PTScotch until MEDCOUPLING fullly migrated
---

diff --git a/applications/SALOME-9.8.0-int32.pyconf b/applications/SALOME-9.8.0-int32.pyconf
index 30adbdf..1f6e4d7 100644
--- a/applications/SALOME-9.8.0-int32.pyconf
+++ b/applications/SALOME-9.8.0-int32.pyconf
@@ -125,7 +125,7 @@ APPLICATION :
         'RESTRICTED'
         'LIBBATCH' : {tag : 'V2_4_5'}
         'KERNEL'
-        'MEDCOUPLING': {section: 'default_32BIT_IDS'}
+        'MEDCOUPLING': {tag: 'V9_8_0', section: 'default_32BIT_IDS'}
         'GUI'
         'GEOM'
         'SMESH'
@@ -159,7 +159,6 @@ APPLICATION :
         'ADAO_INTERFACE'
         'PARAVISADDONS'
         'YDEFX'
-        'TESTBASE': {tag: 'master'}
         'CEATESTBASE' : {tag: 'SSL'}
     }
     profile :
diff --git a/applications/SALOME-9.9.0-int32.pyconf b/applications/SALOME-9.9.0-int32.pyconf
new file mode 100644
index 0000000..7ce619a
--- /dev/null
+++ b/applications/SALOME-9.9.0-int32.pyconf
@@ -0,0 +1,242 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+APPLICATION :
+{
+    name : 'SALOME-9.9.0-int32'
+    workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
+    tag : 'V9_9_0'
+    dev : 'no'
+    verbose :'no'
+    debug : 'no'
+    base : 'no'
+    python3 : 'yes'
+    environ :
+    {
+        build : 
+        {
+           CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
+           RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
+           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"
+            ROOT_SALOME_INSTALL: '$PRODUCT_ROOT_DIR'
+        }
+        SALOME_trace : "local" # local/file:.../with_logger
+        SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui
+    }
+    products :
+    {
+        # PREREQUISITES :
+        alabaster : '0.7.6'
+        Babel : '2.7.0'
+        boost : '1.71.0'
+        CAS : 'V7_5_3p2'
+        C3PO: 'v2.0'
+        certifi : '2018.8.24'
+        cgns : '4.2.0'
+        chardet : '3.0.4'
+        click : '6.7'
+        cmake : '3.12.1'
+        cminpack: '1.3.6'
+        cppunit : '1.13.2'
+        cycler : '0.10.0'
+        Cython : '0.29.12'
+        dateutil : '2.6.1'
+        docutils : '0.12'
+        doxygen : '1.8.14'
+        eigen : '3.3.4'
+        embree : '3.12.2'
+        FMILibrary : '2.0.3'
+        freeimage : '3.16.0'
+        freetype : '2.9.1'
+        gcc  :  '8.5.0'
+        mpc : 'native'
+        gmp : 'native'
+        mpfr : 'native'
+        gdal : '2.4.0'
+        gmsh : '4.8.4'
+        graphviz : '2.38.0'
+        hdf5 : '1.10.3'
+        idna : '2.7'
+        imagesize : '1.0.0'
+        ispc : '1.15.0'
+        Jinja2 : '2.7.3'
+        kiwisolver : '1.0.1'
+        lapack : '3.8.0'
+        libxml2 : '2.9.1'
+        llvm : '8.0.1-clang'
+        markupsafe : '0.23'
+        matplotlib : '3.0.3'
+        medfile : '4.1.1'
+        mesa : '19.0.8'
+        MeshGems : '2.14-4'
+        mpi4py: '3.0.3'
+        metis : '5.1.0'
+        netgen : '5.3.1_with_CAS_7.2'
+        # comment out line above and uncomment the line below to use Netgen 6.
+        #netgen : '6.2.2101'
+        netcdf : '4.6.2'
+        nlopt : '2.5.0'
+        nose: '1.3.7'
+        numpy : '1.16.4'
+        numpydoc : '0.9.0'
+        omniORB : '4.2.2'
+        omniORBpy : '4.2.2'
+        opencv : '3.2.0'
+        openmpi : '3.1.6'
+        openturns: '1.18'
+        openVKL: '0.11.0'
+        ospray : '2.4.0'
+        packaging : '17.1'
+        pandas : '0.25.2'
+        patsy : '0.5.2'
+        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'
+        psutil : '5.7.2'
+        PyFMI : '2.5'
+        Pygments : '2.0.2'
+        pyparsing : '2.0.3'
+        PyQt : '5.15.3'
+        pyreadline : '2.0'
+        Python : '3.6.5'
+        pytz : '2017.2'
+        qt : '5.12.10'
+        qwt : '6.1.2'
+        requests : '2.19.1'
+        rkCommon : '1.5.1'
+        root: '6.22.02'
+        salome_system : 'native'
+        scipy : '1.4.1'
+        scotch : '6.1.2'
+        setuptools : '38.4.0'
+        sip : '5.5.0'
+        six : '1.10.0'
+        snowballstemmer : '1.2.1'
+        Sphinx : '1.7.6'
+        sphinxcontrib_websupport : '1.1.0'
+        sphinx_rtd_theme : '0.4.3'
+        sphinxintl: '0.9.10'
+        StaticMeshPlugin: '5.8.0'
+        statsmodels: '0.8.0'
+        swig : '3.0.12'
+        tbb : '2019_U8'
+        tcl : '8.6.0'
+        tk : '8.6.0'
+        urllib3 : '1.23'
+        zeromq: '4.3.1'
+        URANIE : '4.5.0'
+        # SALOME MODULES :
+        'CONFIGURATION'
+        'SALOME'
+        'SHAPER'
+        'SHAPERSTUDY'
+        'RESTRICTED'
+        'LIBBATCH' : 'V2_4_5'
+        'KERNEL'      : {tag:'V9_9_0', base: 'no', section: 'default_32BIT_IDS',     hpc: 'no' }
+        'MEDCOUPLING' : {tag:'V9_9_0', base: 'no', section: 'default_32BIT_IDS_MPI_STD', hpc: 'yes'}
+        'GUI'
+        'GEOM'
+        'SMESH'
+        'NETGENPLUGIN'
+        'BLSURFPLUGIN'
+        'GHS3DPLUGIN'
+        'GHS3DPRLPLUGIN'
+        'HYBRIDPLUGIN'
+        'HexoticPLUGIN'
+        'GMSHPLUGIN'
+        'HEXABLOCK'
+        'HEXABLOCKPLUGIN'
+        'HOMARD'
+        'FIELDS'
+        'PARAVIS' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
+        'JOBMANAGER'
+        'YACS'
+        'YACSGEN'
+        'DOCUMENTATION'
+        'SAMPLES'
+        'COMPONENT'
+        'PYCALCULATOR'
+        'CALCULATOR'
+        'HELLO'
+        'PYHELLO'
+        'EFICAS'
+        'EFICAS_TOOLS'
+        'PY2CPP'
+        'ADAO'
+        'ADAO_INTERFACE'
+        'PARAVISADDONS'
+        'OPENTURNS_SALOME'
+        'YDEFX'
+        'pmml'
+        'SOLVERLAB'
+        'TopIIVolMesh'
+        'CEATESTBASE'
+    }
+    profile :
+    {
+        launcher_name : "salome"
+    }
+    virtual_app:
+    {
+        name : "salome"
+        application_name : "APPLI"
+    }
+    test_base : 
+    {
+        name : "SALOME"
+        tag : "SalomeV9"
+    }
+    properties :
+    {
+        mesa_launcher_in_package : "yes"
+        repo_dev : "yes"
+        pip : 'yes'
+        pip_install_dir : 'python'
+        single_install_dir : "no"
+    }
+}
+__overwrite__ :
+[
+    {
+        __condition__ : "VARS.dist in ['FD30']"
+        'APPLICATION.products.gcc' : '9.3.0'
+    }
+    {
+        __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']
+        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD32'} # spns #29324
+    }
+    {
+        __condition__ : "VARS.dist in ['CO7']"
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+    }
+    {
+        __condition__ : "VARS.dist in ['CO8']"
+        'APPLICATION.rm_products'  : ['gcc', 'gmp', 'mpc', 'mpfr', 'zeromq']
+        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'} # spns #29324
+    }
+    {
+        __condition__ : "VARS.dist in ['DB10']"
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_DB10'} # spns #29324
+    }
+    {
+        __condition__ : "VARS.dist in ['UB18.04']"
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+    }
+    {
+        __condition__ : "VARS.dist in ['UB20.04']"
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_UB20_04'} # spns #29324
+    }
+]
diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf
index c4584ea..d4deb13 100644
--- a/applications/SALOME-master-int32.pyconf
+++ b/applications/SALOME-master-int32.pyconf
@@ -115,7 +115,7 @@ APPLICATION :
         root: '6.22.02'
         salome_system : 'native'
         scipy : '1.4.1'
-        scotch : {tag: '6.1.2', section: 'version_6_1_2_MPI', hpc: 'yes', base: 'no'}
+        scotch : '6.1.2'
         setuptools : '38.4.0'
         sip : '5.5.0'
         six : '1.10.0'
@@ -141,7 +141,7 @@ APPLICATION :
         'RESTRICTED'
         'LIBBATCH' : 'V2_4_5'
         'KERNEL'      : {tag:'master', base: 'no', section: 'default_32BIT_IDS', hpc: 'no' }
-        'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_32BIT_IDS', hpc: 'yes'}
+        'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_32BIT_IDS_MPI_STD', hpc: 'yes'}
         'GUI'
         'GEOM'
         'SMESH'
diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf
index a467f2d..afe6559 100644
--- a/products/MEDCOUPLING.pyconf
+++ b/products/MEDCOUPLING.pyconf
@@ -137,7 +137,7 @@ default_32BIT_IDS_win:
 
 default_32BIT_IDS_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=OFF"
+    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=OFF -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}"
     depend : [
               "boost",
               "cppunit",
@@ -145,7 +145,6 @@ default_32BIT_IDS_MPI :
               "hdf5",
               "medfile",
               "scotch",
-              "ParMetis",
               "docutils",
               "libxml2",
               "Sphinx",
@@ -159,6 +158,33 @@ default_32BIT_IDS_MPI :
               "CONFIGURATION",
               "openmpi"
               ]
+    opt_depend : ["ParMetis", "metis"]
+}
+
+default_32BIT_IDS_MPI_STD :
+{
+    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=ON -DMEDCOUPLING_PARTITIONER_PTSCOTCH=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=OFF -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", "metis"]
 }
 
 version_V9_9_0_MPI: