From 142c2fbbb30d8a20781396fb1f831904bf9255d8 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 1 Feb 2024 13:43:06 +0100 Subject: [PATCH] bos #40795 [CEA 40692] COTECH 156.2 - Check if native HDF5 can be used for DB10 version --- applications/SALOME-master-native.pyconf | 1 + products/compil_scripts/ParaView-5.11.0.sh | 32 +++++++++++++--------- products/compil_scripts/petsc-3.15.0.sh | 4 ++- products/compil_scripts/petsc-3.16.0.sh | 4 ++- products/compil_scripts/petsc-3.17.0.sh | 4 ++- 5 files changed, 29 insertions(+), 16 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index c39c73e..7e53340 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -237,6 +237,7 @@ __overwrite__ : __condition__ : "VARS.dist in ['DB10']" 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack' : 'native' + 'APPLICATION.products.hdf5' : 'native' 'APPLICATION.products.PyFMI' : {tag:'2.6', base: 'no', section: 'version_2_6_no_pip' } 'APPLICATION.products.qt' : '5.12.10' 'APPLICATION.products.qwt' : '6.1.2' diff --git a/products/compil_scripts/ParaView-5.11.0.sh b/products/compil_scripts/ParaView-5.11.0.sh index 951eab7..81845ef 100755 --- a/products/compil_scripts/ParaView-5.11.0.sh +++ b/products/compil_scripts/ParaView-5.11.0.sh @@ -194,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" diff --git a/products/compil_scripts/petsc-3.15.0.sh b/products/compil_scripts/petsc-3.15.0.sh index c680fda..f4128fd 100755 --- a/products/compil_scripts/petsc-3.15.0.sh +++ b/products/compil_scripts/petsc-3.15.0.sh @@ -12,7 +12,9 @@ cp -rf $SOURCE_DIR/* . CONFIGURE_FLAGS='' CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-f2cblaslapack=ext/f2cblaslapack-3.4.2.q4.tar.gz" CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-slepc=ext/slepc-3.15.0.tar.gz" -CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --with-hdf5-dir=${HDF5_ROOT_DIR}" +if [ "$SAT_hdf5_IS_NATIVE" != "1" ]; then + CONFIGURE_FLAGS+=" --with-hdf5-dir=${HDF5_ROOT_DIR}" +fi CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-metis=ext/metis-5.1.0-p10.tar.gz" CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --with-debugging=0" # by default Petsc is build in debug mode echo diff --git a/products/compil_scripts/petsc-3.16.0.sh b/products/compil_scripts/petsc-3.16.0.sh index d78728f..d5b432a 100755 --- a/products/compil_scripts/petsc-3.16.0.sh +++ b/products/compil_scripts/petsc-3.16.0.sh @@ -24,7 +24,9 @@ cp -rf $SOURCE_DIR/* . CONFIGURE_FLAGS= CONFIGURE_FLAGS+=" --download-f2cblaslapack=ext/f2cblaslapack-3.4.2.q4.tar.gz" CONFIGURE_FLAGS+=" --download-slepc=ext/slepc-3.16.0.tar.gz" -CONFIGURE_FLAGS+=" --with-hdf5-dir=${HDF5_ROOT_DIR}" +if [ "$SAT_hdf5_IS_NATIVE" != "1" ]; then + CONFIGURE_FLAGS+=" --with-hdf5-dir=${HDF5_ROOT_DIR}" +fi CONFIGURE_FLAGS+=" --download-metis=ext/metis-5.1.0-p10.tar.gz" CONFIGURE_FLAGS+=" --with-debugging=0" # by default Petsc is build in debug mode CONFIGURE_FLAGS+=" --with-petsc4py=yes" diff --git a/products/compil_scripts/petsc-3.17.0.sh b/products/compil_scripts/petsc-3.17.0.sh index b865423..628d393 100755 --- a/products/compil_scripts/petsc-3.17.0.sh +++ b/products/compil_scripts/petsc-3.17.0.sh @@ -14,7 +14,9 @@ CONFIGURE_FLAGS= CONFIGURE_FLAGS+=" --with-blaslapack-dir=${LAPACK_ROOT_DIR}" CONFIGURE_FLAGS+=" --with-python-dir=${PYTHON_ROOT_DIR}" CONFIGURE_FLAGS+=" --download-slepc=ext/slepc-3.17.0.tar.gz" -CONFIGURE_FLAGS+=" --with-hdf5-dir=${HDF5_ROOT_DIR}" +if [ "$SAT_hdf5_IS_NATIVE" != "1" ]; then + CONFIGURE_FLAGS+=" --with-hdf5-dir=${HDF5_ROOT_DIR}" +fi CONFIGURE_FLAGS+=" --with-debugging=0" # by default Petsc is build in debug mode CONFIGURE_FLAGS+=" --with-petsc4py=yes" CONFIGURE_FLAGS+=" --download-slepc-configure-arguments=--with-slepc4py=yes " -- 2.39.2