Commit Graph

5311 Commits

Author SHA1 Message Date
Haocheng LIU
bb06717803 Make RuntimeDeviceInformation class template independent
By making RuntimeDeviceInformation class template independent, vtkm is
able to detect
device info at runtime with a runtime specified deviceId. In the past
it's impossible
because the CRTP pattern does not allow function overloading(compiler
would complain
that DeviceAdapterRuntimeDetector does not have Exists() function
defined).
2018-11-01 14:55:33 -04:00
Robert Maynard
5ded6352fe Merge topic 'install_colortable_hxx'
154b65f47 Install vtkm/cont/ColorTable.hxx so users can use color tables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !1448
2018-10-31 17:34:17 -04:00
Robert Maynard
154b65f47a Install vtkm/cont/ColorTable.hxx so users can use color tables 2018-10-31 17:02:12 -04:00
Matt Larsen
27d7162b1e Merge topic 'partial_composites'
fd4ff8c1f adding files patch forgot
e03703578 removing unused variable
5a1685d8a updates to the connectivity tracer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1447
2018-10-31 11:40:29 -04:00
Robert Maynard
458fc974b5 Merge topic 'rework_colortable_for_separable_compilation'
169ca722b Redesign vtkm::cont::ColorTable to work with separable compilation.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1445
2018-10-31 11:24:43 -04:00
Robert Maynard
169ca722b3 Redesign vtkm::cont::ColorTable to work with separable compilation. 2018-10-31 08:18:08 -04:00
Matt Larsen
fd4ff8c1f3 adding files patch forgot 2018-10-30 08:18:56 -07:00
Matt Larsen
e037035780 removing unused variable 2018-10-30 08:09:11 -07:00
Matt Larsen
5a1685d8aa updates to the connectivity tracer 2018-10-30 07:46:42 -07:00
Robert Maynard
8237db209e Merge topic 'noexcept_move_constructors'
c66a6e480 Provided vtkm::cont::Storage with move schematics
1f86878f7 Make the ArrayHandle move constructors noexcept.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1439
2018-10-29 10:24:48 -04:00
Robert Maynard
e549cea8eb Merge topic 'openmp_rendering_tests'
184bdf9d6 Test rendering with OpenMP

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1441
2018-10-25 08:29:31 -04:00
Robert Maynard
c66a6e480d Provided vtkm::cont::Storage with move schematics 2018-10-24 15:45:55 -04:00
Kenneth Moreland
41b006064d Merge topic 'remove-device-from-worklet-run-function'
5426ae0ed added runtime device tracker force
cb0323880 removed device from run function for AverageByKey

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1440
2018-10-24 15:42:59 -04:00
Robert Maynard
184bdf9d60 Test rendering with OpenMP 2018-10-24 15:39:54 -04:00
Matthew Letter
5426ae0ed3 added runtime device tracker force
added `vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(VTKM_DEFAULT_DEVICE_ADAPTER_TAG());`
2018-10-24 11:19:52 -06:00
Matthew Letter
cb03238804 removed device from run function for AverageByKey
I also cleaned up the unit test to no longer pass the device
2018-10-24 10:28:12 -06:00
Robert Maynard
1f86878f78 Make the ArrayHandle move constructors noexcept.
std::containers only activate fast emplace operations if the
T types move operators are noexcept
2018-10-23 16:21:05 -04:00
Robert Maynard
8475db6fea Merge topic 'filter-no-try-execute-changelog'
3b847f9ac Add change log for removal of TryExecute from filters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1437
2018-10-22 08:39:22 -04:00
Robert Maynard
8a739ee1b6 Merge topic 'correct_vtkm_warnings'
9403bac1f VTK-m device side math functions need to use the vtkm:: wrappers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1436
2018-10-22 08:36:42 -04:00
Robert Maynard
02567c5dd0 Merge topic 'reenable_particle_advection'
cd6367646 ParticeAdvection for cuda <= 9 now built without ptxas optimizations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1435
2018-10-22 08:32:14 -04:00
Robert Maynard
9403bac1f6 VTK-m device side math functions need to use the vtkm:: wrappers 2018-10-18 13:57:53 -04:00
Robert Maynard
cd6367646c ParticeAdvection for cuda <= 9 now built without ptxas optimizations
The ParticleAdvection code would always cause cuda 9's ptxas phase
to crash, so we disable optimization to work around this issue
2018-10-18 11:19:23 -04:00
Kenneth Moreland
3b847f9aca Add change log for removal of TryExecute from filters 2018-10-17 16:53:15 -06:00
Robert Maynard
cb47714749 Merge topic 'update_cuda_reqs'
4263db63e Document new requirements for VTK-m on windows ( cuda10+ )

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1433
2018-10-17 15:11:45 -04:00
Robert Maynard
3f0d20d002 Merge topic 'vs2015_compilation_fixes'
57236e0f6 particleadvection was missing ::template causing VS2015 failures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1434
2018-10-17 11:58:08 -04:00
Robert Maynard
57236e0f6e particleadvection was missing ::template causing VS2015 failures 2018-10-17 10:53:19 -04:00
Kenneth Moreland
bae6e5f4dd Merge topic 'filter-no-try-execute'
f4f5dcb74 Fix warnings about using template outside of a template
bcbad6100 Fix warnings about uninitalized value
bddad9b38 Remove TryExecute from filters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1419
2018-10-17 10:41:10 -04:00
Kenneth Moreland
f4f5dcb74c Fix warnings about using template outside of a template
Previously, UnitTestProbe used a struct templated on the device adapter,
and that necessitated the use of the template keyword when using an
ambiguous type. These recent changes remove that template argument and
thus can cause a warning about using the template keyword in a non-
ambiguous type.
2018-10-16 22:41:19 -06:00
Kenneth Moreland
bcbad61002 Fix warnings about uninitalized value
In some functors within Algorithm.h, the functor did not have a
default constructor that initialized its fields. This could in turn
lead to a warning about using it unitialized.
2018-10-16 17:19:49 -06:00
Kenneth Moreland
bddad9b386 Remove TryExecute from filters
Now that the dispatcher does its own TryExecute, filters do not need to
do that. This change requires all worklets called by filters to be able
to execute without knowing the device a priori.
2018-10-16 15:59:53 -06:00
Robert Maynard
4263db63e4 Document new requirements for VTK-m on windows ( cuda10+ ) 2018-10-16 17:30:49 -04:00
Robert Maynard
03e2e721ec Merge topic 'correct_ppp2_compile_failures'
a423cf056 TestBuild header paths are shorter to make windows happy.
e49e21aea Cleanup more of contourtree_augmented to make windows builders happy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1424
2018-10-16 16:16:47 -04:00
Robert Maynard
a423cf056c TestBuild header paths are shorter to make windows happy.
ContourTreeAugumneted paths became too long and caused msvc
to fail to construct pdb paths
2018-10-16 15:01:39 -04:00
Kenneth Moreland
c597bab56f Merge topic 'virtual-integrator'
f3b923a59 Temporarily remove UnitTestParticleAdvection.cxx from CUDA tests
723792a48 Use new integrators and evaluators for advection
d49c29cef Make particle advection integrators and evaluators ExecObject
a2602183a Make integrators have a virtual superclass

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1315
2018-10-16 14:48:15 -04:00
Kenneth Moreland
f3b923a597 Temporarily remove UnitTestParticleAdvection.cxx from CUDA tests
The CUDA compiler is giving us grief while compiling
UnitTestParticleAdvection.cxx even though the code is correct. Disable
it for now until we figure out what can be done with the compiler.
2018-10-16 10:42:45 -06:00
Kenneth Moreland
723792a482 Use new integrators and evaluators for advection 2018-10-16 09:53:18 -06:00
Kenneth Moreland
d49c29cef9 Make particle advection integrators and evaluators ExecObject
By making these helper classes ExecObject, they no longer need to have a
device to be constructed. This is important for future plans to make the
filters not determine a device adapter now that dispatchers no longer
require a device adapter.
2018-10-16 09:53:18 -06:00
Kenneth Moreland
a2602183a4 Make integrators have a virtual superclass
This will make it easier to support integrators as an ExecObject.

One side effect is that the integrators and partical advection
are not templated by the type of the field.
Regardless of the type of the field, there is probably little reason to
compute particle advection with less than 64 bit floats to account for
accumulated errors. This will make it easier to use these classes.
2018-10-16 09:53:18 -06:00
Robert Maynard
e49e21aea4 Cleanup more of contourtree_augmented to make windows builders happy 2018-10-16 10:30:57 -04:00
Robert Maynard
56121b1018 Merge topic 'build_some_virtual_object_handle_into_vtkm_cont'
45422478c Refactor VirtualObjectHandle to support new virtual design
ab25b4228 Cleanup the documentation in ErrorBadDevice

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1415
2018-10-16 10:29:34 -04:00
Robert Maynard
45422478cf Refactor VirtualObjectHandle to support new virtual design 2018-10-15 17:38:54 -04:00
Robert Maynard
ab25b4228e Cleanup the documentation in ErrorBadDevice 2018-10-11 08:11:43 -04:00
Allison Vacanti
e1b4250ceb Merge topic 'loguru_fixups'
6fb879ec2 Fix typo in logging docs.
be0db4b02 Add parameter-less InitLogging().

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1431
2018-10-10 16:35:55 -04:00
Allison Vacanti
6fb879ec20 Fix typo in logging docs. 2018-10-10 15:39:13 -04:00
Allison Vacanti
be0db4b021 Add parameter-less InitLogging().
Also document that this function should only be called from a
single thread.
2018-10-10 15:39:03 -04:00
Allison Vacanti
16c4dde2ee Merge topic 'cuda10_warning'
0e105eae6 cudaPointerAttributes::isManaged deprecated in CUDA 10.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1430
2018-10-10 15:05:57 -04:00
Allison Vacanti
0e105eae6d cudaPointerAttributes::isManaged deprecated in CUDA 10.
Update code to support both the old and new way of checking this.
2018-10-10 13:51:56 -04:00
Haocheng LIU
b5dc6b2f4c Merge topic 'split-sharp-edges'
246a58309 Add a split sharp edge worklet and filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1416
2018-10-10 09:49:14 -04:00
Haocheng LIU
246a58309c Add a split sharp edge worklet and filter
It's a filter that Split sharp manifold edges where the feature angle
between the adjacent surfaces are larger than the threshold value.
When an edge is split, it would add a new point to the coordinates
and update the connectivity of an adjacent surface.
Ex. there are two adjacent triangles(0,1,2) and (2,1,3). Edge (1,2) needs
to be split. Two new points 4(duplication of point 1) an 5(duplication of point 2)
would be added and the later triangle's connectivity would be changed
to (5,4,3).
By default, all old point's fields would be copied to the new point.
Use with caution.
2018-10-09 15:33:47 -04:00
Kenneth Moreland
6543942568 Merge topic 'better-test-macros'
899b93ec2 Allow variable arguments to VTKM_TEST_ASSERT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1429
2018-10-08 12:11:13 -04:00