From 97dda73b49edc229384794290e762c36113df228 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 2 Oct 2020 18:04:42 +0200 Subject: [PATCH] vtkM - in case of TBB as VTK_SMP_IMPLEMENTATION_TYPE use embedded TBB 4.4 --- applications/SALOME-master-int64.pyconf | 10 ++++++++-- products/compil_scripts/ParaView.sh | 8 +++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/applications/SALOME-master-int64.pyconf b/applications/SALOME-master-int64.pyconf index f09d073..fcdb507 100644 --- a/applications/SALOME-master-int64.pyconf +++ b/applications/SALOME-master-int64.pyconf @@ -18,7 +18,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 + VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # choose among: sequential / OpenMP / TBB switches } launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"} SALOME_trace : "local" # local/file:.../with_logger @@ -217,7 +217,7 @@ __overwrite__ : } { - __condition__ : "VARS.dist in ['CO7']" + __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'OpenMP'" 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0003-ParaViewClient.patch', 'paraview.0004-ParaView_hdf5.patch', 'paraview.0005-ParaView_find_cgns.patch', @@ -228,6 +228,12 @@ __overwrite__ : 'pv_coincident.patch' ] } + + { + __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'TBB'" + 'APPLICATION.products.tbb' : '4.4' + } + { __condition__ : "VARS.dist in ['CO8']" 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch', diff --git a/products/compil_scripts/ParaView.sh b/products/compil_scripts/ParaView.sh index 959a954..3ee02da 100755 --- a/products/compil_scripts/ParaView.sh +++ b/products/compil_scripts/ParaView.sh @@ -101,7 +101,13 @@ then CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=OFF" CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=`which g++`" CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=`which gcc`" - if [[ $VTK_SMP_IMPLEMENTATION_TYPE = "TBB" ]] + if [[ $VTK_SMP_IMPLEMENTATION_TYPE = "sequential" ]] + then + echo "WARNING: sequential approach will be used..." + CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=OFF" + CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=`which g++`" + CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=`which gcc`" + elif [[ $VTK_SMP_IMPLEMENTATION_TYPE = "TBB" ]] then echo "WARNING: VTK_SMP_IMPLEMENTATION_TYPE was set to: TBB..." CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=TBB -DVTKm_ENABLE_TBB:BOOL=ON" -- 2.39.2