From 64b083168b1431aecd7cb675a3ea49a624d97f17 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 22 Sep 2023 13:13:02 +0200 Subject: [PATCH] bos #34671: openturns and persalys integration --- applications/SALOME-master-native.pyconf | 10 +-- applications/SALOME-master.pyconf | 14 ++-- products/ParaView.pyconf | 3 +- products/compil_scripts/openturns-1.21.bat | 79 ++++++++-------------- products/openturns.pyconf | 2 +- 5 files changed, 38 insertions(+), 70 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index b2d25d6..e3530a9 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -92,14 +92,14 @@ APPLICATION : opencv : 'native' openmpi: 'native' openVKL : '0.11.0' - openturns: '1.20.1' + openturns: '1.21' ospray : '2.4.0' packaging : 'native' packagespy : '74152cd' pandas : 'native' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_MPI', hpc: 'yes'} - PERSALYS: 'v14.0.1' - petsc : {tag : '3.19.4', base: 'no', section: 'version_3_19_4'} + PERSALYS: 'v14.1' + petsc : {tag : '3.16.0', section: 'version_3_16_0'} Pillow : 'native' planegcs : '0.18-3cb6890' psutil : 'native' @@ -212,7 +212,6 @@ __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.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 } { @@ -229,7 +228,6 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_UB22_04' } '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.1', base: 'no', section: 'version_1_20_1_UB22_04' } } { # DB10: @@ -272,7 +270,6 @@ __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.1',base: 'no', section: 'version_1_20_1_FD32' } } { __condition__ : "VARS.dist in ['FD34']" @@ -283,7 +280,6 @@ __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.1', base: 'no', section: 'version_1_20_1_FD34' } } { __condition__ : "VARS.dist in ['FD36']" diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 7ae17a9..eea02b4 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -94,7 +94,7 @@ APPLICATION : omniORBpy : '4.2.5' opencv : '3.2.0' openmpi : '4.0.3' - openturns: '1.20.1' + openturns: '1.21' openVKL: '0.11.0' ospray : '2.4.0' packaging : '17.1' @@ -102,8 +102,8 @@ APPLICATION : 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.0.1' - petsc : {tag : '3.19.4', base: 'no', section: 'version_3_19_4', hpc: 'yes'} + PERSALYS: 'v14.1' + petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'} Pillow : '8.4.0' planegcs : '0.18-3cb6890' psutil : '5.7.2' @@ -223,18 +223,14 @@ __overwrite__ : { __condition__ : "VARS.dist in ['CO7']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] - 'APPLICATION.products.openturns' : {tag: '1.20.1', base: 'no', section: 'version_1_20_1_CO7' } + '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.20.1', base: 'no', section: 'version_1_20_1_CO8' } - } - { - __condition__ : "VARS.dist in ['DB09']" - 'APPLICATION.products.openturns' : {tag: '1.20.1', base: 'no', section: 'version_1_20_1_DB09' } + 'APPLICATION.products.openturns' : {tag: '1.21', base: 'no', section: 'version_1_21_CO8' } } { __condition__ : "VARS.dist in ['DB10']" diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index 3f8ac9d..4d601df 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -323,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' ] } diff --git a/products/compil_scripts/openturns-1.21.bat b/products/compil_scripts/openturns-1.21.bat index 0df4539..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 ########################################################################## diff --git a/products/openturns.pyconf b/products/openturns.pyconf index 3077e63..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 -- 2.39.2