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
11,410 Commits 9 Branches 24 Tags 36 MiB
f5f1f0fde0
Commit Graph

77 Commits

Author SHA1 Message Date
Yohann Vautrin
88b9a2f42f Update OpenMP code for consistency 
Calls to `set_property` are replaced by equivalents calls for
readability. Order of operations is changed for consistency with the
code for TBB.
 2024-04-23 16:01:50 -04:00
Yohann Vautrin
ba75296f65 Use target OpenMP::OpenMP_CXX for exported targets 
Using `${OpenMP_CXX_LIBRARIES}` results in paths to certain libraries
being hard-coded in VTKmTargets.cmake, which can lead to issues in some
cases (e.g.: when VTK is built by the CI system for MSYS2).
 2024-04-23 16:01:10 -04:00
Vicente Adolfo Bolea Sanchez
6664fd1e5a cmake: VTKm_ENABLE_KOKKOS_THRUST disabled by default 2023-12-15 13:07:20 -05:00
Vicente Adolfo Bolea Sanchez
c9ec6ae6a6 kokkos: let link vtkm_cont to roc::rocthrust 
Also reorder the declarion of the option VTKm_ENABLE_KOKKOS_THRUST
to be set before calling VTKmDeviceAdapters.
 2023-11-30 18:18:03 -05:00
Thomas Gibson
fda475d5bf Rework Thrust CMake options 2023-02-20 08:26:28 -06:00
Sean Miller
e6f63a807d Adding CMake tweaks to turn off thrust algorithms if thrust is not detected. 2023-02-20 08:26:24 -06:00
Kenneth Moreland
fa30d6774c Update the minimum Kokkos required to 3.7 
This was suggested by a developer on the Kokkos team.
 2023-01-30 09:53:56 -07:00
Vicente Adolfo Bolea Sanchez
d5ce967890 CMAKE: fix vtkm devices namespaces 2022-12-26 13:40:12 -05:00
Vicente Adolfo Bolea Sanchez
049d0cca8c cmake: namespace vtkm export targets 2022-12-09 18:46:56 -05:00
Vicente Adolfo Bolea Sanchez
8d01c750f8 Partial revert of a4f81d2c3e34fead9e55a802967445db195d9856 2022-10-11 13:50:32 -04:00
Vicente Adolfo Bolea Sanchez
c2d1a46bd0 KOKKOS: empty bogus kokkoscore property 2022-10-11 12:29:32 -04:00
Vicente Bolea
7c25d8f0f4 Merge topic 'skip-find-tbb-if-loaded' 
c30c35571 Revert "Disable loading the TBBConfig.cmake file"
dd3fc9781 cmake: skip find_package(TBB) if already loaded

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2835
 2022-08-04 17:33:47 -04:00
Vicente Adolfo Bolea Sanchez
dd3fc97811 cmake: skip find_package(TBB) if already loaded 2022-08-04 13:24:27 -04:00
Vicente Adolfo Bolea Sanchez
af129132cc CMAKE: add CMAKE_CUDA_ARCHITECTURE support 2022-03-29 19:56:43 -04:00
Vicente Bolea
ce17a3bf77 Merge topic 'cuda-multiple-archs' into release 
0bbba6c0c CMAKE: CUDA ampere generate sm_80/86

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2688
 2022-01-28 12:55:33 -05:00
Vicente Bolea
2bdce6c32d Merge topic 'cuda-multiple-archs' 
0bbba6c0c CMAKE: CUDA ampere generate sm_80/86

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2688
 2022-01-28 12:55:33 -05:00
Vicente Adolfo Bolea Sanchez
770c76f842 HIP: remove bogus kokkoscore props 2022-01-27 20:41:56 -05:00
Vicente Adolfo Bolea Sanchez
0bbba6c0c2 CMAKE: CUDA ampere generate sm_80/86 2022-01-27 20:03:54 -05:00
Vicente Adolfo Bolea Sanchez
cc6502498e HIP: remove bogus kokkoscore props 2022-01-21 16:36:40 -05:00
Vicente Adolfo Bolea Sanchez
46b0268825 CI: add ubuntu2004 with tbb 2020 build 2021-09-28 19:46:11 +00:00
Kenneth Moreland
3be3529ff3 Export tbb interface as vtkm::tbb 
The dependent exports should be placed in the vtkm namespace.
 2021-06-10 10:54:46 -06:00
Caitlin Ross
53833334c4 change the way tbb is imported 2021-04-08 16:24:42 -04:00
Robert Maynard
97944e59be Correctly handle when to use DEVICE_LINK generator expression 2021-04-02 13:45:15 -04:00
Robert Maynard
7475c318be VTK-m now uses CMake's future HIP lang for Kokkos+HIP 2020-12-11 09:13:12 -05:00
Robert Maynard
bcc840eaf6 Add support for the Ampere line of NVIDIA GPU's 2020-10-21 10:15:52 -04:00
Robert Maynard
96fc02ebca VTK-m when using CMake 3.18 can propagate cuda flags cleanly 2020-08-20 13:12:05 -04:00
Robert Maynard
7692485831 Make sure we use c++14 when using CUDA 11+ 2020-08-13 16:02:24 -04:00
Robert Maynard
64efa64015 Kokkos: make sure we don't pass multiple rdc flags 2020-08-13 16:02:24 -04:00
Sujin Philip
b2f4c8e5ef Switch -O3 to -O2 on Linux with Cuda 10 2020-08-12 13:55:24 -04:00
Sujin Philip
452f61e290 Add Kokkos backend 2020-08-12 13:55:24 -04:00
Robert Maynard
565d5a3a2e Remove CMake workarounds for version < 3.12 2020-05-29 17:15:06 -04:00
Sujin Philip
c102ea556c Update cmake minimum required version to 3.12 2020-04-13 12:42:28 -05:00
Robert Maynard
e6a2089d8e Require CMake 3.12+ for using OpenMP backend 2019-09-18 07:59:32 -04:00
Robert Maynard
a65afa11ba Export CUDA static library requirements properly 
This is a work around while we wait on requiring CMake 3.15 for all
cuda builds. At that point we can replace this with setting
`requires_static_builds` as part of the EXPORT_PROPERTIES of the
vtkm_cuda target.

This has been tested with the ascent proxy
 2019-08-27 13:34:49 -04:00
Robert Maynard
3c1339504f Another turn on the wheel to get VTK-m to export CUDA flags 
This is a work around while we wait on requiring CMake 3.15 for all
cuda builds. At that point we can replace this with setting
`cuda_architecture_flags` as part of the EXPORT_PROPERTIES of the
vtkm_cuda target.

This has been tested with the ascent proxy
 2019-08-26 16:54:43 -04:00
Robert Maynard
267f963d32 Opt into all CMake 3.15 policies 2019-08-20 15:38:27 -04:00
Robert Maynard
8f36811718 When importing VTK-m don't recheck the CUDA host architecture 2019-07-31 18:16:22 -04:00
Allison Vacanti
5af957ec81 Error out when native CUDA flag detection fails. 
Ref #388.
 2019-07-25 12:17:46 -04:00
Robert Maynard
6de7d07d28 VTK-m requires CMake 3.13 to compile CUDA 
This is to resolve issues related to FindThreads and CUDA
compilation.
 2019-07-16 16:39:50 -04:00
Robert Maynard
65f169b311 VTK-m now will now error when mixing CUDA and shared builds 2019-07-09 11:48:22 -04:00
Robert Maynard
2a7ef30116 CMake: Don't presume the cuda compilers is always NVCC. 2019-05-29 09:24:01 -04:00
nadavi
fbcea82e78 conslidate the license statement 2019-04-17 10:57:13 -06:00
Robert Maynard
71018e3b52 Always export vtkm_cuda no matter VTKm_INSTALL_ONLY_LIBRARIES 2019-04-12 11:10:10 -04:00
Robert Maynard
7ea2accbc1 Correct issues when using a cuda enabled install of vtk-m. 2019-04-03 18:08:56 -04:00
Allison Vacanti
68abfccd7e Merge topic 'cuda10.1' 
0581b368f Fix issues with importing installed vtkm::cuda after refactor.
ed4374b05 diy 2019-03-13 (e8e68c7c)
b85dcf229 Add more vtkm_cont compilation units to device_sources.
9014de0eb Suppress new host/device warnings for cuda 10.1.
04a464cc4 Update cuda detection to create vtkm::cuda as an interface library.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1582
 2019-03-27 12:12:02 -04:00
Allison Vacanti
0581b368fd Fix issues with importing installed vtkm::cuda after refactor. 2019-03-26 14:53:42 -04:00
Allison Vacanti
04a464cc4b Update cuda detection to create vtkm::cuda as an interface library. 2019-03-26 14:53:42 -04:00
Robert Maynard
0ce7e82d43 VTK-m now enables all new CMake policies in 3.14 
This means that we opt-in to policy changes introduced in 3.14
 2019-03-26 11:50:06 -04:00
Kenneth Moreland
e9591621b3 Find threads library in external build 
In certain circumstances (currently, when logging is enabled), VTK-m
libraries depend on the threading library. However, when the VTK-m
package was included from an external project, it did not automatically
find the threads package. This change makes the Threads library loaded
when the VTK-m package is found.
 2019-02-27 14:03:10 -07:00
Robert Maynard
f1e1a524e9 Require CMake 3.8 to build VTK-m. 2019-01-09 16:01:22 -05:00