From 789cbe98fad4e7a650313769298d53c0d8a9cfb8 Mon Sep 17 00:00:00 2001 From: Guytri KASTANE Date: Mon, 29 Apr 2024 10:35:59 +0200 Subject: [PATCH] bos #41189: update SALOME-master-MPI.pyconf --- applications/SALOME-master-MPI.pyconf | 268 ++++++++++++++++++---- products/compil_scripts/openturns-1.22.sh | 24 +- 2 files changed, 241 insertions(+), 51 deletions(-) diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index dd35873..178a66e 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -3,16 +3,17 @@ APPLICATION : { - name : 'SALOME-master-MPI' - workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'master' - dev : 'no' - verbose :'no' - debug : 'no' - base : 'no' - python3 : 'yes' + name : 'SALOME-master-MPI' + workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist + tag : 'master' + dev : 'no' + verbose : 'no' + debug : 'no' + base : 'no' + python3 : 'yes' + pyver : '3.9' platform : ['CO7'] - environ : + environ : { build : { @@ -36,26 +37,29 @@ APPLICATION : { # PREREQUISITES : alabaster : '0.7.6' - Babel : '2.7.0' + Babel : '2.14.0' boost : '1.71.0' CAS : {tag : 'V7_5_3p5', section: 'version_CR753_SALOME_PATCH', base: 'no'} catalyst: '2.0' - C3PO: 'v2.0' + C3PO: 'v2.3' certifi : '2018.8.24' cgns : {tag : '4.2.0', hpc : 'yes'} 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.12' - dateutil : '2.6.1' - docutils : '0.12' + Cython : '0.29.37' + dateutil : '2.7.3' + docutils : '0.20.1' doxygen : '1.8.14' eigen : '3.3.4' embree : '3.12.2' FMILibrary : '2.0.3' + fonttools : '4.48.1' freeimage : '3.16.0' freetype : '2.9.1' gcc : '8.5.0' @@ -67,19 +71,21 @@ APPLICATION : graphviz : '2.38.0' hdf5 : {tag : '1.10.3', hpc : 'yes'} idna : '2.7' - imagesize : '1.0.0' + imagesize : '1.4.1' + importlib_metadata : '7.0.1' + importlib_resources: '6.1.1' ispc : '1.15.0' - Jinja2 : '2.7.3' - kiwisolver : '1.0.1' + Jinja2 : '3.1.3' + kiwisolver : '1.3.1' lapack : '3.8.0' - libxml2 : '2.9.1' + libxml2 : '2.9.12' llvm : '8.0.1-clang' - markupsafe : '0.23' - matplotlib : '3.3.4' + markupsafe : '2.1.5' + matplotlib : '3.8.2' medfile : {tag : '4.1.1', hpc : 'yes'} mesa : '19.0.8' MeshGems : {tag : '2.15-1', hpc : 'yes'} - mpi4py: '3.0.3' + 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.2' # comment out line above and uncomment the line below to use Netgen 6. @@ -87,57 +93,67 @@ APPLICATION : netcdf : {tag : '4.6.2', hpc : 'yes'} nlopt : '2.5.0' nose: '1.3.7' - numpy : '1.16.4' - numpydoc : '0.9.0' + numpy : '1.21.1' + numpydoc : '1.6.0' omniORB : '4.2.5' omniORBpy : '4.2.5' opencv : '3.2.0' openmpi : '3.1.6' # current version of hdf5 is not compatible with openmpi 4, if compiled with MPI support - openturns: {tag : '1.22', section: 'version_1_22', hpc : 'yes'} + openturns: {tag : '1.22', section: 'version_1_22_CO7', hpc : 'yes'} openVKL: '0.11.0' ospray : '2.4.0' - packaging : '17.1' + packaging : '23.2' packagespy : '74152cd' - pandas : '0.25.2' - patsy : '0.5.2' + pandas : '1.1.5' + patsy : '0.5.4' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_MPI', hpc: 'yes'} PERSALYS: 'v16.0.1' petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'} Pillow : '8.4.0' planegcs : '0.18-3cb6890' - psutil : '5.7.2' + psutil : '5.9.8' PyFMI : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip'} - Pygments : '2.0.2' - pyparsing : '2.0.3' + Pygments : '2.17.2' + pyparsing : '3.1.1' PyQt : '5.15.3' pyreadline : '2.0' - Python : '3.6.5' + Python : '3.9.14' pytz : '2017.2' qt : '5.12.10' qwt : '6.1.2' - requests : '2.19.1' + requests : '2.31.0' rkCommon : '1.5.1' root: '6.22.02' salome_system : 'native' - scipy : '1.4.1' + scipy : '1.6.2' scotch : {tag: '6.1.2', section: 'version_6_1_2_MPI', hpc: 'yes', base: 'no'} - setuptools : '38.4.0' + setuptools : '69.0.3' 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' - statsmodels: '0.8.0' - swig : '4.1.1' + 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' + 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 : @@ -183,7 +199,7 @@ APPLICATION : 'YDEFX' 'pmml' 'SALOMEBOOTSTRAP' - 'SOLVERLAB' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'SOLVERLAB' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' @@ -209,6 +225,162 @@ 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' @@ -221,13 +393,15 @@ __overwrite__ : '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 ['CO7'] and APPLICATION.pyver == '3.9'" + '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']" + __condition__ : "VARS.dist in ['CO8'] and APPLICATION.pyver == '3.9'" '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'} } { @@ -235,6 +409,10 @@ __overwrite__ : '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 ['DB09'] and APPLICATION.pyver == '3.9'" + 'APPLICATION.products.openturns' : {tag: '1.22', base: 'no', section: 'version_1_22_DB09', hpc: 'yes' } + } { __condition__ : "VARS.dist in ['UB18.04']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] diff --git a/products/compil_scripts/openturns-1.22.sh b/products/compil_scripts/openturns-1.22.sh index ced175d..98ccb54 100755 --- a/products/compil_scripts/openturns-1.22.sh +++ b/products/compil_scripts/openturns-1.22.sh @@ -437,12 +437,22 @@ if [[ -d "$SOURCE_DIR/otfftw-0.14" ]]; then echo "FATAL: could not install decorator-5.1.0" exit 6 fi - echo "INFO: install scikit-learn-0.24.2" - ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-0.24.2/scikit-learn-0.24.2.tar.gz --no-deps - if [ $? -ne 0 ] - then - echo "FATAL: could not install scikit-0.24.2" - exit 6 + if [ "${PYTHON_VERSION}" == "3.6" ]; then + echo "INFO: install scikit-learn-0.24.2" + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-0.24.2/scikit-learn-0.24.2.tar.gz --no-deps + if [ $? -ne 0 ] + then + echo "FATAL: could not install scikit-0.24.2" + exit 6 + fi + elif [ "${PYTHON_VERSION}" == "3.9" ]; then + echo "INFO: install scikit-learn-1.2.2" + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-1.2.2/scikit-learn-1.2.2.tar.gz --no-deps + if [ $? -ne 0 ] + then + echo "FATAL: could not install scikit-1.2.2" + exit 6 + fi fi fi fi @@ -544,6 +554,8 @@ if [[ -d "$SOURCE_DIR/otfftw-0.14" ]]; then fi elif [ -f ${PYTHON_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/setuptools/site-patch.py ]; then cp ${PYTHON_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/setuptools/site-patch.py ${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages/site.py + elif [ -f ${PYTHON_ROOT_DIR}/lib/python${PYTHON_VERSION}/site.py ]; then + cp ${PYTHON_ROOT_DIR}/lib/python${PYTHON_VERSION}/site.py ${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages/site.py else echo "ERROR: could not find site-patch.py" exit 7 -- 2.39.2