From: Nabil Ghodbane Date: Fri, 22 Sep 2023 11:13:02 +0000 (+0200) Subject: bos #34671: openturns and persalys integration X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3bf25bf7b1caecb5f3332778c3237545f0389dfa;p=tools%2Fsat_salome.git bos #34671: openturns and persalys integration --- diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index e229573..bae1cf2 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -11,7 +11,7 @@ APPLICATION : debug : 'no' base : 'no' python3 : 'yes' - platform : ["FD32", "FD34", "FD36", "FD37", "FD38", "CO8", "CO9", "DB10", "DB11", "DB12", "UB20.04", "UB22.04"] + platform : ["FD32", "FD34", "FD36", "FD37", "FD38", "CO8", "DB10", "DB11", "UB20.04", "UB22.04"] environ : { build : @@ -143,7 +143,7 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : 'V2_5_0' + 'LIBBATCH' : 'V2_4_6' 'KERNEL' 'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' @@ -237,7 +237,6 @@ __overwrite__ : __condition__ : "VARS.dist in ['DB10']" 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack' : 'native' - 'APPLICATION.products.hdf5' : 'native' 'APPLICATION.products.PyFMI' : {tag:'2.6', base: 'no', section: 'version_2_6_no_pip' } 'APPLICATION.products.qt' : '5.12.10' 'APPLICATION.products.qwt' : '6.1.2' @@ -247,29 +246,12 @@ __overwrite__ : 'APPLICATION.products.scipy' : {tag: '1.5.2', base: 'no', section: 'version_1_5_2_no_pip' } # scipy >= 1.4 - system one too old 'APPLICATION.products.swig' : '4.0.2' 'APPLICATION.products.openmpi' : '4.1.5' - 'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} } { __condition__ : "VARS.dist in ['DB11']" 'APPLICATION.products.opencv' : '3.2.0' - 'APPLICATION.products.hdf5' : 'native' 'APPLICATION.products.cminpack' : 'native' 'APPLICATION.products.PyFMI' : {tag:'2.6', base: 'no', section: 'version_2_6_no_pip'} - 'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} - } - { - __condition__ : "VARS.dist in ['DB12']" - 'APPLICATION.products.CONFIGURATION' : 'master' - 'APPLICATION.products.cmake' : 'native' # TTK requires cmake > 3.21 - 'APPLICATION.products.opencv' : {tag: '3.2.0', base: 'no', section: 'version_3_2_0_DB12'} - 'APPLICATION.products.cminpack' : 'native' - 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_DB12'} - 'APPLICATION.products.swig' : '4.0.2' - 'APPLICATION.products.tbb' : '2021.9.0' - 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_DB12' } - 'APPLICATION.products.nlopt' : '2.5.0' - 'APPLICATION.products.openturns' : {tag: '1.21', base: 'no', section: 'version_1_21_DB12' } - 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_DB12', hpc: 'yes' } } { # CentOS 8 repositories don't include sphinxintl package which must be installed through pip. @@ -281,28 +263,6 @@ __overwrite__ : 'APPLICATION.products.statsmodels' : {tag: '0.6.1', base: 'no', section: 'version_0_6_1_no_pip' } 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_CO8' } # spns #29324 'APPLICATION.products.swig' : '4.0.2' - 'APPLICATION.products.openturns' : {tag: '1.21', base: 'no', section: 'version_1_21_RO8' } - } - { - __condition__ : "VARS.dist in ['CO9']" - 'APPLICATION.products.cminpack' : '1.3.6' - 'APPLICATION.products.qwt' : '6.1.2' - 'APPLICATION.products.PyQt' : '5.15.3' - 'APPLICATION.products.swig' : '4.0.2' - 'APPLICATION.products.opencv' : '3.2.0' - 'APPLICATION.products.openmpi' : '4.1.5' - 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_CO9' } - 'APPLICATION.products.qt' : {tag: '5.12.10', base: 'no', section: 'version_5_12_10_CO9' } - 'APPLICATION.products.sip' : '5.5.0' - 'APPLICATION.products.sphinxintl' : {tag: '0.9.10', base: 'no', section: 'version_0_9_10_no_pip' } - 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } - 'APPLICATION.products.numpydoc' : {tag: '0.9.0', base: 'no', section: 'version_0_9_0_no_pip' } - 'APPLICATION.products.pandas' : {tag: '1.1.5', base: 'no', section: 'version_1_1_5_no_pip' } - 'APPLICATION.products.statsmodels' : {tag: '0.6.1', base: 'no', section: 'version_0_6_1_no_pip' } - 'APPLICATION.products.nose' : {tag: '1.3.7', base: 'no', section: 'version_1_3_7_no_pip' } - 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO9', hpc: 'yes'} - 'APPLICATION.products.YDEFX' : {tag: 'master', base: 'no', section: 'version_master_CO9' } - 'APPLICATION.products.YACS' : {tag: 'master', base: 'no', section: 'version_master_CO9' } } { __condition__ : "VARS.dist in ['FD32']" @@ -350,8 +310,10 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_FD37' } 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD37' } 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_FD37', hpc: 'yes'} + 'APPLICATION.products.CONFIGURATION' : {tag:'master', base: 'no', section: 'default' } 'APPLICATION.products.SHAPER' : {tag:'master', base: 'no', section: 'default', hpc: 'no' } } + { __condition__ : "VARS.dist in ['FD38']" 'APPLICATION.rm_products' : ['root', 'URANIE', 'mesa'] @@ -362,13 +324,15 @@ __overwrite__ : 'APPLICATION.products.qwt' : '6.1.6' 'APPLICATION.products.nlopt' : '2.6.0' 'APPLICATION.products.netcdf' : '4.6.2' - 'APPLICATION.products.swig' : '4.0.2' - 'APPLICATION.products.petsc' : {tag: '3.16.0', base: 'no', section: 'version_3_16_0_FD38' } + 'APPLICATION.products.numpy' : {tag: '1.22.2', base: 'no', section: 'version_1_22_2' } 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_FD38' } 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD38' } 'APPLICATION.products.catalyst' : {tag: '2.0', base: 'no', section: 'version_2_0_FD38' } 'APPLICATION.products.gmsh' : {tag: '4.10.3', base: 'no', section: 'version_4_10_3_FD38' } 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_FD38', hpc: 'yes' } + 'APPLICATION.products.CONFIGURATION' : {tag:'master', base: 'no', section: 'default' } 'APPLICATION.products.SHAPER' : {tag:'master', base: 'no', section: 'default', hpc: 'no' } + 'APPLICATION.products.NETGENPLUGIN' : {tag:'master', base: 'no', section: 'version_V9_11_0_FD38' } + 'APPLICATION.products.YACS' : {tag:'master', base: 'no', section: 'version_V9_11_0_FD38' } } ] diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index edbd659..dca0aaf 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,22 +44,18 @@ 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' @@ -72,21 +67,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. @@ -94,8 +87,8 @@ 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' @@ -103,58 +96,48 @@ APPLICATION : openturns: '1.21' 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.19.4', base: 'no', section: 'version_3_19_4', hpc: 'yes'} + petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', 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 : @@ -163,7 +146,7 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : 'V2_5_0' + 'LIBBATCH' : 'V2_4_6' 'KERNEL' 'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' @@ -226,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' @@ -389,12 +221,12 @@ __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' } } { - __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'} @@ -406,9 +238,8 @@ __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.6'" + __condition__ : "VARS.dist in ['DB09']" '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 ['UB18.04']" diff --git a/products/PERSALYS.pyconf b/products/PERSALYS.pyconf index 6710d35..5e63f27 100644 --- a/products/PERSALYS.pyconf +++ b/products/PERSALYS.pyconf @@ -61,7 +61,7 @@ default_win : version_v14_1 : { - patches : ['PERSALYS-v14.1-001.patch', 'PERSALYS-v14.1-004-launch_html.patch'] + patches : ['PERSALYS-v14.1-001.patch'] } version_v14_1_win : @@ -93,7 +93,7 @@ version_v14_1_win : 'openblas', 'pthreads' ] - patches : ['PERSALYS-v14.1-002.patch', 'PERSALYS-v14.1-003.patch', 'PERSALYS-v14.1-004-launch_html.patch'] + patches : [] } version_v14_0_1 : diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index 3ac69ab..4d601df 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -30,11 +30,12 @@ default : } } -version_5_12_0 : +version_5_11_1 : { - compil_script : 'ParaView-5.12.0.sh' - archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} + compil_script : 'ParaView-5.11.1.sh' + archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} patches : [ + 'paraview-5.11.1.p001-FindCGNS.patch' ] depend : [ 'Python', @@ -52,12 +53,12 @@ version_5_12_0 : opt_depend : ['ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_12_0_int32 : +version_5_11_1_int32 : { - compil_script : 'ParaView-5.12.0.sh' - archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} - # two other LATA patches already included in archive + compil_script : 'ParaView-5.11.1.sh' + archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} patches : [ + 'paraview-5.11.1.p001-FindCGNS.patch' ] depend : [ 'Python', @@ -75,10 +76,10 @@ version_5_12_0_int32 : opt_depend : ['ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_12_0_win : +version_5_11_1_win : { - compil_script : 'ParaView-5.12.0.bat' - archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} + compil_script : 'ParaView-5.11.1.bat' + archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} depend : [ 'Python', 'hdf5', @@ -92,13 +93,15 @@ version_5_12_0_win : 'zlib' ] opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'rkCommon', 'matplotlib'] - patches : [] + patches : [ + 'paraview-5.11.1.p001-FindCGNS.patch' + ] } -version_5_12_0_win_dbg : +version_5_11_1_win_dbg : { - compil_script : 'ParaView-5.12.0.bat' - archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} + compil_script : 'ParaView-5.11.1.bat' + archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} depend : [ 'Python', 'hdf5', @@ -115,32 +118,13 @@ version_5_12_0_win_dbg : patches : [] } -version_5_12_0_MPI : +version_5_11_1_MPI : { - compil_script : 'ParaView-5.12.0.sh' - archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} - patches : [] - depend : [ - 'Python', - 'hdf5', - 'qt', - 'PyQt', - 'sip', - 'boost', - 'libxml2', - 'freetype', - 'matplotlib', - 'cgns', - 'Pygments' + compil_script : 'ParaView-5.11.1.sh' + archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} + patches : [ + 'paraview-5.11.1.p001-FindCGNS.patch' ] - opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] -} - -version_5_12_0_MPI_LATA_64BITS_IDS : -{ - compil_script : 'ParaView-5.12.0.sh' - archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} - patches : [] depend : [ 'Python', 'hdf5', @@ -157,11 +141,14 @@ version_5_12_0_MPI_LATA_64BITS_IDS : opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_12_0_MPI_DB12 : +version_5_11_1_MPI_LATA_64BITS_IDS : { - compil_script : 'ParaView-5.12.0.sh' - archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} - patches : [] + compil_script : 'ParaView-5.11.1.sh' + archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} + patches : [ + 'paraview-5.11.1.p001-FindCGNS.patch', + 'paraview-0012-LATA_64BITS_IDS.patch' + ] depend : [ 'Python', 'hdf5', @@ -178,10 +165,10 @@ version_5_12_0_MPI_DB12 : opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_12_0_MPI_DB10 : +version_5_11_1_MPI_DB10 : { - compil_script : 'ParaView-5.12.0.sh' - archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} + compil_script : 'ParaView-5.11.1.sh' + archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} patches : [] depend : [ 'Python', @@ -199,11 +186,13 @@ version_5_12_0_MPI_DB10 : opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_12_0_MPI_CO9 : +version_5_11_1_MPI_CO8 : { - compil_script : 'ParaView-5.12.0.sh' - archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} - patches : [] + compil_script : 'ParaView-5.11.1.sh' + archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} + patches : [ + 'paraview-5.11.1.p002-ParaViewClient.patch' + ] depend : [ 'Python', 'hdf5', @@ -220,10 +209,10 @@ version_5_12_0_MPI_CO9 : opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_12_0_MPI_CO8 : +version_5_11_1_MPI_FD38 : { - compil_script : 'ParaView-5.12.0.sh' - archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} + compil_script : 'ParaView-5.11.1.sh' + archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} patches : [] depend : [ 'Python', @@ -241,10 +230,10 @@ version_5_12_0_MPI_CO8 : opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_12_0_MPI_FD38 : +version_5_11_1_MPI_FD37 : { - compil_script : 'ParaView-5.12.0.sh' - archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} + compil_script : 'ParaView-5.11.1.sh' + archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} patches : [] depend : [ 'Python', @@ -295,8 +284,7 @@ version_5_11_0_int32 : # two other LATA patches already included in archive patches : [ 'paraview-5.11.0.p001-FindCGNS.patch', - 'paraview-5.11.0.p006-GIL.patch', - 'paraview-5.11.0.p009-openturns-1.21.patch' + 'paraview-5.11.0.p006-GIL.patch' ] depend : [ 'Python', @@ -335,8 +323,7 @@ version_5_11_0_win : 'paraview-5.11.0.p002-FindMPI.patch', 'paraview-5.11.0.p004-vtkUniformHyperTreeGrid.patch', 'paraview-5.11.0.p006-GIL.patch', - 'paraview-5.11.0.p009-openturns-1.21.patch', - 'paraview-5.11.0.p0011-add_dll_directory.patch' + 'paraview-5.11.0.p009-openturns-1.21.patch' ] } @@ -417,33 +404,6 @@ version_5_11_0_MPI_LATA_64BITS_IDS : opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_11_0_MPI_DB12 : -{ - compil_script : 'ParaView-5.11.0.sh' - archive_info : {archive_name : "ParaView-5.11.0.tar.gz"} - patches : ['paraview-5.11.0.p001-FindCGNS.patch', - 'paraview-5.11.0.p002-FindMPI.patch', - 'paraview-5.11.0.p006-GIL.patch', - 'paraview-5.11.0.p007-mpi4py-FD37.patch', - 'paraview-5.11.0.p009-openturns-1.21.patch', - 'paraview-5.11.0.p010-python-3.11.patch' - ] - depend : [ - 'Python', - 'hdf5', - 'qt', - 'PyQt', - 'sip', - 'boost', - 'libxml2', - 'freetype', - 'matplotlib', - 'cgns', - 'Pygments' - ] - opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] -} - version_5_11_0_MPI_DB10 : { compil_script : 'ParaView-5.11.0.sh' @@ -470,32 +430,6 @@ version_5_11_0_MPI_DB10 : opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_11_0_MPI_CO9 : -{ - compil_script : 'ParaView-5.11.0.sh' - archive_info : {archive_name : "ParaView-5.11.0.tar.gz"} - patches : ['paraview-5.11.0.p001-FindCGNS.patch', - 'paraview-5.11.0.p002-FindMPI.patch', - 'paraview-5.11.0.p003-ParaViewClient.patch', - 'paraview-5.11.0.p006-GIL.patch', - 'paraview-5.11.0.p009-openturns-1.21.patch' - ] - depend : [ - 'Python', - 'hdf5', - 'qt', - 'PyQt', - 'sip', - 'boost', - 'libxml2', - 'freetype', - 'matplotlib', - 'cgns', - 'Pygments' - ] - opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] -} - version_5_11_0_MPI_CO8 : { compil_script : 'ParaView-5.11.0.sh' @@ -531,8 +465,7 @@ version_5_11_0_MPI_FD38 : 'paraview-5.11.0.p006-GIL.patch', 'paraview-5.11.0.p007-mpi4py-FD37.patch', 'paraview-5.11.0.p008-cstdint-FD38.patch', - 'paraview-5.11.0.p009-openturns-1.21.patch', - 'paraview-5.11.0.p010-python-3.11.patch' + 'paraview-5.11.0.p009-openturns-1.21.patch' ] depend : [ 'Python', @@ -558,8 +491,7 @@ version_5_11_0_MPI_FD37 : 'paraview-5.11.0.p002-FindMPI.patch', 'paraview-5.11.0.p006-GIL.patch', 'paraview-5.11.0.p007-mpi4py-FD37.patch', - 'paraview-5.11.0.p009-openturns-1.21.patch', - 'paraview-5.11.0.p010-python-3.11.patch' + 'paraview-5.11.0.p009-openturns-1.21.patch' ] depend : [ 'Python', diff --git a/products/compil_scripts/openturns-1.21.bat b/products/compil_scripts/openturns-1.21.bat index b030b44..6887784 100644 --- a/products/compil_scripts/openturns-1.21.bat +++ b/products/compil_scripts/openturns-1.21.bat @@ -19,6 +19,9 @@ if %SAT_DEBUG% == 1 ( ) if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR% REM clean BUILD directory if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% @@ -177,20 +180,40 @@ echo ########################################################################## SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_DOC=OFF CALL:MODULE_BUILDER otsvm "%SOURCE_DIR%\otsvm-0.12" "%BUILD_DIR%\otsvm" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" +echo ########################################################################## +echo otfmi 0.15 +echo ########################################################################## +cd %BUILD_DIR% +mkdir otfmi + +set CMAKE_OPTIONS_EXT=%CMAKE_OPTIONS% +cd %BUILD_DIR%\otfmi +xcopy %SOURCE_DIR%\otfmi-0.15\* %BUILD_DIR%\otfmi /E /I /Q +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on xcopy + exit 3 +) + +%PYTHON_ROOT_DIR%\python.exe setup.py install --prefix=%PRODUCT_INSTALL% +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on python setup.py + exit 3 +) + echo echo ########################################################################## -echo dill 5.1.0 +echo scikit-learn 0.24.2 echo ########################################################################## cd %BUILD_DIR% -mkdir dill -cd %BUILD_DIR%\dill -xcopy %SOURCE_DIR%\dill-0.3.4\* %BUILD_DIR%\dill /E /I /Q +mkdir scikit-learn +cd %BUILD_DIR%\scikit-learn +xcopy %SOURCE_DIR%\scikit-learn-0.24.2\* %BUILD_DIR%\scikit-learn /E /I /Q if NOT %ERRORLEVEL% == 0 ( echo ERROR on xcopy exit 3 ) -%PYTHON_ROOT_DIR%\python.exe -m pip install --cache-dir=%BUILD_DIR%\cache\pip --prefix=%PRODUCT_INSTALL% dill-0.3.4-py2.py3-none-any.whl --no-deps +%PYTHON_ROOT_DIR%\python.exe -m pip install --cache-dir=%BUILD_DIR%\cache\pip --prefix=%PRODUCT_INSTALL% scikit-learn-0.24.2.tar.gz --no-deps --no-use-pep517 if NOT %ERRORLEVEL% == 0 ( echo ERROR on python setup.py exit 3 @@ -253,52 +276,6 @@ if NOT %ERRORLEVEL% == 0 ( exit 3 ) -echo -echo ########################################################################## -echo scikit-learn 0.24.2 -echo ########################################################################## -cd %BUILD_DIR% -mkdir scikit-learn -cd %BUILD_DIR%\scikit-learn -xcopy %SOURCE_DIR%\scikit-learn-0.24.2\* %BUILD_DIR%\scikit-learn /E /I /Q -if NOT %ERRORLEVEL% == 0 ( - echo ERROR on xcopy - exit 3 -) - -if %PYTHON_VERSION% == 3.6 ( - %PYTHON_ROOT_DIR%\python.exe -m pip install --cache-dir=%BUILD_DIR%\cache\pip --prefix=%PRODUCT_INSTALL% scikit-learn-0.24.2.tar.gz --no-deps --no-use-pep517 -) else ( - tar zxf scikit-learn-0.24.2.tar.gz - cd scikit-learn-0.24.2 - %PYTHON_ROOT_DIR%\python.exe setup.py install --prefix=%PRODUCT_INSTALL% -) - -if NOT %ERRORLEVEL% == 0 ( - echo ERROR on python setup.py - exit 3 -) - -echo ########################################################################## -echo otfmi 0.15 -echo ########################################################################## -cd %BUILD_DIR% -mkdir otfmi - -set CMAKE_OPTIONS_EXT=%CMAKE_OPTIONS% -cd %BUILD_DIR%\otfmi -xcopy %SOURCE_DIR%\otfmi-0.15\* %BUILD_DIR%\otfmi /E /I /Q -if NOT %ERRORLEVEL% == 0 ( - echo ERROR on xcopy - exit 3 -) - -%PYTHON_ROOT_DIR%\python.exe setup.py install --prefix=%PRODUCT_INSTALL% -if NOT %ERRORLEVEL% == 0 ( - echo ERROR on python setup.py - exit 3 -) - echo ########################################################################## echo otpod 0.6.10 echo ########################################################################## @@ -307,7 +284,7 @@ mkdir otpod set CMAKE_OPTIONS_EXT=%CMAKE_OPTIONS% cd %BUILD_DIR%\otpod -xcopy %SOURCE_DIR%\otpod-0.6.10\* %BUILD_DIR%\otpod /E /I /Q +xcopy %SOURCE_DIR%\otpod-0.6.9\* %BUILD_DIR%\otpod /E /I /Q if NOT %ERRORLEVEL% == 0 ( echo ERROR on xcopy exit 3 diff --git a/products/openturns.pyconf b/products/openturns.pyconf index 5bd80e9..20b8944 100644 --- a/products/openturns.pyconf +++ b/products/openturns.pyconf @@ -10,7 +10,7 @@ default : } depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib'] build_depend : ["cmake", "swig"] - opt_depend : ['openmpi','psutil','numpy','scipy','statsmodels'] + opt_depend : ['openmpi'] patches : [] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name @@ -39,7 +39,7 @@ default_win : version_1_21 : { compil_script : "openturns-1.21.sh" - patches : ['openturns-1.21.0001.patch', 'openturns-1.21.0005.patch'] + patches : ['openturns-1.21.0001.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI', 'boost'] opt_depend : ['pandas', 'statsmodels', 'patsy'] } @@ -52,7 +52,7 @@ version_1_21_win : build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name depend : ['Python', 'openblas', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'fftw'] opt_depend : ['pandas', 'statsmodels', 'patsy'] - patches : ['openturns-1.21.0003.patch', 'openturns-1.21.0004.patch'] + patches : [] properties : { single_install_dir : "no" @@ -60,26 +60,10 @@ version_1_21_win : } } -version_1_21_DB12 : -{ - compil_script : "openturns-1.21.sh" - patches : ['openturns-1.21.0001.patch','openturns-1.21.0005.patch', 'openturns-1.21.0006.patch'] - depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI', 'boost'] - opt_depend : ['pandas', 'statsmodels', 'patsy'] -} - -version_1_21_RO8 : -{ - compil_script : "openturns-1.21.sh" - patches : ['openturns-1.21.0001.patch','openturns-1.21.0005.patch', 'openturns-1.21.0006.patch'] - depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI', 'boost'] - opt_depend : ['pandas', 'statsmodels', 'patsy'] -} - version_1_21_CO8 : { compil_script : "openturns-1.21.sh" - patches : ['openturns-1.21.0002.patch', 'openturns-1.21.0005.patch'] + patches : ['openturns-1.21.0002.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI', 'boost'] opt_depend : ['pandas', 'statsmodels', 'patsy'] }