From 7d1d2382f0468490b1a438d7880ce0ff4587139b 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-windows.pyconf | 4 +- applications/SALOME-master.pyconf | 16 ++-- products/PERSALYS.pyconf | 2 +- products/ParaView.pyconf | 33 +++++--- products/compil_scripts/openturns-1.21.bat | 8 +- products/compil_scripts/openturns-1.21.sh | 16 +++- products/openturns.pyconf | 28 ++++++- products/patches/PERSALYS-v14.1-001.patch | 11 +++ products/patches/openturns-1.21.0001.patch | 15 ++++ products/patches/openturns-1.21.0002.patch | 77 +++++++++++++++++++ .../paraview-5.11.0.p009-openturns-1.21.patch | 14 ++++ 12 files changed, 195 insertions(+), 39 deletions(-) create mode 100644 products/patches/PERSALYS-v14.1-001.patch create mode 100644 products/patches/openturns-1.21.0001.patch create mode 100644 products/patches/openturns-1.21.0002.patch create mode 100644 products/patches/paraview-5.11.0.p009-openturns-1.21.patch diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 7a5b4c4..bae1cf2 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -92,13 +92,13 @@ 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' + PERSALYS: 'v14.1' petsc : {tag : '3.16.0', section: 'version_3_16_0'} Pillow : 'native' planegcs : '0.18-3cb6890' @@ -213,7 +213,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 } { @@ -230,7 +229,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: @@ -254,7 +252,6 @@ __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.1', base: 'no', section: 'version_1_20_1_DB11' } } { # CentOS 8 repositories don't include sphinxintl package which must be installed through pip. @@ -266,7 +263,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.20.1', base: 'no', section: 'version_1_20_1_CO8' } } { __condition__ : "VARS.dist in ['FD32']" @@ -275,7 +271,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']" @@ -286,7 +281,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-windows.pyconf b/applications/SALOME-master-windows.pyconf index 094ec08..aa6557a 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -93,13 +93,13 @@ APPLICATION : openblas : '0.3.23' opencv : '3.2.0' openVKL: '0.11.0' - openturns: '1.20.1' + openturns: '1.21' ospray : '2.4.0' packaging : '19.0' pandas : '0.25.2' patsy : '0.5.2' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0'} - PERSALYS: 'v14.0.1' + PERSALYS: 'v14.1' perl : '5.28.1.1' Pillow : '7.1.1' planegcs : '0.18-3cb6890' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 97aac71..dca0aaf 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.20.1' + openturns: '1.21' openVKL: '0.11.0' ospray : '2.4.0' packaging : '17.1' @@ -101,7 +101,7 @@ 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' + 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' @@ -223,24 +223,24 @@ __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']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] 'APPLICATION.products.gdal': {tag:'2.4.0', base: 'no', section: 'version_2_4_0_DB10'} # spns #29324 } + { + __condition__ : "VARS.dist in ['DB09']" + 'APPLICATION.products.openturns' : {tag: '1.21', base: 'no', section: 'version_1_21_DB09' } + } { __condition__ : "VARS.dist in ['UB18.04']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] diff --git a/products/PERSALYS.pyconf b/products/PERSALYS.pyconf index d3c41c4..5e63f27 100644 --- a/products/PERSALYS.pyconf +++ b/products/PERSALYS.pyconf @@ -61,7 +61,7 @@ default_win : version_v14_1 : { - patches : [] + patches : ['PERSALYS-v14.1-001.patch'] } version_v14_1_win : diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index 4de4670..4d601df 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -258,7 +258,8 @@ version_5_11_0 : patches : [ 'paraview-5.11.0.p001-FindCGNS.patch', 'paraview-5.11.0.p003-ParaViewClient.patch', - 'paraview-5.11.0.p006-GIL.patch' + 'paraview-5.11.0.p006-GIL.patch', + 'paraview-5.11.0.p009-openturns-1.21.patch' ] depend : [ 'Python', @@ -321,7 +322,8 @@ version_5_11_0_win : patches : ['paraview-5.11.0.p001-FindCGNS.patch', '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.p006-GIL.patch', + 'paraview-5.11.0.p009-openturns-1.21.patch' ] } @@ -346,7 +348,8 @@ version_5_11_0_win_dbg : 'paraview-5.11.0.p002-FindMPI.patch', 'paraview-5.11.0.p004-vtkUniformHyperTreeGrid.patch', 'paraview-5.11.0.p005-vtkPython-debug.patch', - 'paraview-5.11.0.p006-GIL.patch' + 'paraview-5.11.0.p006-GIL.patch', + 'paraview-5.11.0.p009-openturns-1.21.patch' ] } @@ -356,7 +359,8 @@ version_5_11_0_MPI : archive_info : {archive_name : "ParaView-5.11.0.tar.gz"} patches : ['paraview-5.11.0.p001-FindCGNS.patch', 'paraview-5.11.0.p002-FindMPI.patch', - 'paraview-5.11.0.p006-GIL.patch' + 'paraview-5.11.0.p006-GIL.patch', + 'paraview-5.11.0.p009-openturns-1.21.patch' ] depend : [ 'Python', @@ -381,7 +385,8 @@ version_5_11_0_MPI_LATA_64BITS_IDS : patches : ['paraview-5.11.0.p001-FindCGNS.patch', 'paraview-5.11.0.p002-FindMPI.patch', 'paraview-0012-LATA_64BITS_IDS.patch', - 'paraview-5.11.0.p006-GIL.patch' + 'paraview-5.11.0.p006-GIL.patch', + 'paraview-5.11.0.p009-openturns-1.21.patch' ] depend : [ 'Python', @@ -406,8 +411,9 @@ version_5_11_0_MPI_DB10 : patches : ['paraview-5.11.0.p001-FindCGNS.patch', 'paraview-5.11.0.p002-FindMPI.patch', 'paraview-5.11.0.p003-ParaViewClient.patch', - 'paraview-5.11.0.p006-GIL.patch' - ] + 'paraview-5.11.0.p006-GIL.patch', + 'paraview-5.11.0.p009-openturns-1.21.patch' + ] depend : [ 'Python', 'hdf5', @@ -431,7 +437,8 @@ version_5_11_0_MPI_CO8 : patches : ['paraview-5.11.0.p001-FindCGNS.patch', 'paraview-5.11.0.p002-FindMPI.patch', 'paraview-5.11.0.p003-ParaViewClient.patch', - 'paraview-5.11.0.p006-GIL.patch' + 'paraview-5.11.0.p006-GIL.patch', + 'paraview-5.11.0.p009-openturns-1.21.patch' ] depend : [ 'Python', @@ -456,8 +463,9 @@ version_5_11_0_MPI_FD38 : patches : ['paraview-5.11.0.p001-FindCGNS.patch', 'paraview-5.11.0.p002-FindMPI.patch', 'paraview-5.11.0.p006-GIL.patch', - 'paraview-5.11.0.p007-mpi4py-FD37.patch', - 'paraview-5.11.0.p008-cstdint-FD38.patch' + 'paraview-5.11.0.p007-mpi4py-FD37.patch', + 'paraview-5.11.0.p008-cstdint-FD38.patch', + 'paraview-5.11.0.p009-openturns-1.21.patch' ] depend : [ 'Python', @@ -482,7 +490,8 @@ version_5_11_0_MPI_FD37 : patches : ['paraview-5.11.0.p001-FindCGNS.patch', 'paraview-5.11.0.p002-FindMPI.patch', 'paraview-5.11.0.p006-GIL.patch', - 'paraview-5.11.0.p007-mpi4py-FD37.patch' + 'paraview-5.11.0.p007-mpi4py-FD37.patch', + 'paraview-5.11.0.p009-openturns-1.21.patch' ] depend : [ 'Python', @@ -970,7 +979,7 @@ version_5_8_0_FD32 : 'paraview.0007-ParaView_find_freetype.patch', 'paraview.0009-ParaView_volume_mapper.patch', 'pv_coincident.patch' - ] + ] } version_5_8_0_CO7_OpenMP : diff --git a/products/compil_scripts/openturns-1.21.bat b/products/compil_scripts/openturns-1.21.bat index daa30e6..6887784 100644 --- a/products/compil_scripts/openturns-1.21.bat +++ b/products/compil_scripts/openturns-1.21.bat @@ -145,10 +145,10 @@ REM SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_DOC=OFF REM CALL:MODULE_BUILDER otagrum "%SOURCE_DIR%\otagrum-0.8" "%BUILD_DIR%\otagrum" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" echo ########################################################################## -echo otmorris 0.13 +echo otmorris 0.14 echo ########################################################################## SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -CALL:MODULE_BUILDER otmorris "%SOURCE_DIR%\otmorris-0.13" "%BUILD_DIR%\otmorris" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" +CALL:MODULE_BUILDER otmorris "%SOURCE_DIR%\otmorris-0.14" "%BUILD_DIR%\otmorris" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" echo ########################################################################## echo otfftw 0.13 @@ -175,10 +175,10 @@ SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_DOC=OFF CALL:MODULE_BUILDER otsubsetinverse "%SOURCE_DIR%\otsubsetinverse-1.10" "%BUILD_DIR%\otsubsetinverse" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" echo ########################################################################## -echo otsvm 0.11 +echo otsvm 0.12 echo ########################################################################## SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_DOC=OFF -CALL:MODULE_BUILDER otsvm "%SOURCE_DIR%\otsvm-0.11" "%BUILD_DIR%\otsvm" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" +CALL:MODULE_BUILDER otsvm "%SOURCE_DIR%\otsvm-0.12" "%BUILD_DIR%\otsvm" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" echo ########################################################################## echo otfmi 0.15 diff --git a/products/compil_scripts/openturns-1.21.sh b/products/compil_scripts/openturns-1.21.sh index 3418288..3a05fa2 100755 --- a/products/compil_scripts/openturns-1.21.sh +++ b/products/compil_scripts/openturns-1.21.sh @@ -106,6 +106,11 @@ if [ -n "$NLOPT_ROOT_DIR" ] && [ "$SAT_nlopt_IS_NATIVE" != "1" ]; then CMAKE_OPTIONS+=" -DNLOPT_DIR:STRING=${NLOPT_ROOT_DIR}" fi +# Boost +if [ -n "$BOOST_ROOT_DIR" ] && [ "$SAT_boost_IS_NATIVE" != "1" ]; then + CMAKE_OPTIONS+=" -DBOOST_DIR=${BOOST_ROOT_DIR}" +fi + echo echo "*** cmake" $CMAKE_OPTIONS @@ -189,10 +194,10 @@ if [[ -d "$SOURCE_DIR/otfftw-0.13" ]]; then OTC["otagrum"]="0.8" OTC["otfftw"]="0.13" OTC["otmixmod"]="0.14" - OTC["otmorris"]="0.13" + OTC["otmorris"]="0.14" OTC["otrobopt"]="0.12" OTC["otsubsetinverse"]="1.10" - OTC["otsvm"]="0.11" + OTC["otsvm"]="0.12" for k in ${!OTC[@]}; do @@ -435,6 +440,13 @@ if [[ -d "$SOURCE_DIR/otfftw-0.13" ]]; then fi cd ${PRODUCT_INSTALL}/lib +# On some nodes, the link to OT is not done properly. +if [[ ! -f libOT.so.0 ]]; then + echo "INFO: Fixing libOT.so" + ln -sf libOT.so.0.22.0 libOT.so.0.22 + ln -sf libOT.so.0.22 libOT.so.0 + ln -sf libOT.so.0 libOT.so +fi echo echo "########## END" diff --git a/products/openturns.pyconf b/products/openturns.pyconf index b263b8e..20b8944 100644 --- a/products/openturns.pyconf +++ b/products/openturns.pyconf @@ -39,8 +39,8 @@ default_win : version_1_21 : { compil_script : "openturns-1.21.sh" - patches : [] - depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] + patches : ['openturns-1.21.0001.patch'] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI', 'boost'] opt_depend : ['pandas', 'statsmodels', 'patsy'] } @@ -60,6 +60,30 @@ version_1_21_win : } } +version_1_21_CO8 : +{ + compil_script : "openturns-1.21.sh" + patches : ['openturns-1.21.0002.patch'] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI', 'boost'] + opt_depend : ['pandas', 'statsmodels', 'patsy'] +} + +version_1_21_DB09 : +{ + compil_script : "openturns-1.21.sh" + patches : ['openturns-1.21.0002.patch'] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI', 'boost'] + opt_depend : ['pandas', 'statsmodels', 'patsy'] +} + +version_1_21_CO7 : +{ + compil_script : "openturns-1.21.sh" + patches : ['openturns-1.21.0002.patch'] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI', 'boost'] + opt_depend : ['pandas', 'statsmodels', 'patsy'] +} + version_1_20_1 : { compil_script : "openturns-1.20.1" + $VARS.scriptExtension diff --git a/products/patches/PERSALYS-v14.1-001.patch b/products/patches/PERSALYS-v14.1-001.patch new file mode 100644 index 0000000..b909bec --- /dev/null +++ b/products/patches/PERSALYS-v14.1-001.patch @@ -0,0 +1,11 @@ +--- persalys-14.1_ref/lib/src/view/FMIPhysicalModelWindow.cxx 2023-07-25 11:23:39.000000000 +0200 ++++ persalys-14.1_dev/lib/src/view/FMIPhysicalModelWindow.cxx 2023-09-22 12:57:00.961672547 +0200 +@@ -43,7 +43,7 @@ + #include + #include + #include +- ++#include + using namespace OT; + + namespace PERSALYS diff --git a/products/patches/openturns-1.21.0001.patch b/products/patches/openturns-1.21.0001.patch new file mode 100644 index 0000000..e812d7e --- /dev/null +++ b/products/patches/openturns-1.21.0001.patch @@ -0,0 +1,15 @@ +--- openturns_ref/openturns-1.21/CMakeLists.txt 2023-09-21 11:22:25.194024611 +0200 ++++ openturns_dev/openturns-1.21/CMakeLists.txt 2023-09-21 11:23:25.994024043 +0200 +@@ -288,7 +288,11 @@ + endif () + + if (USE_NLOPT) +- find_package (NLopt CONFIG QUIET) ++ SET(NLOPT_ROOT_DIR $ENV{NLOPT_ROOT_DIR} CACHE PATH "Path to the NLOPT.") ++ IF(NLOPT_ROOT_DIR) ++ LIST(APPEND CMAKE_PREFIX_PATH "${NLOPT_ROOT_DIR}") ++ ENDIF(NLOPT_ROOT_DIR) ++ find_package (NLopt) + if (NLopt_FOUND) + message(STATUS "Found NLopt: ${NLopt_DIR} (found version \"${NLopt_VERSION}\")") + else () diff --git a/products/patches/openturns-1.21.0002.patch b/products/patches/openturns-1.21.0002.patch new file mode 100644 index 0000000..c265307 --- /dev/null +++ b/products/patches/openturns-1.21.0002.patch @@ -0,0 +1,77 @@ +--- openturns_ref/openturns-1.21/CMakeLists.txt 2023-09-22 12:27:24.290521494 +0200 ++++ openturns_dev/openturns-1.21/CMakeLists.txt 2023-09-22 12:26:48.691883507 +0200 +@@ -125,9 +125,17 @@ + + set (CMAKE_CXX_STANDARD 11) + ++SET(LAPACK_ROOT_DIR $ENV{LAPACK_ROOT_DIR}) ++IF(LAPACK_ROOT_DIR) ++ LIST(APPEND CMAKE_PREFIX_PATH "${LAPACK_ROOT_DIR}") ++ENDIF(LAPACK_ROOT_DIR) + if (NOT DEFINED LAPACK_LIBRARIES) + find_package (LAPACK REQUIRED) + endif () ++IF (DEFINED CBLAS_LIBRARIES) ++ MESSAGE(STATUS "CBLAS_LIBRARIES is defined... adding to the list of libraries ${CBLAS_LIBRARIES}") ++ LIST (APPEND OPENTURNS_PRIVATE_LIBRARIES ${CBLAS_LIBRARIES}) ++ENDIF() + list (APPEND OPENTURNS_PRIVATE_LIBRARIES ${LAPACK_LIBRARIES}) + + if (USE_SPECTRA) +@@ -181,6 +189,10 @@ + endif () + + if (USE_TBB) ++ SET(TBB_ROOT_DIR $ENV{TBB_ROOT_DIR}) ++ if(TBB_ROOT_DIR) ++ LIST(APPEND CMAKE_PREFIX_PATH "${TBB_ROOT_DIR}") ++ endif(TBB_ROOT_DIR) + find_package (TBB CONFIG) + if (TBB_FOUND) + message (STATUS "Found TBB: ${TBB_DIR} (found version ${TBB_VERSION})") +@@ -235,6 +247,10 @@ + endif () + + if (USE_LIBXML2) ++ SET(LIBXML2_ROOT_DIR $ENV{LIBXLM2_ROOT_DIR}) ++ if(LIBXML2_ROOT_DIR) ++ LIST(APPEND CMAKE_PREFIX_PATH "${LIBXML2_ROOT_DIR}") ++ endif(LIBXML2_ROOT_DIR) + find_package (LibXml2) + endif () + if (LIBXML2_FOUND) +@@ -245,7 +261,19 @@ + list (APPEND OPENTURNS_ENABLED_FEATURES "libxml2") + endif () + ++SET(MPI_ROOT_DIR $ENV{MPI_ROOT_DIR} CACHE PATH "Path to the MPI.") ++IF(MPI_ROOT_DIR) ++ LIST(APPEND CMAKE_PREFIX_PATH "${MPI_ROOT_DIR}") ++ find_package(MPI) ++ list (APPEND OPENTURNS_PRIVATE_INCLUDE_DIRS ${MPI_INCLUDE_DIRS}) ++ list (APPEND OPENTURNS_PRIVATE_LIBRARIES ${MPI_LIBRARIES}) ++ENDIF(MPI_ROOT_DIR) ++ + if (USE_HDF5) ++ SET(HDF5_ROOT_DIR $ENV{HDF5_ROOT_DIR} CACHE PATH "Path to the HDF5.") ++ IF(HDF5_ROOT_DIR) ++ LIST(APPEND CMAKE_PREFIX_PATH "${HDF5_ROOT_DIR}") ++ ENDIF(HDF5_ROOT_DIR) + find_package(HDF5 COMPONENTS C CXX) + endif () + if (HDF5_FOUND) +@@ -288,7 +316,13 @@ + endif () + + if (USE_NLOPT) +- find_package (NLopt CONFIG QUIET) ++ SET(NLOPT_ROOT_DIR $ENV{NLOPT_ROOT_DIR} CACHE PATH "Path to the NLOPT.") ++ IF (NOT NLOPT_ROOT_DIR) ++ MESSAGE(FATAL "NLOPT_ROOT_DIR environment variable not found!") ++ ENDIF() ++ MESSAGE(STATUS "NLOPT_ROOT_DIR = ${NLOPT_ROOT_DIR}") ++ FIND_PACKAGE(NLopt ++ HINTS "${NLOPT_ROOT_DIR}/lib/cmake/nlopt") + if (NLopt_FOUND) + message(STATUS "Found NLopt: ${NLopt_DIR} (found version \"${NLopt_VERSION}\")") + else () diff --git a/products/patches/paraview-5.11.0.p009-openturns-1.21.patch b/products/patches/paraview-5.11.0.p009-openturns-1.21.patch new file mode 100644 index 0000000..3b5d724 --- /dev/null +++ b/products/patches/paraview-5.11.0.p009-openturns-1.21.patch @@ -0,0 +1,14 @@ +--- ParaView_ref/VTK/Filters/OpenTURNS/CMakeLists.txt 2023-09-21 14:03:18.271129420 +0200 ++++ ParaView_dev/VTK/Filters/OpenTURNS/CMakeLists.txt 2023-09-21 14:03:39.191129397 +0200 +@@ -1,7 +1,8 @@ +-find_package(OpenTURNS 1.8 REQUIRED) ++find_package(OpenTURNS 1.21 REQUIRED) + # XXX(fixme) +-include(${OPENTURNS_USE_FILE}) +- ++if (EXISTS "${OPENTURNS_USE_FILE}") ++ include(${OPENTURNS_USE_FILE}) ++endif() + set(classes + vtkOTDensityMap + vtkOTFilter -- 2.39.2