Commit Graph

5185 Commits

Author SHA1 Message Date
Hank Childs
9b46a0f026 fix cast warning 2019-09-29 12:03:15 -07:00
Hank Childs
8a175e0455 fix warning about cast 2019-09-29 11:34:39 -07:00
Robert Maynard
445e4d8186 vtkm::cont::Invoker supports both Masks and Scatter
Fixes #420
2019-09-27 17:11:18 -04:00
Allison Vacanti
b2daec0e35 Stick with brigand sequences for CUDA device passes.
The tao ones won't compile otherwise. This should be okay, since these
are all just compile time helpers on host-only functions -- they won't
generate different sized data structures etc if we mix them in the
same build.
2019-09-27 17:02:19 -04:00
Hank Childs
440c15ea97 explicitly add header; addresses nasty issue due to robot autoformat 2019-09-27 13:23:20 -07:00
Hank Childs
c3fd04c498 remove trailing whitespace 2019-09-27 12:42:10 -07:00
Hank Childs
3abfea0532 remove unneeded comments 2019-09-27 12:36:53 -07:00
Hank Childs
dade683eab Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into relative-size-foundations 2019-09-27 12:34:26 -07:00
Hank Childs
dd57d20231 incorporate Steven's RSS fix 2019-09-27 07:57:20 -07:00
Hank Childs
1e4e60f5ab Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into relative-size-foundations 2019-09-27 07:30:46 -07:00
Kenneth Moreland
476800fe48 Have MeshQuality use the superclass' SetOutputFieldName
Previously MeshQuality defined its own SetOutputName method which broke
convention as was confusing. Deleted the output name defined in
MeshQuality and instead use the one defined in the superclass.
2019-09-26 19:28:13 -06:00
Kenneth Moreland
216335ab41 Have MeshQuality inherit from FilterField instead of FilterCell
FilterCell is a depricated type and will be removed at some point. It
serves no purpose over FilterField.
2019-09-26 19:23:28 -06:00
Hank Childs
38c00e0571 incorporate Steven changes 2019-09-26 17:20:01 -07:00
Hank Childs
8a916ef546 fix mistake with volume 2019-09-25 16:52:59 -07:00
Hank Childs
9084b6dcbe infrastructure for rss 2019-09-25 16:46:39 -07:00
Kenneth Moreland
82a58c2f0a Fix error with whitespace at end of file
The VTK file reader caused an error to be thrown when reading a file
that had a METADATA section at the end of the file. The problem was that
the METADATA section had some whitespace after its last line (which is
probably typical). This caused an eof check to pass and then a
subsequent search for a token to fail.

The solution was to eat the whitespace after the METADATA section to get
the reader at the next token or in eof condition if it is at the end of
the file.
2019-09-25 16:20:20 -06:00
Brad King
9a906e4cbf Merge topic 'use-vtkc'
e08d862f9 Use Light-Weight Cell Library
e56b34fc9 Merge branch 'upstream-vtkc' into use-vtkc
e909edd61 vtkc 2019-09-24 (cdc72582)
2a6aadc69 Add update file for VTK-c

Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1852
2019-09-25 09:21:00 -04:00
Sujin Philip
e08d862f94 Use Light-Weight Cell Library 2019-09-24 21:22:10 -04:00
Sujin Philip
e56b34fc98 Merge branch 'upstream-vtkc' into use-vtkc
* upstream-vtkc:
  vtkc 2019-09-24 (cdc72582)
2019-09-24 21:21:40 -04:00
Hank Childs
e106dc6bff changes from peer review 2019-09-24 18:12:52 -07:00
Hank Childs
f4229c2e9d change variable half to be hhalf to prevent collision with NVIDIA global var 2019-09-23 23:35:03 -07:00
Hank Childs
c75fdeef6a massage float/double cast issue 2019-09-23 23:26:12 -07:00
Hank Childs
fcc169fdf0 finish copying over changes from failed firs git 2019-09-23 22:30:49 -07:00
Hank Childs
8af25aca48 move cellmetrics to worklet 2019-09-23 22:27:12 -07:00
Sujin Philip
2a6aadc691 Add update file for VTK-c 2019-09-21 16:30:39 -04:00
Matt Larsen
8edfd8eba8 using vtkm aligned union for all intel compilers 2019-09-21 12:13:48 -07:00
Kenneth Moreland
2103d61432 Merge topic 'fix-map-field-cast-and-call'
40ad32569 Fix policy use in FilterDataSet::MapFieldOntoOutput

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1859
2019-09-19 21:33:22 -04:00
Robert Maynard
99cbbf2ff2 Correct a regression in ArrayHandleDecorator with VisualStudio 2017 2019-09-19 18:35:20 -04:00
Kenneth Moreland
40ad325699 Fix policy use in FilterDataSet::MapFieldOntoOutput
In FilterDataSet::MapFieldOntoOutput, it was getting each field to map
using the traits reserved for the active field. However, when mapping a
field outside of the DoExecute, we want to consider a broader set of
types.
2019-09-19 10:59:19 -05:00
Robert Maynard
e93ce607fa Increase VecTraits GCC workaround to be for all GCC 4 and 5 versions 2019-09-19 11:54:44 -04:00
Robert Maynard
72739144f1 Merge topic 'correct_gcc48_compiler_crashes'
a46a83cc2 GCC 4.8 now correctly compiles ArrayHandleDecorator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1857
2019-09-19 11:41:15 -04:00
Robert Maynard
a46a83cc2a GCC 4.8 now correctly compiles ArrayHandleDecorator 2019-09-19 09:10:00 -04:00
Roxana Bujack
3b2fb5c8ab Merge topic 'realRadiusFix'
9c41daa2b change input to spacing and radius to make it more intuitive
b991d3c6b merge style differences
7d0ee16fd add the real double radius for scaling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1825
2019-09-18 16:36:43 -04:00
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
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
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
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
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
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
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
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
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
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
18b09791ee All export macros use the VTK_M_*_EXPORT pattern
This makes it easier to maintain doxygen suppressions for them
2019-09-12 17:29:05 -04:00
Robert Maynard
f2a3ecd014 Don't generate doxygen for serialization helpers 2019-09-12 17:29:05 -04:00
Robert Maynard
fd4bcd8093 Move PolicyExtrude into the correct vtk-m namespace 2019-09-12 17:29:05 -04:00
Roxana Bujack
9c41daa2bd change input to spacing and radius to make it more intuitive 2019-09-12 14:17:20 -06:00
Allison Vacanti
627cdc99b7 Fix host/device flags.
ArrayHandles don't exist in the execution environment, and functions
that use them must be marked `VTKM_CONT`.
2019-09-12 14:54:44 -04:00
Nickolas Davis
adb6bc4c37 Change StackTrace failure condition in UnitTestError.cxx 2019-09-12 14:37:55 -04:00
Allison Vacanti
7148ab3425 Fix type conversion warning when size_t differs from vtkm::Id. 2019-09-12 13:56:43 -04:00
Oliver Ruebel
1d9f6b37cf Add support for boundary augmentation for MPI optimization 2019-09-12 12:26:01 -04:00
Sujin Philip
2a1e1dcfd9 Parallel Contour Tree
This work updates Gunther Contour tree work to be parallel.
With contributions from: @oruebel, @dcamp and @sujin.philip.
2019-09-12 12:17:37 -04:00
Li-Ta Lo
d8cbc990f5 Merge topic 'tangle_source'
05b679250 Merge branch 'master' into tangle_source
a6c044df9 added changelog
0d818701c put VTKM_SOURCE_EXPORT in .cxx
e0aae7d86 remove EXPORT from .cxx
4d7de67ee use VTKM_SOURCE_EXPORT
cd49136d5 add copyright notice, add installation of header
0c094a568 used the Tangle source
aeb8877a9 add newline at EOF, minor change based review
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1804
2019-09-12 11:18:52 -04:00
nadavi
e3ab59fb2f limit the count to the actual number of function calls 2019-09-11 16:12:18 -06:00
nadavi
b71421c8a0 have Run() take int references (so that multiple calls with argc will allow loguru to correctly modify the value) 2019-09-11 16:12:18 -06:00
nadavi
8917bbe72b Supply the default log level only through cmake args 2019-09-11 16:12:18 -06:00
nadavi
a0b164b42c remove static var, directly init logging to INFO level for testing inside Run Function 2019-09-11 16:12:18 -06:00
nadavi
374989fc2c remove duplicate include 2019-09-11 16:12:18 -06:00
nadavi
325c75fd70 store What as a member var 2019-09-11 16:12:18 -06:00
nadavi
ede1f78323 something is still fishy 2019-09-11 16:12:18 -06:00
nadavi
ac0faa3d97 different strack traces for different machines 2019-09-11 16:12:18 -06:00
nadavi
a7aae5fc3c rely solely on the SetStderrLogLevel function call instead of manually passing in -v flag 2019-09-11 16:12:18 -06:00
nadavi
3449f2dfb7 fix warning, only declare variable if logging is set 2019-09-11 16:12:18 -06:00
nadavi
7d8158301b something was overwritten... 2019-09-11 16:12:18 -06:00
nadavi
9f49bbab86 additional cmake fixes, improve default log level setting 2019-09-11 16:12:18 -06:00
nadavi
1fc542d068 add simple unit tests for Error 2019-09-11 16:12:18 -06:00
Nick Davis
f9a1afee69 store StackTrace in Error 2019-09-11 16:12:18 -06:00
Nick Davis
7562949075 Turned on Logging by default, set to WARNING level 2019-09-11 16:12:18 -06:00
Dave Pugmire
c98a06071a Merge topic 'particleAdvectionFloatType'
58a587a7f Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into particleAdvectionFloatType
a83629e95 compile error.
52fe3c403 compile warnings.
5af465efd Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into particleAdvectionFloatType
bd9bc91ac Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into particleAdvectionFloatType
c057f6b83 Merge branch 'particleAdvectionFloatType' of gitlab.kitware.com:dpugmire/vtk-m into particleAdvectionFloatType
9ca4cc2d0 type cleanup.
dff384572 Use vtkm::FloatDefault for particle advection code.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1827
2019-09-11 14:59:56 -04:00
Allison Vacanti
f8c60bd958 Merge topic '412_ArrayHandleDecorator'
885cce391 Add ArrayPortalDecorator.
29ea46fa5 Refactor IsWritableArrayHandle to use PortalSupportsSets.
dc98517b9 Clean up ArrayHandleCounting.
0dad55a04 Remove return statements in functions that return void.
abdd458b8 Remove unused member variable in Algorithm functor.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1828
2019-09-11 14:34:57 -04:00
Li-Ta Lo
05b6792500 Merge branch 'master' into tangle_source 2019-09-11 12:06:58 -06:00
Robert Maynard
f139d07c89 Merge topic 'rework_ghost_cell_classify_alg'
8c3a8da99 GhostCellClassify now more efficient as it uses WorkletPointNeighborhood

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !1835
2019-09-11 13:06:21 -04:00
Allison Vacanti
885cce3914 Add ArrayPortalDecorator. 2019-09-11 12:50:59 -04:00