From b9f37b7161b1652a361bde545584b56c888d05ad Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 11 Mar 2024 15:06:11 +0100 Subject: [PATCH] Add ParaView 5.12 compilation scripts --- products/ParaView.pyconf | 99 ++++++++++--------- ...araView-5.11.1.bat => ParaView-5.12.0.bat} | 6 ++ ...{ParaView-5.11.1.sh => ParaView-5.12.0.sh} | 45 ++++++--- 3 files changed, 91 insertions(+), 59 deletions(-) rename products/compil_scripts/{ParaView-5.11.1.bat => ParaView-5.12.0.bat} (98%) rename products/compil_scripts/{ParaView-5.11.1.sh => ParaView-5.12.0.sh} (91%) diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index ade4070..e82f594 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -30,12 +30,11 @@ default : } } -version_5_11_1 : +version_5_12_0 : { - compil_script : 'ParaView-5.11.1.sh' - archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} + compil_script : 'ParaView-5.12.0.sh' + archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} patches : [ - 'paraview-5.11.1.p001-FindCGNS.patch' ] depend : [ 'Python', @@ -53,12 +52,12 @@ version_5_11_1 : opt_depend : ['ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_11_1_int32 : +version_5_12_0_int32 : { - compil_script : 'ParaView-5.11.1.sh' - archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} + compil_script : 'ParaView-5.12.0.sh' + archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} + # two other LATA patches already included in archive patches : [ - 'paraview-5.11.1.p001-FindCGNS.patch' ] depend : [ 'Python', @@ -76,10 +75,10 @@ version_5_11_1_int32 : opt_depend : ['ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_11_1_win : +version_5_12_0_win : { - compil_script : 'ParaView-5.11.1.bat' - archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} + compil_script : 'ParaView-5.12.0.bat' + archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} depend : [ 'Python', 'hdf5', @@ -93,15 +92,13 @@ version_5_11_1_win : 'zlib' ] opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'rkCommon', 'matplotlib'] - patches : [ - 'paraview-5.11.1.p001-FindCGNS.patch' - ] + patches : [] } -version_5_11_1_win_dbg : +version_5_12_0_win_dbg : { - compil_script : 'ParaView-5.11.1.bat' - archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} + compil_script : 'ParaView-5.12.0.bat' + archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} depend : [ 'Python', 'hdf5', @@ -118,13 +115,11 @@ version_5_11_1_win_dbg : patches : [] } -version_5_11_1_MPI : +version_5_12_0_MPI : { - compil_script : 'ParaView-5.11.1.sh' - archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} - patches : [ - 'paraview-5.11.1.p001-FindCGNS.patch' - ] + compil_script : 'ParaView-5.12.0.sh' + archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} + patches : [] depend : [ 'Python', 'hdf5', @@ -141,14 +136,11 @@ version_5_11_1_MPI : opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_11_1_MPI_LATA_64BITS_IDS : +version_5_12_0_MPI_LATA_64BITS_IDS : { - compil_script : 'ParaView-5.11.1.sh' - archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} - patches : [ - 'paraview-5.11.1.p001-FindCGNS.patch', - 'paraview-0012-LATA_64BITS_IDS.patch' - ] + compil_script : 'ParaView-5.12.0.sh' + archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} + patches : [] depend : [ 'Python', 'hdf5', @@ -165,10 +157,10 @@ version_5_11_1_MPI_LATA_64BITS_IDS : opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_11_1_MPI_DB10 : +version_5_12_0_MPI_DB12 : { - compil_script : 'ParaView-5.11.1.sh' - archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} + compil_script : 'ParaView-5.12.0.sh' + archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} patches : [] depend : [ 'Python', @@ -186,13 +178,32 @@ version_5_11_1_MPI_DB10 : opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_11_1_MPI_CO8 : +version_5_12_0_MPI_DB10 : { - compil_script : 'ParaView-5.11.1.sh' - archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} - patches : [ - 'paraview-5.11.1.p002-ParaViewClient.patch' + compil_script : 'ParaView-5.12.0.sh' + archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} + patches : [] + depend : [ + 'Python', + 'hdf5', + 'qt', + 'PyQt', + 'sip', + 'boost', + 'libxml2', + 'freetype', + 'matplotlib', + 'cgns', + 'Pygments' ] + opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] +} + +version_5_12_0_MPI_CO9 : +{ + compil_script : 'ParaView-5.12.0.sh' + archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} + patches : [] depend : [ 'Python', 'hdf5', @@ -209,10 +220,10 @@ version_5_11_1_MPI_CO8 : opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_11_1_MPI_FD38 : +version_5_12_0_MPI_CO8 : { - compil_script : 'ParaView-5.11.1.sh' - archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} + compil_script : 'ParaView-5.12.0.sh' + archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} patches : [] depend : [ 'Python', @@ -230,10 +241,10 @@ version_5_11_1_MPI_FD38 : opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } -version_5_11_1_MPI_FD37 : +version_5_12_0_MPI_FD38 : { - compil_script : 'ParaView-5.11.1.sh' - archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} + compil_script : 'ParaView-5.12.0.sh' + archive_info : {archive_name : "ParaView-5.12.0.tar.gz"} patches : [] depend : [ 'Python', diff --git a/products/compil_scripts/ParaView-5.11.1.bat b/products/compil_scripts/ParaView-5.12.0.bat similarity index 98% rename from products/compil_scripts/ParaView-5.11.1.bat rename to products/compil_scripts/ParaView-5.12.0.bat index 8019a07..1f4db32 100644 --- a/products/compil_scripts/ParaView-5.11.1.bat +++ b/products/compil_scripts/ParaView-5.12.0.bat @@ -208,8 +208,14 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_AUTOLOAD_VTKmFilters=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_SMP_IMPLEMENTATION_TYPE=TBB set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_SMP_ENABLE_OPENMP:BOOL=OFF -DVTK_SMP_ENABLE_STDTHREAD:BOOL=ON -DVTK_SMP_ENABLE_SEQUENTIAL:BOOL=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTKm_ENABLE_TBB:BOOL=ON -DVTKm_ENABLE_OPENMP:BOOL=OFF + +IF DEFINED OT_VERSION ( + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_ENABLE_OPENTURNS=ON -DOpenTURNS_DIR=%OT_ROOT_DIR:\=/%/lib/cmake/openturns +) + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% cd %BUILD_DIR% + echo. echo INFO: running command: %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% diff --git a/products/compil_scripts/ParaView-5.11.1.sh b/products/compil_scripts/ParaView-5.12.0.sh similarity index 91% rename from products/compil_scripts/ParaView-5.11.1.sh rename to products/compil_scripts/ParaView-5.12.0.sh index c1c153d..81845ef 100755 --- a/products/compil_scripts/ParaView-5.11.1.sh +++ b/products/compil_scripts/ParaView-5.12.0.sh @@ -5,8 +5,9 @@ echo "ParaView" $VERSION echo "##########################################################################" PVLIBVERSION=`echo ${VERSION} | awk -F. '{printf("%d.%d",$1,$2)}'` +LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" -CMAKE_OPTIONS="" +CMAKE_OPTIONS= ### common compiler and install settings CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}" @@ -46,7 +47,6 @@ fi ### spns #20550 - Headless mode if [ "$PARAVIEW_HEADLESS_MODE" == "1" ]; then EGL_FOUND=false - LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" case $LINUX_DISTRIBUTION in CO*|FD*) if [ -f /usr/include/EGL/egl.h ] && [ -f /usr/lib64/libEGL.so ] && [ -f /usr/lib64/libOpenGL.so ] @@ -115,6 +115,15 @@ then CMAKE_OPTIONS+=" -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}" CMAKE_OPTIONS+=" -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/libpython${PYTHON_VERSION}.so" CMAKE_OPTIONS+=" -DPython3_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python${PYTHON_VERSION}" +else + case $LINUX_DISTRIBUTION in + CO8*) + echo "WARNING: Set Python_EXECUTABLE macro to ${PYTHONBIN}" + CMAKE_OPTIONS+=" -DPython3_EXECUTABLE=${PYTHONBIN}" + ;; + *) + ;; + esac fi CMAKE_OPTIONS+=" -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON" CMAKE_OPTIONS+=" -DVTK_NO_PYTHON_THREADS:BOOL=OFF" @@ -185,19 +194,25 @@ else fi ### HDF5 settings -CMAKE_OPTIONS+=" -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON" -CMAKE_OPTIONS+=" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5" -CMAKE_OPTIONS+=" -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF" -CMAKE_OPTIONS+=" -DHDF5_ROOT:PATH=${HDF5_ROOT_DIR}" -CMAKE_OPTIONS+=" -DHDF5_hdf5_LIBRARY_RELEASE=${HDF5_ROOT_DIR}/lib" -CMAKE_OPTIONS+=" -DHDF5_hdf5_hl_LIBRARY_RELEASE=${HDF5_ROOT_DIR}/lib/libhdf5_hl.so" -CMAKE_OPTIONS+=" -DHDF5_hdf5_CXX_LIBRARY_RELEASE=${HDF5_ROOT_DIR}/lib/libhdf5_cpp.so" -CMAKE_OPTIONS+=" -DHDF5_HL_LIBRARY=${HDF5_ROOT_DIR}/lib/libhdf5_hl.so" -CMAKE_OPTIONS+=" -DHDF5_C_INCLUDE_DIR=${HDF5_ROOT_DIR}/include" -CMAKE_OPTIONS+=" -DHDF5_HL_LIBRARY=${HDF5_ROOT_DIR}/lib/libhdf5_hl.so" -CMAKE_OPTIONS+=" -DHDF5_C_LIBRARY=${HDF5_ROOT_DIR}/lib/libhdf5.so" -CMAKE_OPTIONS+=" -DHDF5_INCLUDE_DIRS=${HDF5_ROOT_DIR}/include" -CMAKE_OPTIONS+=" -DHDF5_IS_PARALLEL=OFF" +if [ "${SAT_hdf5_IS_NATIVE}" != "1" ]; then + CMAKE_OPTIONS+=" -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON" + CMAKE_OPTIONS+=" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5" + CMAKE_OPTIONS+=" -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF" + CMAKE_OPTIONS+=" -DHDF5_ROOT:PATH=${HDF5_ROOT_DIR}" + CMAKE_OPTIONS+=" -DHDF5_hdf5_LIBRARY_RELEASE=${HDF5_ROOT_DIR}/lib" + CMAKE_OPTIONS+=" -DHDF5_hdf5_hl_LIBRARY_RELEASE=${HDF5_ROOT_DIR}/lib/libhdf5_hl.so" + CMAKE_OPTIONS+=" -DHDF5_hdf5_CXX_LIBRARY_RELEASE=${HDF5_ROOT_DIR}/lib/libhdf5_cpp.so" + CMAKE_OPTIONS+=" -DHDF5_HL_LIBRARY=${HDF5_ROOT_DIR}/lib/libhdf5_hl.so" + CMAKE_OPTIONS+=" -DHDF5_C_INCLUDE_DIR=${HDF5_ROOT_DIR}/include" + CMAKE_OPTIONS+=" -DHDF5_HL_LIBRARY=${HDF5_ROOT_DIR}/lib/libhdf5_hl.so" + CMAKE_OPTIONS+=" -DHDF5_C_LIBRARY=${HDF5_ROOT_DIR}/lib/libhdf5.so" + CMAKE_OPTIONS+=" -DHDF5_INCLUDE_DIRS=${HDF5_ROOT_DIR}/include" + CMAKE_OPTIONS+=" -DHDF5_IS_PARALLEL=OFF" +else + CMAKE_OPTIONS+=" -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON" + CMAKE_OPTIONS+=" -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF" + CMAKE_OPTIONS+=" -DHDF5_IS_PARALLEL=OFF" +fi ### CGNS CMAKE_OPTIONS+=" -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns:BOOL=ON" -- 2.39.2