Commit Graph

6750 Commits

Author SHA1 Message Date
Robert Maynard
4faf1bf0b8 Merge topic 'build_filter_lib'
8520d70e0 Compile most frequently used VTK-m filters into a library
d1d61b9eb vtkm::filter::Filter passes filter policies by value
4ff021b08 Improve VTK-m compilation times by compiling more keys<T> types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1836
2019-09-18 15:01:39 -04:00
Robert Maynard
42e89a3355 Merge topic 'require_cmake_312_for_openmp'
e6a2089d8 Require CMake 3.12+ for using OpenMP backend

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1856
2019-09-18 14:05:48 -04:00
Robert Maynard
7533f90d9b Merge topic 'improve_vtkm_sources'
3ef234ef1 Move Oscillator to the sources directory
5c69f1bae Update Wavelet to use WorkletVisitPointsWithCells
62357dea0 Tangle source has better runtime performance
eb3d86654 Add a test explicitly for vtkm::source::Tangle
63f243809 Add vtkm::source::Wavelet as a new source
257dc1f84 Sources have a more consistent API and internal style.
2d455bbef Document what the Tangle source will generate

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1850
2019-09-18 14:05:11 -04:00
Allison Vacanti
9775e223a6 Merge topic 'portal_set_cleanup'
7e01edb01 Ensure that Portal::Set isn't defined for read-only portals.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1848
2019-09-18 12:45:24 -04:00
Hank
0eb767dc5f Merge topic 'jacobian-cellmetric'
f9d02b374 remove file that should not have been checked in
d59917473 rename half variable to avoid shadowing CUDA global
954e25874 fix problem with filename
91f7e763b fix copyright, warnings, cmake for Jacobian-cellmetric branch
e040ea05e formatting suggestions from KMorel
f4edb6a8e remove trailing whitespace
ccedb5aac Jacobian working, unit test working
560aa1f67 add support for outputname
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1855
2019-09-18 12:08:39 -04:00
Robert Maynard
8520d70e0d Compile most frequently used VTK-m filters into a library
VTK-m now provides the following filters with the default policy
as part of the vtkm_filter library:
  - CellAverage
  - CleanGrid
  - ClipWithField
  - ClipWithImplicitFunction
  - Contour
  - ExternalFaces
  - ExtractStructured
  - PointAverage
  - Threshold
  - VectorMagnitude

By building these as a library we hope to provide faster compile
times for consumers of VTK-m when using common configurations.
2019-09-18 12:06:13 -04:00
Hank Childs
f9d02b3742 remove file that should not have been checked in 2019-09-18 08:32:21 -07:00
Robert Maynard
e6a2089d8e Require CMake 3.12+ for using OpenMP backend 2019-09-18 07:59:32 -04:00
Hank Childs
d59917473d rename half variable to avoid shadowing CUDA global 2019-09-17 23:12:23 -07:00
Hank Childs
954e258745 fix problem with filename 2019-09-17 21:31:50 -07:00
Hank Childs
91f7e763bc fix copyright, warnings, cmake for Jacobian-cellmetric branch 2019-09-17 21:15:41 -07:00
Hank Childs
e040ea05e1 formatting suggestions from KMorel 2019-09-17 20:53:42 -07:00
Hank Childs
f4edb6a8ed remove trailing whitespace 2019-09-17 14:46:51 -07:00
Hank Childs
ccedb5aac1 Jacobian working, unit test working 2019-09-17 13:41:53 -07:00
Robert Maynard
d1d61b9ebc vtkm::filter::Filter passes filter policies by value
It now follows the same pattern that all filter implementations use
2019-09-17 13:50:58 -04:00
Dan Lipsa
bde772659a Merge topic 'fix-contour-tree-example'
542cca20d Rename MultiBlock to PartitionedDataSet in comment.
c05efcac8 Fix MultiBlock rename for ContourTree example.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1853
2019-09-17 13:37:20 -04:00
Dan Lipsa
542cca20db Rename MultiBlock to PartitionedDataSet in comment. 2019-09-17 13:19:04 -04:00
Dan Lipsa
c05efcac83 Fix MultiBlock rename for ContourTree example. 2019-09-17 11:42:19 -04:00
Hank Childs
560aa1f673 add support for outputname 2019-09-16 20:48:55 -07:00
Hank Childs
ed15f684ea overhaul workings of mesh quality filter. Unit test a little rocky right now, but heading in the right direction 2019-09-16 17:19:18 -07:00
Robert Maynard
3ef234ef13 Move Oscillator to the sources directory 2019-09-16 12:36:01 -04:00
Robert Maynard
d366ed6294 Merge topic 'label_tets_based_on_device_adapter'
5c56ff945 Label tests which exercise a given Device Adapter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1851
2019-09-13 17:07:04 -04:00
Robert Maynard
4ff021b086 Improve VTK-m compilation times by compiling more keys<T> types
We have split the compilation of the different `vtkm::worklet:Keys`
types over multiple implementation units to improve parallel build
performance.
2019-09-13 16:17:11 -04:00
Robert Maynard
5c69f1bae9 Update Wavelet to use WorkletVisitPointsWithCells
The Wavelet worklet doesn't need a custom scheduler but
can use WorkletVisitPointsWithCells
2019-09-13 16:11:14 -04:00
Robert Maynard
62357dea0f Tangle source has better runtime performance
By leveraging WorkletVisitPointsWithCells we can get already
pre-computed i,j,k locations helping with performance

In addition we have made the algorithm easier to read by
leveraging VTK-m Vec types.
2019-09-13 16:11:14 -04:00
Robert Maynard
eb3d866548 Add a test explicitly for vtkm::source::Tangle 2019-09-13 16:11:14 -04:00
Robert Maynard
63f2438098 Add vtkm::source::Wavelet as a new source
The Wavelet source creates a dataset similar to VTK's vtkRTAnalyticSource.
2019-09-13 16:11:14 -04:00
Robert Maynard
5c56ff945f Label tests which exercise a given Device Adapter
This allows developers an easy way to run all OpenMP tests
2019-09-13 15:52:40 -04:00
Robert Maynard
cf6c85735a Merge topic 'ghost_cell_classify_dont_timeout'
284929fd6 GhostCellClassify uses smaller dataset size so it doesn't timeout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1847
2019-09-13 15:05:07 -04:00
Robert Maynard
dcf614b34d Merge topic 'ArrayHandleCartesianProduct_works_with_implicit_array_handles'
93e638ce4 ArrayHandleCartesianProduct can be used with implicit handles

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1842
2019-09-13 15:04:12 -04:00
Allison Vacanti
7e01edb017 Ensure that Portal::Set isn't defined for read-only portals.
This patch removes (or conditionally removes) the Set method from
portals that are read-only so that IsWritableArrayHandle will work as
expected. The ArrayPortal doxygen has been updated to reflect this.

The remaining exceptions are `ArrayPortalVirtual` and
`ArrayPortalMultiplexer`, since their mutability cannot be determined at
compile time.
2019-09-13 13:00:24 -04:00
Nickolas Davis
3d6a7b78ae Merge topic 'minor-logging-updates'
f505f2ae7 update Logging file documentation to reference new default vtk-m logging behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1849
2019-09-13 12:18:39 -04:00
nadavi
f505f2ae75 update Logging file documentation to reference new default vtk-m logging behavior 2019-09-13 10:15:37 -06:00
Robert Maynard
284929fd6a GhostCellClassify uses smaller dataset size so it doesn't timeout
The really large dataset size caused timeouts for the serial
test when built in debug mode.
2019-09-13 11:39:09 -04:00
Nickolas Davis
f19503b5ee Merge topic 'fix-examples'
645523188 fix some examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1839
2019-09-13 11:14:45 -04:00
nadavi
6455231882 fix some examples 2019-09-13 08:52:02 -06:00
Robert Maynard
23b73103e0 Merge topic 'improve_doxygen'
485df972f Update the documentation on the different VTK-m namespaces
d29f5ba37 Update doxyfile to suppress documenting unnecessary components.
18b09791e All export macros use the `VTK_M_*_EXPORT` pattern
f2a3ecd01 Don't generate doxygen for serialization helpers
fd4bcd809 Move PolicyExtrude into the correct vtk-m namespace

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1843
2019-09-13 10:28:27 -04:00
Allison Vacanti
a6bcd820aa Merge topic 'template_before_macros'
d872e1061 Move template <...> decl before VTKM_EXEC_CONT.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1846
2019-09-13 10:26:36 -04:00
Robert Maynard
93e638ce4b ArrayHandleCartesianProduct can be used with implicit handles
Previously it presumed that all the underlying Portals supported
a `Set` method.
2019-09-13 10:26:32 -04:00
Allison Vacanti
d872e1061f Move template <...> decl before VTKM_EXEC_CONT.
This isn't necessarily a problem, but for consistency's sake I want to
move it to match the rest of the code.
2019-09-13 10:22:30 -04:00
Robert Maynard
257dc1f84e Sources have a more consistent API and internal style.
`vtkm::source::Source` now uses virtual inheritance for
the `Execute` method. This will allow us to enforce that
all vtkm::source have a consistent calling convention.

To make the code inside filters and sources more similar the
base `vtkm::source::Source` class has a `vtkm::cont::Invoker`
as a member variable. This will allow sources to use the
`this->Invoke()` pattern that filters use to launch worklets.
2019-09-13 10:22:25 -04:00
Robert Maynard
60e6ef4bee Merge topic 'correct_cuda_10-1_warnings'
bc7812687 CUDA 10.1 didn't fix stateless_resource_allocator warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1844
2019-09-13 10:17:54 -04:00
Allison Vacanti
e110de0486 Merge topic 'oliver_parallel'
627cdc99b Fix host/device flags.
7148ab342 Fix type conversion warning when `size_t` differs from `vtkm::Id`.
1d9f6b37c Add support for boundary augmentation for MPI optimization
2a1e1dcfd Parallel Contour Tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1737
2019-09-13 09:58:24 -04:00
Robert Maynard
2d455bbef8 Document what the Tangle source will generate 2019-09-13 08:12:22 -04:00
Robert Maynard
6c6c05fb97 Merge topic 'fix-gcc-4-8-ice'
785f7994c Fix VecTraits internal compile errors with GCC 4.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1845
2019-09-13 08:11:26 -04:00
Kenneth Moreland
785f7994c7 Fix VecTraits internal compile errors with GCC 4.8
GCC 4.8 seems to have issues with the templated using statements
in VecTraits. Hopefully this change works around that problem.
2019-09-12 18:12:02 -06:00
Robert Maynard
485df972f8 Update the documentation on the different VTK-m namespaces 2019-09-12 17:45:39 -04:00
Nickolas Davis
234d1ac751 Merge topic 'fix-unit-test-error'
adb6bc4c3 Change StackTrace failure condition in UnitTestError.cxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1840
2019-09-12 17:37:49 -04:00
Robert Maynard
bc78126876 CUDA 10.1 didn't fix stateless_resource_allocator warnings
The patch to fix this warning from thrust has not be approved
by upstream thrust. So keep suppressing it in CUDA 10.1 update 1
2019-09-12 17:36:12 -04:00
Robert Maynard
d29f5ba376 Update doxyfile to suppress documenting unnecessary components.
We don't want to have our thirdparty libraries doxygen in
the VTK-m doxygen. We also don't want to document internal classes,
and export macros.
2019-09-12 17:29:05 -04:00