From 3aeeadc38892aeaf1ac336e280edb41ed7982768 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 6 Apr 2023 16:30:14 +0200 Subject: [PATCH] spns #34285 create one Openturns per distribution --- applications/SALOME-master-native.pyconf | 12 ++-- applications/SALOME-master.pyconf | 8 ++- products/openturns.pyconf | 74 +++++++++++++++++++++++- 3 files changed, 87 insertions(+), 7 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index e7b624b..8e2d024 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -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.19', base: 'no', section: 'version_1_19_UB20_04' } + 'APPLICATION.products.openturns' : {tag: '1.20', base: 'no', section: 'version_1_20_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.19', base: 'no', section: 'version_1_19_UB22_04' } + 'APPLICATION.products.openturns' : {tag: '1.20', base: 'no', section: 'version_1_20_UB22_04' } } { # DB10: @@ -251,7 +251,8 @@ __overwrite__ : __condition__ : "VARS.dist in ['DB11']" '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.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' } } { # CentOS 8 repositories don't include sphinxintl package which must be installed through pip. @@ -263,6 +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' } } { __condition__ : "VARS.dist in ['FD32']" @@ -271,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.19', base: 'no', section: 'version_1_19_FD32' } + 'APPLICATION.products.openturns' : {tag: '1.20', base: 'no', section: 'version_1_20_FD32' } } { __condition__ : "VARS.dist in ['FD34']" @@ -282,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.19', base: 'no', section: 'version_1_19_FD34' } + 'APPLICATION.products.openturns' : {tag: '1.20', base: 'no', section: 'version_1_20_FD34' } } { __condition__ : "VARS.dist in ['FD36']" diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 3934faf..c588208 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -221,13 +221,19 @@ __overwrite__ : } { __condition__ : "VARS.dist in ['CO7']" - 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] + 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] + 'APPLICATION.products.openturns' : {tag: '1.20', base: 'no', section: 'version_1_20_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' } + } + { + __condition__ : "VARS.dist in ['DB09']" + 'APPLICATION.products.openturns' : {tag: '1.20', base: 'no', section: 'version_1_20_DB09' } } { __condition__ : "VARS.dist in ['DB10']" diff --git a/products/openturns.pyconf b/products/openturns.pyconf index d15036c..12839a7 100644 --- a/products/openturns.pyconf +++ b/products/openturns.pyconf @@ -43,6 +43,14 @@ version_1_20 : opt_depend : ['pandas', 'statsmodels'] } +version_1_20_UB22_04 : +{ + compil_script : "openturns-1.20" + $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_UB20_04 : { compil_script : "openturns-1.20" + $VARS.scriptExtension @@ -51,7 +59,71 @@ version_1_20_UB20_04 : opt_depend : ['pandas', 'statsmodels'] } -version_1_19 : +version_1_20_DB11 : +{ + compil_script : "openturns-1.20" + $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 : +{ + compil_script : "openturns-1.20" + $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 : +{ + compil_script : "openturns-1.20" + $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 : +{ + compil_script : "openturns-1.20" + $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 : +{ + compil_script : "openturns-1.20" + $VARS.scriptExtension + patches : [] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] + opt_depend : ['pandas', 'statsmodels'] +} + +version_1_20_FD36 : +{ + compil_script : "openturns-1.20" + $VARS.scriptExtension + patches : [] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] + opt_depend : ['pandas', 'statsmodels'] +} + +version_1_20_FD34 : +{ + compil_script : "openturns-1.20" + $VARS.scriptExtension + patches : [] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] + opt_depend : ['pandas', 'statsmodels'] +} + +version_1_20_FD32 : +{ + compil_script : "openturns-1.20" + $VARS.scriptExtension + patches : [] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] + opt_depend : ['pandas', 'statsmodels'] +} + + version_1_19 : { compil_script : "openturns-1.19" + $VARS.scriptExtension patches : ['openturns-1.19.0001.patch'] -- 2.39.2