From 6bcda4c38e0e722beb5779ad15cf196ddf156f1c Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 12 Oct 2022 10:49:18 +0200 Subject: [PATCH] openturns - enforce use of dill/scikitlearn versions --- applications/SALOME-master-native.pyconf | 3 ++ products/openturns.pyconf | 32 ++++++++++++++++++++++ products/patches/openturns-1.19.0003.patch | 11 ++++++++ products/patches/openturns-1.19.0004.patch | 11 ++++++++ 4 files changed, 57 insertions(+) create mode 100644 products/patches/openturns-1.19.0003.patch create mode 100644 products/patches/openturns-1.19.0004.patch diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index ede8313..ee1f94a 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -227,6 +227,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' } } { # DB10: @@ -268,6 +269,7 @@ __overwrite__ : '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.StaticMeshPlugin' : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_FD32' } + 'APPLICATION.products.openturns' : {tag: '1.19', base: 'no', section: 'version_1_19_FD32' } } { __condition__ : "VARS.dist in ['FD34']" @@ -279,6 +281,7 @@ __overwrite__ : '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.StaticMeshPlugin' : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_FD34' } + 'APPLICATION.products.openturns' : {tag: '1.19', base: 'no', section: 'version_1_19_FD34' } } { __condition__ : "VARS.dist in ['FD36']" diff --git a/products/openturns.pyconf b/products/openturns.pyconf index 2e96605..ce6a7b3 100644 --- a/products/openturns.pyconf +++ b/products/openturns.pyconf @@ -55,6 +55,14 @@ version_1_19_win : patches : [] } +version_1_19_UB22_04 : +{ + compil_script : "openturns-1.19" + $VARS.scriptExtension + patches : ['openturns-1.19.0001.patch', 'openturns-1.19.0003.patch', 'openturns-1.19.0004.patch'] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] + opt_depend : ['pandas', 'statsmodels'] +} + version_1_19_UB20_04 : { compil_script : "openturns-1.19" + $VARS.scriptExtension @@ -63,6 +71,30 @@ version_1_19_UB20_04 : opt_depend : ['pandas', 'statsmodels'] } +version_1_19_FD36 : +{ + compil_script : "openturns-1.19" + $VARS.scriptExtension + patches : ['openturns-1.19.0001.patch', 'openturns-1.19.0003.patch'] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] + opt_depend : ['pandas', 'statsmodels'] +} + +version_1_19_FD34 : +{ + compil_script : "openturns-1.19" + $VARS.scriptExtension + patches : ['openturns-1.19.0001.patch', 'openturns-1.19.0003.patch'] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] + opt_depend : ['pandas', 'statsmodels'] +} + +version_1_19_FD32 : +{ + compil_script : "openturns-1.19" + $VARS.scriptExtension + patches : ['openturns-1.19.0001.patch', 'openturns-1.19.0003.patch'] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] + opt_depend : ['pandas', 'statsmodels'] +} + version_1_18 : { compil_script : "openturns-1.18" + $VARS.scriptExtension diff --git a/products/patches/openturns-1.19.0003.patch b/products/patches/openturns-1.19.0003.patch new file mode 100644 index 0000000..7498636 --- /dev/null +++ b/products/patches/openturns-1.19.0003.patch @@ -0,0 +1,11 @@ +--- openturns-1.19_ref/otpod-0.6.8/setup.py 2022-09-19 09:58:04.000000000 +0200 ++++ openturns-1.19_new/otpod-0.6.8/setup.py 2022-10-12 10:14:02.576646670 +0200 +@@ -13,7 +13,7 @@ + + install_requires=['statsmodels>=0.6.1', + 'numpy>=1.10.4', +- 'scikit-learn>=0.17', ++ 'scikit-learn==0.24.2', + 'matplotlib>=1.5.1', + 'scipy>=0.17.0', + 'decorator>=4.0.9'] diff --git a/products/patches/openturns-1.19.0004.patch b/products/patches/openturns-1.19.0004.patch new file mode 100644 index 0000000..03d6f68 --- /dev/null +++ b/products/patches/openturns-1.19.0004.patch @@ -0,0 +1,11 @@ +--- openturns-1.19_ref/otfmi-0.15/setup.py 2022-09-19 09:58:00.000000000 +0200 ++++ openturns-1.19_new/otfmi-0.15/setup.py 2022-10-12 10:43:27.094002087 +0200 +@@ -64,7 +64,7 @@ + # https://packaging.python.org/en/latest/requirements.html + install_requires=['numpy', + 'pyfmi>=2.6', +- 'dill'], ++ 'dill==0.3.4'], + + # List additional groups of dependencies here (e.g. development + # dependencies). You can install these using the following syntax, -- 2.39.2