Commit Graph

5864 Commits

Author SHA1 Message Date
Kenneth Moreland
7993c2b353 Merge topic 'parse-some-options-in-initialize'
31b30dbd9 Update arguments to benchmarks
b0303c96e Allow Initialize to parse only some arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1603
2019-03-27 12:43:58 -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
Sujin Philip
34a49234cb Merge topic 'fix-cellset-permutation'
048cbda5e Simplify CellSetPermutation PointToCell

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1599
2019-03-27 08:28:48 -04:00
Robert Maynard
79ca830600 Merge topic 'CheckSourceInInstall_now_handles_dirty_build_dirs'
99727164a CheckSourceInInstall correctly installs current vtk-m files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1606
2019-03-26 16:39:34 -04:00
Dave Pugmire
43edb07247 Merge topic 'temporal_particleadvection_filter'
c0b150a77 Merge branch 'temporal_particleadvection_filter' of gitlab.kitware.com:dpugmire/vtk-m into temporal_particleadvection_filter
b211bef81 Modify method names to clarify intent.
283ad7800 Cleanup.
04487965e Create a pathline filter.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1602
2019-03-26 16:05:24 -04:00
Robert Maynard
5a0fc2346c Merge topic 'update_cmake+policy_version'
0ce7e82d4 VTK-m now enables all new CMake policies in 3.14

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1604
2019-03-26 15:18:22 -04:00
Allison Vacanti
0581b368fd Fix issues with importing installed vtkm::cuda after refactor. 2019-03-26 14:53:42 -04:00
Diy Upstream
ed4374b05d diy 2019-03-13 (e8e68c7c)
Code extracted from:

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

at commit e8e68c7cd2f362e706f11542a3408baa039de5e8 (for/vtk-m).
2019-03-26 14:53:42 -04:00
Allison Vacanti
b85dcf2294 Add more vtkm_cont compilation units to device_sources.
These depend on DeviceAdapterTagCuda::IsEnabled being correctly
set at compile time.
2019-03-26 14:53:42 -04:00
Allison Vacanti
9014de0ebf Suppress new host/device warnings for cuda 10.1. 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
Kenneth Moreland
31b30dbd9d Update arguments to benchmarks
With the functionality of vtkm::cont::Initialize's argument handling
improved, parse the arguments of benchmarks better.
2019-03-26 12:04:31 -06:00
Kenneth Moreland
b0303c96ed Allow Initialize to parse only some arguments
When a library requires reading some command line arguments through a
function like Initialize, it is typical that it will parse through
arguments it supports and then remove those arguments from argc and argv
so that the remaining arguments can be parsed by the calling program.
VTK-m's initialize did not do that, so add that functionality.
2019-03-26 12:04:18 -06:00
Robert Maynard
99727164a6 CheckSourceInInstall correctly installs current vtk-m files
Previously we didn't realize that the cmake_install.cmake files
would properly walk the entire install tree. Therefore we would try
to find each one manually and invoke it. This caused problems with
dirty continuous build directories, and was actually unneeded as
just including the root cmake_install.cmake is sufficient.
2019-03-26 13:22:04 -04:00
Sujin Philip
048cbda5e1 Simplify CellSetPermutation PointToCell
These changes are required to enable 'CellSetPermutaion' of custom cell-set
types like 'vtkmCellSetExplicit' and 'vtkmCellSetSingleType' in VTK.
2019-03-26 13:07:11 -04:00
Dave Pugmire
c0b150a776 Merge branch 'temporal_particleadvection_filter' of gitlab.kitware.com:dpugmire/vtk-m into temporal_particleadvection_filter 2019-03-26 11:56:33 -04:00
Dave Pugmire
b211bef814 Modify method names to clarify intent. 2019-03-26 11:53:40 -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
Robert Maynard
d1a957bf5c Merge topic 'refactor_runtime_device_tracker'
838cb4337 Redesign RuntimeDeviceTracker and RuntimeDeviceInformation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1600
2019-03-26 10:08:31 -04:00
Dave Pugmire
283ad78007 Cleanup. 2019-03-26 09:48:17 -04:00
Robert Maynard
838cb43375 Redesign RuntimeDeviceTracker and RuntimeDeviceInformation
The RuntimeDeviceTracker had grown organically to handle multiple
different roles inside VTK-m. Now that we have device tags
that can be passed around at runtime, large portions of
the RuntimeDeviceTracker API aren't needed.

Additionally the RuntimeDeviceTracker had a dependency on knowing
the names of each device, and this wasn't possible
as that information was part of its self. Now we have moved that
information into RuntimeDeviceInformation and have broken
the recursion.
2019-03-26 08:36:18 -04:00
Allison Vacanti
ad15ae1553 Merge topic 'Variant_As'
e1f5c4dd9 Modify VariantAH::AsVirtual to cast to new ValueType if needed.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1585
2019-03-25 16:39:39 -04:00
Dave Pugmire
f96568103e Merge topic 'rename_ghost_zone_filters'
e968af9c8 zone --> cell
83e81c5e0 Rename ghost cell filters.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1601
2019-03-25 16:14:45 -04:00
Dave Pugmire
04487965e1 Create a pathline filter. 2019-03-25 16:10:58 -04:00
Abhishek Yenpure
02af238c69 Merge topic 'temporal_particle_advect'
525317249 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into temporal_particle_advect
2c1d3ee51 Updating example with new interfaces
cb8ea7dff Adding missing APIs
a7510a3c0 Fixing out of seq init warning
f3f2469b8 Adding direct constructor and vtkm::Lerp
2daf18956 Updating copyright for Unit Test
eca618e10 Fixing typos
be80dcc1a Adding changes for temporal advection, and adding test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !1590
2019-03-25 13:47:36 -04:00
Allison Vacanti
e1f5c4dd9b Modify VariantAH::AsVirtual to cast to new ValueType if needed.
E.g:

```
    ArrayHandle<Float64> doubleArray;
    VariantArrayHandle varHandle{doubleArray};
    ArrayHandleVirtual<Float32> = varHandle.AsVirtual<Float32>();
```

If there is a loss in range and/or precision, a warning is logged. If
the ValueTypes are Vecs with mismatched widths, an ErrorBadType is thrown.
Internally, an ArrayHandleCast is used between the VariantArrayHandle's
stored array and the ArrayHandleVirtual.
2019-03-25 11:39:45 -04:00
Li-Ta Lo
2cd90f94ad Merge topic 'connected_component'
9b479c8e1 finish the change log for connected component filters
84351eff6 Merge branch 'master' into connected_component
cbd04b4be minor change based on code review feedback
d3caf6dfb add a newline at the end of file
02cfb0dc4 add unit tests for CellSetConnective filter
045da86e4 add unit test for image connectivity filter
a6d2fe561 add newline at the end of file
df5420d19 Merge branch 'master' into connected_component
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1581
2019-03-25 10:36:11 -04:00
Dave Pugmire
e968af9c82 zone --> cell 2019-03-25 09:11:02 -04:00
Dave Pugmire
83e81c5e0b Rename ghost cell filters. 2019-03-25 09:08:16 -04:00
Li-Ta Lo
9b479c8e12 finish the change log for connected component filters 2019-03-24 23:22:55 -06:00
Li-Ta Lo
84351eff6d Merge branch 'master' into connected_component 2019-03-24 10:13:32 -06:00
Robert Maynard
256e0c3c11 Merge topic 'rename_to_GetRuntimeDeviceTracker'
ae11e115a RuntimeDeviceTracker: Remove `Global` from names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1592
2019-03-24 08:17:02 -04:00
ayenpure
5253172492 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into temporal_particle_advect 2019-03-23 21:52:51 -07:00
Kenneth Moreland
b8d9040a39 Merge topic 'rename-ghost-cell-classification'
b81b2f817 Make CellClassification more clear

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !1597
2019-03-23 12:39:06 -04:00
ayenpure
2c1d3ee51e Updating example with new interfaces 2019-03-22 10:18:32 -07:00
Sujin Philip
96f4a17e4f Merge topic 'improve-cellset-api'
a09bb9eca Add a new test for CellSet API
8868fb989 Improve CellSet API

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1589
2019-03-22 12:52:31 -04:00
Kenneth Moreland
b81b2f817f Make CellClassification more clear
Previously, the CellClassification enum was stored in a header file
named GhostCell.h, which made it hard to find and obscured its purpose.
Moved it to an appropriately named file. Also, renamed the DUPLICATE
field to GHOST to make its intention more clear.
2019-03-22 10:49:06 -06:00
Kenneth Moreland
7fdc01a520 Merge topic 'fix-particle-advection-example'
fd794edb3 Fix particle advection example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !1596
2019-03-22 12:31:45 -04:00
Robert Maynard
ae11e115a0 RuntimeDeviceTracker: Remove Global from names 2019-03-22 08:53:26 -07:00
Sujin Philip
a09bb9eca3 Add a new test for CellSet API 2019-03-22 09:35:57 -04:00
ayenpure
cb8ea7dffd Adding missing APIs 2019-03-21 16:42:55 -07:00
Kenneth Moreland
fd794edb36 Fix particle advection example
The grid evaluator class structure changed.
2019-03-21 13:58:42 -06:00
Kenneth Moreland
07fe1060a0 Merge topic 'bounding-interval-hierarchy-in-vtkm-cont'
5960b8abf Suppress nvlink warnings about virtual methods not used
0af017b03 Move virtual methods of other CellLocators to vtkm_cont
e87864b0e Put CellLocatorBoundingIntervalHierarchy in vtkm_cont library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1594
2019-03-21 13:41:06 -04:00
Kenneth Moreland
5960b8abf1 Suppress nvlink warnings about virtual methods not used
Any time there is a CUDA device class that has virtual methods,
nvlink will issue a warning if the resulting library is linked
into code that does not use that method, so we basically have
to suppress these warnings for any execution environment class
with virtual methods.
2019-03-21 07:48:59 -06:00
Dave Pugmire
8c27ec54f4 Merge topic 'particleAdvect_type_fix'
17a7decc6 Replace use of Float32 with FloatDefault

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1591
2019-03-21 08:19:49 -04:00
Kenneth Moreland
0af017b038 Move virtual methods of other CellLocators to vtkm_cont
These changes caused some warnings in clang to show up based on virtual
methods in other cell locators. Hence, the rest of the cell locators
have also had some of their code moved to vtkm_cont.
2019-03-20 17:38:50 -06:00
Kenneth Moreland
e87864b0e3 Put CellLocatorBoundingIntervalHierarchy in vtkm_cont library
All of the methods in CellLocatorBoundingIntervalHierarchy were listed in
header files. This is sometimes problematic with virtual methods. Since
everything implemented in it can just be embedded in a library, move the
code into the vtkm_cont library.
2019-03-20 17:33:08 -06:00
ayenpure
a7510a3c05 Fixing out of seq init warning 2019-03-20 14:35:36 -07:00
ayenpure
f3f2469b87 Adding direct constructor and vtkm::Lerp 2019-03-20 14:07:20 -07:00
Robert Maynard
a7beb532ea Merge topic 'better_3dschedule_for_summit'
6cdf6cb67 Less aggressive defaults for VTK-m compared to summit.
387947918 Improve VTK-m cuda scheduling based on Summit scaling study

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1576
2019-03-20 16:54:19 -04:00