From: Guytri KASTANE <guytri.kastane@cea.fr>
Date: Wed, 13 Sep 2023 07:50:28 +0000 (+0200)
Subject: Add fftw dependency and add sections in config files (petsc, fftw); add compilation... 
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7691ab4fff6f04890ea433b7a513b023b0bd6361;p=tools%2Fsat_salome.git

Add fftw dependency and add sections in config files (petsc, fftw); add compilation script for petsc 3.19.4 and fftw 3.3.10
---

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 71070b6..7ae17a9 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -3,17 +3,16 @@
 
 APPLICATION :
 {
-    name     : 'SALOME-master'
-    workdir  : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
-    tag      : 'master'
-    dev      : 'no'
-    verbose  : 'no'
-    debug    : 'no'
-    base     : 'no'
-    python3  : 'yes'
-    pyver    : '3.9'
+    name : 'SALOME-master'
+    workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
+    tag : 'master'
+    dev : 'no'
+    verbose :'no'
+    debug : 'no'
+    base : 'no'
+    python3 : 'yes'
     platform : ['CO7', 'CO8', 'DB09']
-    environ  :
+    environ :
     {
         build : 
         {
@@ -37,7 +36,7 @@ APPLICATION :
     {
         # PREREQUISITES :
         alabaster : '0.7.6'
-        Babel : '2.14.0'
+        Babel : '2.7.0'
         boost : '1.71.0'
         CAS : {tag : 'V7_5_3p5', section: 'version_CR753_SALOME_PATCH', base: 'no'}
         catalyst: '2.0'
@@ -45,21 +44,19 @@ APPLICATION :
         certifi : '2018.8.24'
         cgns : '4.2.0'
         chardet : '3.0.4'
-        charset_normalizer : '3.3.2'
         click : '6.7'
         cmake : '3.25.2'
         cminpack: '1.3.6'
-        contourpy : '1.2.0'
         cppunit : '1.13.2'
         cycler : '0.10.0'
-        Cython : '0.29.37'
-        dateutil : '2.7.3'
-        docutils : '0.20.1'
+        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'
-        fonttools : '4.48.1'
+        fftw : {tag : '3.3.10', section: 'version_3_3_10', base: 'no'}
         freeimage : '3.16.0'
         freetype : '2.9.1'
         gcc  :  '8.5.0'
@@ -71,21 +68,19 @@ APPLICATION :
         graphviz : '2.38.0'
         hdf5 : '1.10.3'
         idna : '2.7'
-        imagesize : '1.4.1'
-        importlib_metadata : '7.0.1'
-        importlib_resources: '6.1.1'
+        imagesize : '1.0.0'
         ispc : '1.15.0'
-        Jinja2 : '3.1.3'
-        kiwisolver : '1.3.1'
+        Jinja2 : '2.7.3'
+        kiwisolver : '1.0.1'
         lapack : '3.8.0'
-        libxml2 : '2.9.12'
+        libxml2 : '2.9.1'
         llvm : '8.0.1-clang'
-        markupsafe : '2.1.5'
-        matplotlib : '3.8.2'
+        markupsafe : '0.23'
+        matplotlib : '3.3.4'
         medfile : '4.1.1'
         mesa : '19.0.8'
         MeshGems : '2.15-1'
-        mpi4py: {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'} 
+        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.
@@ -93,67 +88,57 @@ APPLICATION :
         netcdf : '4.6.2'
         nlopt : '2.5.0'
         nose: '1.3.7'
-        numpy : '1.21.1'
-        numpydoc : '1.6.0'
+        numpy : '1.16.4'
+        numpydoc : '0.9.0'
         omniORB : '4.2.5'
         omniORBpy : '4.2.5'
         opencv : '3.2.0'
         openmpi : '4.0.3'
-        openturns: '1.21'
+        openturns: '1.20.1'
         openVKL: '0.11.0'
         ospray : '2.4.0'
-        packaging : '23.2'
+        packaging : '17.1'
         packagespy : '74152cd'
-        pandas : '1.1.5'
-        patsy : '0.5.4'
+        pandas : '0.25.2'
+        patsy : '0.5.2'
         ParaView : {tag:'5.11.0', base: 'no',  section: 'version_5_11_0_MPI', hpc: 'yes'}
-        PERSALYS: 'v14.1'
-        petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'}
+        PERSALYS: 'v14.0.1'
+        petsc : {tag : '3.19.4', base: 'no', section: 'version_3_19_4', hpc: 'yes'}
         Pillow : '8.4.0'
         planegcs : '0.18-3cb6890'
-        psutil : '5.9.8'
+        psutil : '5.7.2'
         PyFMI : {tag: '2.6',   base: 'no', section: 'version_2_6_no_pip'}
-        Pygments : '2.17.2'
-        pyparsing : '3.1.1'
+        Pygments : '2.0.2'
+        pyparsing : '2.0.3'
         PyQt : '5.15.3'
         pyreadline : '2.0'
-        Python : '3.9.14'
+        Python : '3.6.5'
         pytz : '2017.2'
         qt : '5.12.10'
         qwt : '6.1.2'
-        requests : '2.31.0'
+        requests : '2.19.1'
         rkCommon : '1.5.1'
         root: '6.22.02'
         salome_system : 'native'
-        scipy : '1.6.2'
+        scipy : '1.4.1'
         scotch : {tag: '6.1.2', section: 'version_6_1_2_MPI', hpc: 'yes', base: 'no'}
-        setuptools : '69.0.3'
+        setuptools : '38.4.0'
         sip : '5.5.0'
         six : '1.10.0'
-        snowballstemmer : '2.2.0'
-        Sphinx : '7.2.6'
-        sphinxcontrib_applehelp : '1.0.8'
-        sphinxcontrib_devhelp : '1.0.6'
-        sphinxcontrib_jsmath : '1.0.1'
-        sphinxcontrib_jquery : '4.1'
-        sphinxcontrib_qthelp : '1.0.7'
-        sphinxcontrib_htmlhelp : '2.0.5'
-        sphinxcontrib_serializinghtml : '1.1.10'
-        sphinxcontrib_websupport : '1.2.7'
-        sphinx_rtd_theme : '2.0.0'
-        sphinxintl: '2.1.0'
-        statsmodels: '0.14.1'
+        snowballstemmer : '1.2.1'
+        Sphinx : '1.7.6'
+        sphinxcontrib_websupport : '1.1.0'
+        sphinx_rtd_theme : '0.4.3'
+        sphinxintl: '0.9.10'
+        statsmodels: '0.8.0'
         swig : '4.0.2'
-        tabulate : '0.9.0'
         tbb : '2019_U8'
         tcl : '8.6.0'
         tk : '8.6.0'
         toml: '0.10.2'
-        tomli : '2.0.1'
         TTK : 'f8dafde2d7'
         urllib3 : '1.23'
         zeromq: '4.3.1'
-        zipp : '3.17.0'
         URANIE : '4.7.0'
 
         # SALOME MODULES :
@@ -198,7 +183,6 @@ APPLICATION :
         'OPENTURNS_SALOME'
         'YDEFX'
         'pmml'
-        'SALOMEBOOTSTRAP'
         'SOLVERLAB' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'SOLVERLABGUI'
         'TopIIVolMesh'
@@ -225,157 +209,6 @@ APPLICATION :
 }
 __overwrite__ :
 [
-    {
-        __condition__ : "VARS.dist in ['CO7'] and APPLICATION.pyver == '3.6'"
-        'APPLICATION.rm_products' : [
-            'gcc', 'gmp', 'mpc', 'mpfr',
-            'charset_normalizer',
-            'contourpy',
-            'fonttools',
-            'tabulate',
-            'tomli',
-            'zipp',
-            'importlib_metadata',
-            'importlib_resources',
-            'sphinxcontrib_applehelp',
-            'sphinxcontrib_devhelp',
-            'sphinxcontrib_jsmath',
-            'sphinxcontrib_jquery',
-            'sphinxcontrib_qthelp',
-            'sphinxcontrib_htmlhelp',
-            'sphinxcontrib_serializinghtml'
-        ]
-        'APPLICATION.products.Babel' : '2.7.0'
-        'APPLICATION.products.Cython': '0.29.12'
-        'APPLICATION.products.dateutil' : '2.6.1'
-        'APPLICATION.products.docutils' : '0.12'
-        'APPLICATION.products.imagesize' : '1.0.0'
-        'APPLICATION.products.Jinja2' : '2.7.3'
-        'APPLICATION.products.kiwisolver' : '1.0.1'
-        'APPLICATION.products.libxml2' : '2.9.1'
-        'APPLICATION.products.markupsafe' : '0.23'
-        'APPLICATION.products.matplotlib' : '3.3.4'
-        'APPLICATION.products.mpi4py' : '3.0.3'
-        'APPLICATION.products.numpy' : '1.16.4'
-        'APPLICATION.products.numpydoc' : '0.9.0'
-        'APPLICATION.products.packaging' : '17.1'
-        'APPLICATION.products.pandas' : '0.25.2'
-        'APPLICATION.products.patsy' : '0.5.2'
-        'APPLICATION.products.psutil' : '5.7.2'
-        'APPLICATION.products.Pygments' : '2.0.2'
-        'APPLICATION.products.pyparsing' : '2.0.3'
-        'APPLICATION.products.Python' : '3.6.5'
-        'APPLICATION.products.requests' : '2.19.1'
-        'APPLICATION.products.scipy' : '1.4.1'
-        'APPLICATION.products.setuptools' : '38.4.0'
-        'APPLICATION.products.snowballstemmer' : '1.2.1'
-        'APPLICATION.products.sphinx_rtd_theme' : '0.4.3'
-        'APPLICATION.products.sphinxintl' : '0.9.10'
-        'APPLICATION.products.statsmodels' : '0.8.0'
-        'APPLICATION.products.sphinxcontrib_websupport' : '1.1.0'
-        'APPLICATION.products.Sphinx' : '1.7.6'
-        'APPLICATION.products.openturns' : {tag: '1.21',  base: 'no', section: 'version_1_21_CO7' }
-    }
-
-    {
-        __condition__ : "VARS.dist in ['CO8'] and APPLICATION.pyver == '3.6'"
-        'APPLICATION.rm_products' : [
-            'gcc', 'gmp', 'mpc', 'mpfr','zeromq',
-            'charset_normalizer',
-            'contourpy',
-            'fonttools',
-            'importlib_metadata',
-            'importlib_resources',
-            'sphinxcontrib_applehelp',
-            'sphinxcontrib_devhelp',
-            'sphinxcontrib_jsmath',
-            'sphinxcontrib_jquery',
-            'sphinxcontrib_qthelp',
-            'sphinxcontrib_htmlhelp',
-            'sphinxcontrib_serializinghtml'
-        ]
-        'APPLICATION.products.Babel' : '2.7.0'
-        'APPLICATION.products.Cython': '0.29.12'
-        'APPLICATION.products.dateutil' : '2.6.1'
-        'APPLICATION.products.docutils' : '0.12'
-        'APPLICATION.products.imagesize' : '1.0.0'
-        'APPLICATION.products.Jinja2' : '2.7.3'
-        'APPLICATION.products.kiwisolver' : '1.0.1'
-        'APPLICATION.products.libxml2' : '2.9.1'
-        'APPLICATION.products.markupsafe' : '0.23'
-        'APPLICATION.products.matplotlib' : '3.3.4'
-        'APPLICATION.products.mpi4py' : '3.0.3'
-        'APPLICATION.products.numpy' : '1.16.4'
-        'APPLICATION.products.numpydoc' : '0.9.0'
-        'APPLICATION.products.packaging' : '17.1'
-        'APPLICATION.products.pandas' : '0.25.2'
-        'APPLICATION.products.patsy' : '0.5.2'
-        'APPLICATION.products.psutil' : '5.7.2'
-        'APPLICATION.products.Pygments' : '2.0.2'
-        'APPLICATION.products.pyparsing' : '2.0.3'
-        'APPLICATION.products.Python' : '3.6.5'
-        'APPLICATION.products.requests' : '2.19.1'
-        'APPLICATION.products.scipy' : '1.4.1'
-        'APPLICATION.products.setuptools' : '38.4.0'
-        'APPLICATION.products.snowballstemmer' : '1.2.1'
-        'APPLICATION.products.Sphinx' : '1.7.6'
-        'APPLICATION.products.sphinxcontrib_websupport' : '1.1.0'
-        'APPLICATION.products.sphinx_rtd_theme' : '0.4.3'
-        'APPLICATION.products.sphinxintl' : '0.9.10'
-        'APPLICATION.products.statsmodels' : '0.8.0'
-        'APPLICATION.products.gdal'     : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'                 } # spns #29324
-        'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
-        'APPLICATION.products.openturns'  : {tag: '1.21',  base: 'no', section: 'version_1_21_CO8' }
-    }
-
-    {
-        __condition__ : "VARS.dist in ['DB09'] and APPLICATION.pyver == '3.6'"
-        'APPLICATION.rm_products' : [
-            'charset_normalizer',
-            'contourpy',
-            'fonttools',
-            'importlib_metadata',
-            'importlib_resources',
-            'sphinxcontrib_applehelp',
-            'sphinxcontrib_devhelp',
-            'sphinxcontrib_jsmath',
-            'sphinxcontrib_jquery',
-            'sphinxcontrib_qthelp',
-            'sphinxcontrib_htmlhelp',
-            'sphinxcontrib_serializinghtml'
-        ]
-        'APPLICATION.products.Babel' : '2.7.0'
-        'APPLICATION.products.Cython': '0.29.12'
-        'APPLICATION.products.dateutil' : '2.6.1'
-        'APPLICATION.products.docutils' : '0.12'
-        'APPLICATION.products.imagesize' : '1.0.0'
-        'APPLICATION.products.Jinja2' : '2.7.3'
-        'APPLICATION.products.kiwisolver' : '1.0.1'
-        'APPLICATION.products.libxml2' : '2.9.1'
-        'APPLICATION.products.markupsafe' : '0.23'
-        'APPLICATION.products.matplotlib' : '3.3.4'
-        'APPLICATION.products.mpi4py' : '3.0.3'
-        'APPLICATION.products.numpy' : '1.16.4'
-        'APPLICATION.products.numpydoc' : '0.9.0'
-        'APPLICATION.products.packaging' : '17.1'
-        'APPLICATION.products.pandas' : '0.25.2'
-        'APPLICATION.products.patsy' : '0.5.2'
-        'APPLICATION.products.psutil' : '5.7.2'
-        'APPLICATION.products.Pygments' : '2.0.2'
-        'APPLICATION.products.pyparsing' : '2.0.3'
-        'APPLICATION.products.Python' : '3.6.5'
-        'APPLICATION.products.requests' : '2.19.1'
-        'APPLICATION.products.scipy' : '1.4.1'
-        'APPLICATION.products.setuptools' : '38.4.0'
-        'APPLICATION.products.snowballstemmer' : '1.2.1'
-        'APPLICATION.products.Sphinx' : '1.7.6'
-        'APPLICATION.products.sphinxcontrib_websupport' : '1.1.0'
-        'APPLICATION.products.sphinx_rtd_theme' : '0.4.3'
-        'APPLICATION.products.sphinxintl' : '0.9.10'
-        'APPLICATION.products.statsmodels' : '0.8.0'
-        'APPLICATION.products.openturns'        : {tag: '1.21',  base: 'no', section: 'version_1_21_DB09' }
-        'APPLICATION.products.MEDCOUPLING'      : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
-    }
     {
         __condition__ : "VARS.dist in ['FD30']"
         'APPLICATION.products.gcc' : '9.3.0'
@@ -388,16 +221,20 @@ __overwrite__ :
         'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD32'} # spns #29324
     }
     {
-        __condition__ : "VARS.dist in ['CO7'] and APPLICATION.pyver != '3.6'"
+        __condition__ : "VARS.dist in ['CO7']"
         'APPLICATION.rm_products'         : ['gcc', 'gmp', 'mpc', 'mpfr']
-        'APPLICATION.products.openturns'  : {tag: '1.21',  base: 'no', section: 'version_1_21_CO7' }
+        'APPLICATION.products.openturns'  : {tag: '1.20.1',  base: 'no', section: 'version_1_20_1_CO7' }
     }
     {
-        __condition__ : "VARS.dist in ['CO8'] and APPLICATION.pyver != '3.6'"
+        __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
         'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
-        'APPLICATION.products.openturns'  : {tag: '1.21',  base: 'no', section: 'version_1_21_CO8' }
+        'APPLICATION.products.openturns': {tag: '1.20.1', base: 'no', section: 'version_1_20_1_CO8' }
+    }
+    {
+        __condition__ : "VARS.dist in ['DB09']"
+        'APPLICATION.products.openturns'        : {tag: '1.20.1',  base: 'no', section: 'version_1_20_1_DB09' }
     }
     {
         __condition__ : "VARS.dist in ['DB10']"