From 340617ed667afdd2d771a953949318939ea79740 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 9 May 2023 15:30:57 +0200 Subject: [PATCH] spns #34822: move to TBB based approach --- applications/SALOME-master-MPI.pyconf | 2 +- applications/SALOME-master-native.pyconf | 2 +- applications/SALOME-master.pyconf | 2 +- products/compil_scripts/ParaView-5.11.0.sh | 6 ++++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index cbd5069..af8caf3 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -19,7 +19,7 @@ APPLICATION : CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED" SALOME_USE_64BIT_IDS : '1' - VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches + VTK_SMP_IMPLEMENTATION_TYPE : TBB # OpenMP # choose among: sequential / OpenMP / TBB switches SALOME_GMSH_HEADERS_STD : '1' } launch : diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 9a9e792..83a7e91 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -19,7 +19,7 @@ APPLICATION : CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED" SALOME_USE_64BIT_IDS : '1' - VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches + VTK_SMP_IMPLEMENTATION_TYPE : TBB # OpenMP # choose among: sequential / OpenMP / TBB switches SALOME_GMSH_HEADERS_STD : '1' } launch : diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index f406b0b..0473878 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -19,7 +19,7 @@ APPLICATION : CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED" SALOME_USE_64BIT_IDS : '1' - VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches + VTK_SMP_IMPLEMENTATION_TYPE : TBB # OpenMP # choose among: sequential / OpenMP / TBB switches SALOME_GMSH_HEADERS_STD : '1' } launch : diff --git a/products/compil_scripts/ParaView-5.11.0.sh b/products/compil_scripts/ParaView-5.11.0.sh index d0be771..00cda50 100755 --- a/products/compil_scripts/ParaView-5.11.0.sh +++ b/products/compil_scripts/ParaView-5.11.0.sh @@ -145,11 +145,13 @@ if [ -n "$SAT_HPC" ]; then exit 1 elif [ "${VTK_SMP_IMPLEMENTATION_TYPE}" == "OpenMP" ]; then echo "WARNING: VTK_SMP_IMPLEMENTATION_TYPE was set to: OpenMP..." - CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DVTKm_ENABLE_OPENMP:BOOL=ON" + CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" elif [ "${VTK_SMP_IMPLEMENTATION_TYPE}" == "TBB" ]; then echo "WARNING: VTK_SMP_IMPLEMENTATION_TYPE was set to: TBB..." - CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=TBB -DVTKm_ENABLE_TBB:BOOL=ON" + CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=TBB" fi + CMAKE_OPTIONS+=" -DVTK_SMP_ENABLE_OPENMP:BOOL=ON -DVTK_SMP_ENABLE_STDTHREAD:BOOL=ON -DVTK_SMP_ENABLE_SEQUENTIAL:BOOL=ON" + CMAKE_OPTIONS+=" -DVTKm_ENABLE_TBB:BOOL=ON -DVTKm_ENABLE_OPENMP:BOOL=ON" CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_VTK_FiltersParallelMPI=YES" CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_VTK_ParallelMPI=YES" CMAKE_OPTIONS+=" -DMPI_C_FOUND=${MPI_C_FOUND}" -- 2.39.2