CO8: fix gdal build HPC mode

diff --git a/applications/SALOME-9.13.0-MPI.pyconf b/applications/SALOME-9.13.0-MPI.pyconf
index 18ff465e74bb90c5931088cd4ac407dc580b0aad..de393d4d2a8abddc4c1df603050962155bf65910 100644 (file)
--- a/applications/SALOME-9.13.0-MPI.pyconf
+++ b/applications/SALOME-9.13.0-MPI.pyconf
@@ -11,7 +11,7 @@ APPLICATION :
     debug    : 'no'
     base     : 'no'
     python3  : 'yes'
-    platform : ['CO7']
+    platform : ['CO7', 'CO8']
     environ  :
     {
         build : 
@@ -249,9 +249,9 @@ __overwrite__ :
     {
         __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.openturns'  : {tag: '1.22',  base: 'no', section: 'version_1_22_CO8', hpc: 'yes' }
-        'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
+        'APPLICATION.products.gdal'      : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8',      hpc: 'yes' } # spns #29324
+        'APPLICATION.products.openturns' : {tag: '1.22',   base: 'no', section: 'version_1_22_CO8',       hpc: 'yes' }
+        'APPLICATION.products.ParaView'  : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
     }
     {
         __condition__ : "VARS.dist in ['DB10']"

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index 447e58e57545bc02a4fe43c74cf4a64d393e3671..30d14ffc88336e00cc1a4cab682ea7ff21246254 100644 (file)
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -11,8 +11,7 @@ APPLICATION :
     debug    : 'no'
     base     : 'no'
     python3  : 'yes'
-    pyver    : '3.9'
-    platform : ['CO7']
+    platform : ['CO7', 'CO8']
     environ  :
     {
         build : 
@@ -43,6 +42,7 @@ APPLICATION :
         catalyst: '2.0'
         C3PO: 'v2.3'
         certifi : '2018.8.24'
+        cftime: '1.6.3'
         cgns : {tag : '4.2.0', hpc : 'yes'}
         chardet : '3.0.4'
         charset_normalizer : '3.3.2'
@@ -65,10 +65,13 @@ APPLICATION :
         gcc  :  '8.5.0'
         mpc : 'native'
         gmp : 'native'
+        mmg : '5.6.0'
+        mmgplugin: 'v1.0.0'
         mpfr : 'native'
         gdal :  {tag : '2.4.0',  hpc : 'yes'}
         gmsh :  {tag : '4.10.3', section :  'version_4_10_3_with_CAS_7_8_MPI', hpc : 'yes', base : 'no'}
         graphviz : '2.38.0'
+        h5py : '3.11.0'
         hdf5 : {tag : '1.10.3', hpc : 'yes'}
         idna : '2.7'
         imagesize : '1.4.1'
@@ -81,14 +84,18 @@ APPLICATION :
         libxml2 : '2.9.12'
         llvm : '8.0.1-clang'
         markupsafe : '2.1.5'
+        markdown_it_py: '3.0.0'
         matplotlib : '3.8.2'
+        mdurl: '0.1.2'
         medfile : {tag : '4.1.1', hpc : 'yes'}
         mesa : '19.0.8'
         MeshGems : {tag : '2.15-1', hpc : 'yes'}
+        meshio : {tag: '5.3.5' , base: 'no', section : 'version_5_3_5_no_pip'}
         mpi4py: {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'} 
         ParMetis : '4.0.3-p6'
         netgen : '5.3.1_with_CAS_7.8'
         netcdf : {tag : '4.6.2', hpc : 'yes'}
+        netCDF4 : '1.6.5'
         nlopt : '2.5.0'
         nose: '1.3.7'
         numpy : '1.21.1'
@@ -117,9 +124,10 @@ APPLICATION :
         pyreadline : '2.0'
         Python : '3.9.14'
         pytz : '2017.2'
-        qt : '5.12.10'
-        qwt : '6.1.2'
+        qt : '5.15.2'
+        qwt : '6.1.6'
         requests : '2.31.0'
+        rich : '13.7.1'
         rkCommon : '1.5.1'
         root: '6.22.02'
         salome_system : 'native'
@@ -222,162 +230,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.22',  base: 'no', section: 'version_1_22_CO7', hpc: 'yes' }
-    }
-
-    {
-        __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',
-            'tabulate',
-            'tomli',
-            'zipp'
-        ]
-        '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.22',  base: 'no', section: 'version_1_22_CO8', hpc: 'yes' }
-    }
-
-    {
-        __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',
-            'tabulate',
-            'tomli',
-            'zipp'
-        ]
-        '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.22',  base: 'no', section: 'version_1_22_DB09', hpc: 'yes' }
-    }
     {
         __condition__ : "VARS.dist in ['FD30']"
         'APPLICATION.products.gcc' : '9.3.0'
@@ -390,16 +242,16 @@ __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.9'"
+        __condition__ : "VARS.dist in ['CO7']"
         'APPLICATION.rm_products'         : ['gcc', 'gmp', 'mpc', 'mpfr']
         'APPLICATION.products.openturns'  : {tag: '1.22',  base: 'no', section: 'version_1_22_CO7', hpc: 'yes' }
     }
     {
-        __condition__ : "VARS.dist in ['CO8'] and APPLICATION.pyver == '3.9'"
+        __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.openturns'  : {tag: '1.22',  base: 'no', section: 'version_1_22_CO8', hpc: 'yes' }
-        'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
+        'APPLICATION.products.gdal'      : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8',      hpc: 'yes' } # spns #29324
+        'APPLICATION.products.openturns' : {tag: '1.22',   base: 'no', section: 'version_1_22_CO8',       hpc: 'yes' }
+        'APPLICATION.products.ParaView'  : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
     }
     {
         __condition__ : "VARS.dist in ['DB10']"
@@ -407,7 +259,7 @@ __overwrite__ :
         'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_DB10'} # spns #29324
     }
     {
-        __condition__ : "VARS.dist in ['DB09'] and APPLICATION.pyver == '3.9'"
+        __condition__ : "VARS.dist in ['DB09']"
         'APPLICATION.products.openturns'        : {tag: '1.22',  base: 'no', section: 'version_1_22_DB09', hpc: 'yes' }
     }
     {