Commit e50350d0 authored by Matt Larsen's avatar Matt Larsen Committed by Kitware Robot
Browse files

Merge topic 'openmp_4_0'

ced5640c updating changelog and readme to reflect openmp 4.0
04162dc6

 use openmp 4.0
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti's avatarAllison Vacanti <allison.vacanti@kitware.com>
Acked-by: James Kress's avatarJames Kress <james@jameskress.com>
Acked-by: Stephanie Labasan's avatarStephanie Labasan <labasan1@llnl.gov>
Merge-request: !1256
parents 45994bd4 ced5640c
......@@ -48,7 +48,7 @@ if(VTKm_ENABLE_TBB AND NOT TARGET vtkm::tbb)
endif()
if(VTKm_ENABLE_OPENMP AND NOT TARGET vtkm::openmp)
find_package(OpenMP 4.5 REQUIRED COMPONENTS CXX QUIET)
find_package(OpenMP 4.0 REQUIRED COMPONENTS CXX QUIET)
add_library(vtkm::openmp INTERFACE IMPORTED GLOBAL)
if(OpenMP_CXX_FLAGS)
......
......@@ -74,7 +74,7 @@ Optional dependencies are:
+ TBB Device Adapter
+ [TBB](https://www.threadingbuildingblocks.org/)
+ OpenMP Device Adapter
+ Requires a compiler that supports OpenMP >= 4.5.
+ Requires a compiler that supports OpenMP >= 4.0.
+ OpenGL Rendering
+ The rendering module contains multiple rendering implementations
including standalone rendering code. The rendering module also
......
# OpenMP Device Adapter
A device adapter that leverages OpenMP 4.5 for threading is now available. The
A device adapter that leverages OpenMP 4.0 for threading is now available. The
new adapter is enabled using the CMake option `VTKm_ENABLE_OPENMP` and its
performance is comparable to the TBB device adapter.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment