From e63ef2e479c91674d489253290c968657ee41d68 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 2 Apr 2024 10:36:21 +0200 Subject: [PATCH] bos #41564 [CEA] openturns 1.22 --- applications/SALOME-master-MPI.pyconf | 2 +- applications/SALOME-master-int32.pyconf | 8 +------- applications/SALOME-master-native.pyconf | 4 +--- applications/SALOME-master-windows.pyconf | 2 +- applications/SALOME-master.pyconf | 5 +---- products/openturns.pyconf | 24 +++++++++++++++++++++++ 6 files changed, 29 insertions(+), 16 deletions(-) diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index 5778fac..7e0625b 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -93,7 +93,7 @@ APPLICATION : 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.21', section: 'version_1_21_CO7', hpc : 'yes'} + openturns: {tag : '1.22', section: 'version_1_22', hpc : 'yes'} openVKL: '0.11.0' ospray : '2.4.0' packaging : '17.1' diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf index c1c89ea..79a250f 100644 --- a/applications/SALOME-master-int32.pyconf +++ b/applications/SALOME-master-int32.pyconf @@ -92,7 +92,7 @@ APPLICATION : omniORBpy : '4.2.5' opencv : '3.2.0' openmpi : '4.0.3' - openturns: '1.21' + openturns: '1.22' openVKL: '0.11.0' ospray : '2.4.0' packaging : '17.1' @@ -223,18 +223,12 @@ __overwrite__ : { __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']" '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.21', base: 'no', section: 'version_1_21_CO8' } - } - { - __condition__ : "VARS.dist in ['DB09']" - 'APPLICATION.products.openturns' : {tag: '1.21', base: 'no', section: 'version_1_21_DB09' } } { __condition__ : "VARS.dist in ['DB10']" diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 1d0f5c3..ae327cb 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -92,7 +92,7 @@ APPLICATION : opencv : 'native' openmpi: 'native' openVKL : '0.11.0' - openturns: '1.21' + openturns: '1.22' ospray : '2.4.0' packaging : 'native' packagespy : '74152cd' @@ -269,7 +269,6 @@ __overwrite__ : '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' } } { @@ -282,7 +281,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']" diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index a9e048d..aa7bd3e 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -93,7 +93,7 @@ APPLICATION : openblas : '0.3.23' opencv : '3.2.0' openVKL: '0.11.0' - openturns: '1.21' + openturns: '1.22' ospray : '2.4.0' packaging : '19.0' pandas : '0.25.2' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 1d3bc85..c1f777d 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -93,7 +93,7 @@ APPLICATION : omniORBpy : '4.2.5' opencv : '3.2.0' openmpi : '4.0.3' - openturns: '1.21' + openturns: '1.22' openVKL: '0.11.0' ospray : '2.4.0' packaging : '17.1' @@ -224,14 +224,12 @@ __overwrite__ : { __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']" '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.21', base: 'no', section: 'version_1_21_CO8' } } { __condition__ : "VARS.dist in ['DB10']" @@ -240,7 +238,6 @@ __overwrite__ : } { __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'} } { diff --git a/products/openturns.pyconf b/products/openturns.pyconf index 6f0820c..9d9fd6d 100644 --- a/products/openturns.pyconf +++ b/products/openturns.pyconf @@ -36,6 +36,30 @@ default_win : opt_depend : [] } +version_1_22 : +{ + compil_script : "openturns-1.22.sh" + patches : [] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI', 'boost'] + opt_depend : ['pandas', 'statsmodels', 'patsy'] +} + +version_1_22_win : +{ + name : "OT" + compil_script : "openturns-1.22.bat" + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + 'openturns' + 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 : [] + properties : + { + single_install_dir : "no" + incremental : "yes" + } +} + version_1_21 : { compil_script : "openturns-1.21.sh" -- 2.39.2