Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'correct_contour_tree_augmented_example_compile_failures'

Browse Source 
917919569 contour_tree_augmented example compiles when TBB is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2024
This commit is contained in:
Robert Maynard 2020-04-02 19:09:04 +00:00 committed by Kitware Robot
commit e9129312f5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/contour_tree_augmented/ContourTreeApp.cxx
View File

@ -230,13 +230,13 @@ int main(int argc, char* argv[])
if (parser.hasOption("--numThreads"))
{
// Print warning about mismatch between the --numThreads and -d/--device opton
VTKM_LOG_S_IF(vtkm::cont::LogLevel::Warn,
device != vtkm::cont::DeviceAdapterTagTBB,
VTKM_LOG_IF_S(vtkm::cont::LogLevel::Warn,
device != vtkm::cont::DeviceAdapterTagTBB{},
"WARNING: Mismatch between --numThreads and -d/--device option."
"numThreads option requires the use of TBB as device. "
"Ignoring the numThread option.");
// Set the number of threads to be used for TBB
if (device == vtkm::cont::DeviceAdapterTagTBB)
if (device == vtkm::cont::DeviceAdapterTagTBB{})
{
numThreads = std::stoi(parser.getOption("--numThreads"));
tbb::task_scheduler_init schedulerInit(numThreads);