From 379a1fecfd56b9d8cb23e6efbcdefec951d79c16 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 7 Apr 2023 10:00:50 +0200 Subject: [PATCH] spns #34285: openturns tag is 1.20.1 --- applications/SALOME-master-native.pyconf | 16 ++++---- applications/SALOME-master-windows.pyconf | 2 +- applications/SALOME-master.pyconf | 8 ++-- ...{openturns-1.20.sh => openturns-1.20.1.sh} | 6 +-- products/openturns.pyconf | 40 +++++++++---------- 5 files changed, 36 insertions(+), 36 deletions(-) rename products/compil_scripts/{openturns-1.20.sh => openturns-1.20.1.sh} (98%) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 8e2d024..d616ca4 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -91,7 +91,7 @@ APPLICATION : opencv : 'native' openmpi: 'native' openVKL : '0.11.0' - openturns: '1.20' + openturns: '1.20.1' ospray : '2.4.0' packaging : 'native' packagespy : '74152cd' @@ -212,7 +212,7 @@ __overwrite__ : 'APPLICATION.products.cminpack' : 'native' 'APPLICATION.products.netcdf' : '4.6.2' 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } - 'APPLICATION.products.openturns' : {tag: '1.20', base: 'no', section: 'version_1_20_UB20_04' } + 'APPLICATION.products.openturns' : {tag: '1.20.1',base: 'no', section: 'version_1_20_1_UB20_04' } 'APPLICATION.products.scipy' : {tag: '1.5.2', base: 'no', section: 'version_1_5_2_no_pip' } # scipy >= 1.4 - system one too old } { @@ -228,7 +228,7 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_UB22_04' } 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_UB22_04' } - 'APPLICATION.products.openturns' : {tag: '1.20', base: 'no', section: 'version_1_20_UB22_04' } + 'APPLICATION.products.openturns' : {tag: '1.20.1', base: 'no', section: 'version_1_20_1_UB22_04' } } { # DB10: @@ -243,7 +243,7 @@ __overwrite__ : 'APPLICATION.products.PyQt' : '5.15.3' 'APPLICATION.products.sip' : '5.5.0' 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_DB10', hpc: 'yes'} - '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.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' } @@ -252,7 +252,7 @@ __overwrite__ : 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack' : 'native' 'APPLICATION.products.PyFMI' : {tag:'2.6', base: 'no', section: 'version_2_6_no_pip'} - 'APPLICATION.products.openturns' : {tag: '1.20', base: 'no', section: 'version_1_20_DB11' } + 'APPLICATION.products.openturns' : {tag: '1.20.1', base: 'no', section: 'version_1_20_1_DB11' } } { # CentOS 8 repositories don't include sphinxintl package which must be installed through pip. @@ -264,7 +264,7 @@ __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.20', base: 'no', section: 'version_1_20_CO8' } + 'APPLICATION.products.openturns' : {tag: '1.20.1', base: 'no', section: 'version_1_20_1_CO8' } } { __condition__ : "VARS.dist in ['FD32']" @@ -273,7 +273,7 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } 'APPLICATION.products.Sphinx' : {tag: '1.7.6', base: 'no', section: 'version_1_7_6_no_pip' } 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_FD32' } # spns #29324 - 'APPLICATION.products.openturns' : {tag: '1.20', base: 'no', section: 'version_1_20_FD32' } + 'APPLICATION.products.openturns' : {tag: '1.20.1',base: 'no', section: 'version_1_20_1_FD32' } } { __condition__ : "VARS.dist in ['FD34']" @@ -284,7 +284,7 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } 'APPLICATION.products.root' : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34' } 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_FD34' } # spns #29324 - 'APPLICATION.products.openturns' : {tag: '1.20', base: 'no', section: 'version_1_20_FD34' } + 'APPLICATION.products.openturns' : {tag: '1.20.1', base: 'no', section: 'version_1_20_1_FD34' } } { __condition__ : "VARS.dist in ['FD36']" diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index cc1509e..c37b294 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -88,7 +88,7 @@ APPLICATION : omniORBpy : '4.2.3' opencv : '3.2.0' openVKL: '0.11.0' - openturns: '1.20' + openturns: '1.20.1' ospray : '2.4.0' packaging : '19.0' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0'} diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index c588208..e35754a 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -92,7 +92,7 @@ APPLICATION : omniORBpy : '4.2.5' opencv : '3.2.0' openmpi : '4.0.3' - openturns: '1.20' + openturns: '1.20.1' openVKL: '0.11.0' ospray : '2.4.0' packaging : '17.1' @@ -222,18 +222,18 @@ __overwrite__ : { __condition__ : "VARS.dist in ['CO7']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] - 'APPLICATION.products.openturns' : {tag: '1.20', base: 'no', section: 'version_1_20_CO7' } + 'APPLICATION.products.openturns' : {tag: '1.20.1', base: 'no', section: 'version_1_20_1_CO7' } } { __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.20', base: 'no', section: 'version_1_20_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', base: 'no', section: 'version_1_20_DB09' } + 'APPLICATION.products.openturns' : {tag: '1.20.1', base: 'no', section: 'version_1_20_1_DB09' } } { __condition__ : "VARS.dist in ['DB10']" diff --git a/products/compil_scripts/openturns-1.20.sh b/products/compil_scripts/openturns-1.20.1.sh similarity index 98% rename from products/compil_scripts/openturns-1.20.sh rename to products/compil_scripts/openturns-1.20.1.sh index 88e1198..4e96090 100755 --- a/products/compil_scripts/openturns-1.20.sh +++ b/products/compil_scripts/openturns-1.20.1.sh @@ -125,7 +125,7 @@ mkdir -p $TEXMFVAR mkdir -p $TEXMFCONFIG cd $BUILD_DIR/openturns -cmake $CMAKE_OPTIONS $SOURCE_DIR/openturns-1.20 +cmake $CMAKE_OPTIONS $SOURCE_DIR/openturns-1.20.1 if [ $? -ne 0 ] then echo "ERROR on cmake" @@ -177,8 +177,8 @@ fi export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:${PYTHONPATH} export LD_LIBRARY_PATH=${PRODUCT_INSTALL}/lib:${LD_LIBRARY_PATH} -chmod +x ${SOURCE_DIR}/openturns-1.20/python/test/t_features.py -${SOURCE_DIR}/openturns-1.20/python/test/t_features.py +chmod +x ${SOURCE_DIR}/openturns-1.20.1/python/test/t_features.py +${SOURCE_DIR}/openturns-1.20.1/python/test/t_features.py if [ $? -ne 0 ] then echo "ERROR testing Openturns features...." diff --git a/products/openturns.pyconf b/products/openturns.pyconf index e62a5d2..906e854 100644 --- a/products/openturns.pyconf +++ b/products/openturns.pyconf @@ -35,7 +35,7 @@ default_win : opt_depend : [] } -version_1_20 : +version_1_20_1 : { compil_script : "openturns-1.20" + $VARS.scriptExtension patches : [] @@ -43,7 +43,7 @@ version_1_20 : opt_depend : ['pandas', 'statsmodels'] } -version_1_20_UB22_04 : +version_1_20_1_UB22_04 : { compil_script : "openturns-1.20" + $VARS.scriptExtension patches : ['openturns-1.20.0002.patch'] @@ -51,73 +51,73 @@ version_1_20_UB22_04 : opt_depend : ['pandas', 'statsmodels'] } -version_1_20_UB20_04 : +version_1_20_1_UB20_04 : { - compil_script : "openturns-1.20" + $VARS.scriptExtension + compil_script : "openturns-1.20.1" + $VARS.scriptExtension patches : ['openturns-1.20.0002.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } -version_1_20_DB11 : +version_1_20_1_DB11 : { - compil_script : "openturns-1.20" + $VARS.scriptExtension + compil_script : "openturns-1.20.1" + $VARS.scriptExtension patches : ['openturns-1.20.0002.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } -version_1_20_DB09 : +version_1_20_1_DB09 : { - compil_script : "openturns-1.20" + $VARS.scriptExtension + compil_script : "openturns-1.20.1" + $VARS.scriptExtension patches : ['openturns-1.20.0001.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } -version_1_20_CO8 : +version_1_20_1_CO8 : { - compil_script : "openturns-1.20" + $VARS.scriptExtension + compil_script : "openturns-1.20.1" + $VARS.scriptExtension patches : ['openturns-1.20.0001.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } -version_1_20_CO7 : +version_1_20_1_CO7 : { - compil_script : "openturns-1.20" + $VARS.scriptExtension + compil_script : "openturns-1.20.1" + $VARS.scriptExtension patches : ['openturns-1.20.0001.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } -version_1_20_FD37 : +version_1_20_1_FD37 : { - compil_script : "openturns-1.20" + $VARS.scriptExtension + compil_script : "openturns-1.20.1" + $VARS.scriptExtension patches : [] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } -version_1_20_FD36 : +version_1_20_1_FD36 : { - compil_script : "openturns-1.20" + $VARS.scriptExtension + compil_script : "openturns-1.20.1" + $VARS.scriptExtension patches : [] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } -version_1_20_FD34 : +version_1_20_1_FD34 : { - compil_script : "openturns-1.20" + $VARS.scriptExtension + compil_script : "openturns-1.20.1" + $VARS.scriptExtension patches : ['openturns-1.20.0002.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } -version_1_20_FD32 : +version_1_20_1_FD32 : { - compil_script : "openturns-1.20" + $VARS.scriptExtension + compil_script : "openturns-1.20.1" + $VARS.scriptExtension patches : ['openturns-1.20.0002.patch', 'openturns-1.20.0003.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] -- 2.39.2