Commit Graph

4755 Commits

Author SHA1 Message Date
Robert Maynard
7836fff251 Merge topic 'correct_improper_thirdparty_include_paths'
d9af7649 thirdparty libraries now obey VTKm_INSTALL_ONLY_LIBRARIES
37c57ebb vtkm thirdparty includes are now usable from an installed vtk-m.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1216
2018-05-19 09:12:41 -04:00
Robert Maynard
ec75f9d215 Merge topic 'nvcc_ice_fix'
c229c92c Merge branch 'upstream-taotuple' into nvcc_ice_fix
8bfa1538 taotuple 2018-05-18 (2cf903d6)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1217
2018-05-19 09:12:16 -04:00
Robert Maynard
9f4f87c35b Merge topic 'document_more_vtkm_changes_since_1.2.0'
245d27bd Add changelog documents for major changes I made to VTK-m since 1.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1219
2018-05-19 08:30:23 -04:00
Abhishek Yenpure
7291327e98 Merge topic 'fix_warnings'
3f08c444 Fixing warnings introduced by MR 1165

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1212
2018-05-18 20:02:34 -04:00
Allison Vacanti
7ea7acee5e Merge topic 'changelog-update'
00a9225c Add changelog messages for fancy arrayhandle changes.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1220
2018-05-18 17:45:25 -04:00
Allison Vacanti
00a9225ce1 Add changelog messages for fancy arrayhandle changes. 2018-05-18 17:39:49 -04:00
Robert Maynard
245d27bd5c Add changelog documents for major changes I made to VTK-m since 1.2 2018-05-18 17:36:22 -04:00
David Thompson
7df0410a81 Merge topic 'cell-measure-fixes'
7cbbb016 Fix `multi_backend` when using double precision.
52a14958 Fix cell measure when using double precision as default.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1214
2018-05-18 17:07:52 -04:00
Robert Maynard
d9af7649e4 thirdparty libraries now obey VTKm_INSTALL_ONLY_LIBRARIES
This way we only install thirdparty headers and CMake information
when VTKm_INSTALL_ONLY_LIBRARIES is set to false.
2018-05-18 16:40:55 -04:00
Allison Vacanti
c229c92c0b Merge branch 'upstream-taotuple' into nvcc_ice_fix
* upstream-taotuple:
  taotuple 2018-05-18 (2cf903d6)
2018-05-18 16:26:38 -04:00
TaoCpp Tuple Upstream
8bfa153806 taotuple 2018-05-18 (2cf903d6)
Code extracted from:

    https://gitlab.kitware.com/third-party/taotuple.git

at commit 2cf903d6e44af7f277e21d804294ffd1f0528af8 (for/vtk-m).
2018-05-18 16:26:37 -04:00
Robert Maynard
37c57ebb25 vtkm thirdparty includes are now usable from an installed vtk-m. 2018-05-18 16:11:41 -04:00
Sujin Philip
d9ff56a701 Merge topic 'add-changelog'
d5676214 Add Changelog for previous commits

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1215
2018-05-18 15:33:07 -04:00
ayenpure
3f08c44436 Fixing warnings introduced by MR 1165 2018-05-18 12:25:52 -07:00
Sujin Philip
d5676214ba Add Changelog for previous commits 2018-05-18 15:24:44 -04:00
Robert Maynard
4a520b7bdd Merge topic 'pascal_managed_memory_copy_non_blocking'
e0b6e698 copying cpu memory to pascal managed memory now works consistently.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1211
2018-05-18 15:15:17 -04:00
David Thompson
7cbbb016d4 Fix multi_backend when using double precision. 2018-05-18 14:05:11 -04:00
David Thompson
52a1495859 Fix cell measure when using double precision as default. 2018-05-18 14:05:06 -04:00
Robert Maynard
7c53456441 Merge topic 'correct_msvc_generator_check'
7e3df68f State that MSVC Generators require CMake 3.11+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1213
2018-05-18 13:43:38 -04:00
Robert Maynard
7e3df68fb4 State that MSVC Generators require CMake 3.11+
We require CMake 3.11 with the MSVC generator as the $<COMPILE_LANGUAGE:>
generator expression is not supported on older versions.
2018-05-18 12:50:38 -04:00
Abhishek Yenpure
ffe7f67e52 Merge topic 'temporalparticleadvection'
7188c6ef Removing bad whitespace from TemporalGridEvaluators.h
bc405366 Fixing header guard warning
b39ee80b Fix errors missed/introduced in previous commit.
eb2ed4f2 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into temporalparticleadvection
24dd0638 Fixing merge mess for particle advection
78118a84 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into temporalparticleadvection
129e320d Replicating Rob's changes from the master
40fe133d Fix compile warnings for Temporal Advection
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !1165
2018-05-17 13:25:15 -04:00
Robert Maynard
9764aca5fe Merge topic 'vtkm_cont_device_tests_use_error_device_to_smoke_out_bad_device_uses'
1c5feeb1 Make sure all device specific tests use the intended device.
30205be8 Make sure PointLocatorUniformGrid always uses the provided device adapter
74df09fb Remove unneeded trailing ; from PointLocatorUniformGrid

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1209
2018-05-17 12:32:42 -04:00
David Thompson
1cf1ca7141 Merge topic 'cell-measure'
00c7905a Rename `vtkm::dot()` to `vtkm::Dot()`.
dd7c17f7 Compute cell measures (arc length, area, volume).

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1203
2018-05-17 11:02:34 -04:00
Brad King
b0baa951fa Merge topic '43-ArrayHandleCompositeVector-refactor'
c3c8d0fd Refactor ArrayHandleCompositeVector to simplify usage and impl.
ec88b7dd Markup array portals for use in the exec env.
3159b376 Make Swizzle and ExtractComponent array parameters runtime vars.
19344707 Add vtkm_taotuple to build system.
d23c4452 Merge branch 'upstream-taotuple' into tmp
b3b14de7 taotuple 2018-05-15 (e3de8c97)
b00f6c1c Add taocpp/tuple as a thirdparty package.

Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1199
2018-05-17 09:23:28 -04:00
David Thompson
00c7905afb Rename vtkm::dot() to vtkm::Dot().
This keeps the old name around but prepares it for removal
in the next release.
2018-05-17 08:51:01 -04:00
David Thompson
dd7c17f776 Compute cell measures (arc length, area, volume).
This commit adds a worklet and a filter to compute
signed integral measures of cells.

It also begins the practic of adding a markdown
changelog entry in `doc/changelog`. See the
changelog entry for details.
2018-05-17 08:50:56 -04:00
Robert Maynard
e0b6e69878 copying cpu memory to pascal managed memory now works consistently.
When copying small arrays from cpu memory to pascal memory we would
see subsequent kernels fail as the memory transfer hadn't finished.
This is a bug as each stream should act like a FIFO queue. So
for now when encountering this use case we explicitly synchronize
after the memcpy.
2018-05-16 17:56:50 -04:00
ayenpure
7188c6ef63 Removing bad whitespace from TemporalGridEvaluators.h 2018-05-16 11:30:27 -07:00
Allison Vacanti
c3c8d0fd70 Refactor ArrayHandleCompositeVector to simplify usage and impl.
- Use tao::tuple instead of FunctionInterface to hold array/portal
  collections.
- Type signatures are simplified. Now just use:
  - ArrayHandleCompositeVector<ArrayT1, ArrayT2, ...>
  - make_ArrayHandleCompositeVector(array1, array2, ...)
  instead of relying on helper structs to determine types.
- No longer support component selection from an input array. All
  input arrays must have the same ValueType (See ArrayHandleSwizzle
  and ArrayHandleExtractComponent as the replacements for these
  usecases.
2018-05-16 11:45:12 -04:00
Allison Vacanti
ec88b7dd24 Markup array portals for use in the exec env.
Since we now use a CUDA-aware tuple object to store ArrayHandles and
Portals for the CompositeVector, these must be constructable on
devices.
2018-05-16 11:45:12 -04:00
Allison Vacanti
3159b376b3 Make Swizzle and ExtractComponent array parameters runtime vars. 2018-05-16 11:45:11 -04:00
Allison Vacanti
193447078f Add vtkm_taotuple to build system. 2018-05-16 11:45:11 -04:00
Robert Maynard
1c5feeb185 Make sure all device specific tests use the intended device.
This means that we not only setup the runtime device tracker
to force the intended device, it also means making sure
the default device is the error device.
2018-05-16 08:21:16 -04:00
Robert Maynard
30205be832 Make sure PointLocatorUniformGrid always uses the provided device adapter 2018-05-16 08:21:16 -04:00
Robert Maynard
74df09fbe0 Remove unneeded trailing ; from PointLocatorUniformGrid
These cause warnings with the nvcc compiler
2018-05-16 08:21:16 -04:00
ayenpure
bc40536639 Fixing header guard warning 2018-05-15 17:55:30 -07:00
ayenpure
b39ee80b70 Fix errors missed/introduced in previous commit.
- Missed a ',' to seperate template argument in GridEvaluator
- Adding initialization of params to Integrators for RK4
- Fixing ExecutionBaseObject changes for Particles
2018-05-15 17:45:04 -07:00
Robert Maynard
a4b16c4b4e Merge topic 'deviceadapter_runtime_odr'
e28244f3 Re-implement DeviceAdapterRuntimeDetector to avoid ODR violations.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1206
2018-05-15 17:31:01 -04:00
Haocheng Liu
ebdc8bd047 Merge topic 'make-pi-constexpr'
2e62d78b Make vtkm:Math Pi() operations constexpr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1207
2018-05-15 15:26:35 -04:00
TaoCpp Tuple Upstream
b3b14de7e0 taotuple 2018-05-15 (e3de8c97)
Code extracted from:

    https://gitlab.kitware.com/third-party/taotuple.git

at commit e3de8c97081d4ccf92c2a2c898caeae2a12f96e7 (for/vtk-m).
2018-05-15 15:19:13 -04:00
Allison Vacanti
d23c445296 Merge branch 'upstream-taotuple' into tmp
* upstream-taotuple:
  taotuple 2018-05-15 (e3de8c97)
2018-05-15 15:19:13 -04:00
ayenpure
eb2ed4f275 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into temporalparticleadvection 2018-05-15 11:46:26 -07:00
ayenpure
24dd063810 Fixing merge mess for particle advection
Adding Utkarsh's changes from 86bd81de to Rectilinear grid as well
 - To make rectilinear grids work with any storage type

Adding Rob's changes from 7d6fe568 to the RK4Integrator
 - Previously the RK4Integrator could compute velocity with uninitialized inputs.

Adding Rob's changes from a6bf830f to ParticleAdvection
 - Previous ParticleAdvection would dispatch some of the worklets on the default device adapter
   and not the explicitly requested device adapter

Adding Ken's change from 0753131a
 - For supporting all the previous merge conflicts with the new ExecutionObjectBase change.
2018-05-15 11:35:29 -07:00
Haocheng LIU
2e62d78b49 Make vtkm:Math Pi() operations constexpr
If they are used inside other mathematical expressions then the compiler
has a better chance to perform the operation at compile time.
2018-05-15 14:27:26 -04:00
Allison Vacanti
b00f6c1c0a Add taocpp/tuple as a thirdparty package. 2018-05-15 13:32:42 -04:00
Robert Maynard
e28244f345 Re-implement DeviceAdapterRuntimeDetector to avoid ODR violations.
The previous implementation of DeviceAdapterRuntimeDetector caused
multiple differing definitions of the same class to exist and
was causing the runtime device tracker to report CUDA as disabled
when it actually was enabled.

The ODR was caused by having a default implementation for
DeviceAdapterRuntimeDetector and a specific specialization for
CUDA. If a library had both CUDA and C++ sources it would pick up
both implementations and would have undefined behavior. In general
it would think the CUDA backend was disabled.

To avoid this kind of situation in the future I have reworked VTK-m
so that each device adapter must implement DeviceAdapterRuntimeDetector
for that device.
2018-05-15 13:08:34 -04:00
Robert Maynard
4e2e96dd6f Merge topic 'upgraded_multi_backend_example'
ad545dad multi_backend shows how a filter can use multiple device adapter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1184
2018-05-15 11:52:44 -04:00
Robert Maynard
ad545dad5b multi_backend shows how a filter can use multiple device adapter 2018-05-15 10:35:18 -04:00
Sujin Philip
7cf0926172 Merge topic 'cuda-arch-flags'
52758f7f Properly set up cuda architecture flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1204
2018-05-14 15:58:34 -04:00
Sujin Philip
52758f7f3a Properly set up cuda architecture flags 2018-05-14 14:23:28 -04:00