Commit Graph

3734 Commits

Author SHA1 Message Date
Robert Maynard
9a1b44cc88 Merge topic 'update_osx_rtti_doc'
46d85146d Update the documentation on why VTKM_ALWAYS_EXPORT exists.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1293
2018-06-28 11:46:38 -04:00
Robert Maynard
46d85146d5 Update the documentation on why VTKM_ALWAYS_EXPORT exists. 2018-06-28 11:46:13 -04:00
Allison Vacanti
404939d6d4 Merge topic 'doxygen_fixes'
1e53b86ea Identifiers in doxygen @param blocks must appear in signature.
828bb3179 Silence expected doxygen warning.
6db40ae49 Newline needed after \file command.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1291
2018-06-28 11:35:43 -04:00
Allison Vacanti
0236595f94 Merge topic 'suppress_hd_warnings_for_atomics'
a8d8b3670 Suppress host/device warnings on CUDA atomics.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1286
2018-06-28 10:05:59 -04:00
Dave Pugmire
912d393b07 Merge topic 'coordSysFilter'
80b12e325 Merge branch 'coordSysFilter' of https://gitlab.kitware.com/dpugmire/vtk-m into coordSysFilter
ab5eeab18 Fixes for making the filters non-templated.
27dade145 Fixes for coordinate systems w/ help from Sujin.
db5ded3a6 Add files for coord sys transform filters.
17087a26a Filter for coordinate system transform.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1284
2018-06-28 05:23:21 -04:00
Allison Vacanti
1e53b86ea4 Identifiers in doxygen @param blocks must appear in signature. 2018-06-27 14:10:05 -04:00
Allison Vacanti
6db40ae496 Newline needed after \file command.
https://www.stack.nl/~dimitri/doxygen/manual/commands.html#cmdfile
2018-06-27 13:59:07 -04:00
Haocheng LIU
29fb7e4024 Fix the documentation in NDEntropy and NDhistogram filters 2018-06-26 11:19:00 -04:00
Allison Vacanti
a8d8b3670d Suppress host/device warnings on CUDA atomics. 2018-06-25 14:53:53 -04:00
dave_pugmire
80b12e3257 Merge branch 'coordSysFilter' of https://gitlab.kitware.com/dpugmire/vtk-m into coordSysFilter 2018-06-25 19:39:27 +02:00
dave_pugmire
ab5eeab18a Fixes for making the filters non-templated. 2018-06-25 19:29:18 +02:00
Robert Maynard
c44d010fee Merge topic 'array-handle-declare-writable'
5f807db2f Make IsWriteableArrayHandle independent of device

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1283
2018-06-25 08:36:04 -04:00
dave_pugmire
27dade1453 Fixes for coordinate systems w/ help from Sujin. 2018-06-24 16:29:20 -04:00
Kenneth Moreland
5f807db2ff Make IsWriteableArrayHandle independent of device
Previously, to query whether an ArrayHandle was writable with
IsWriteableArrayHandle, you had to specify a device adapter. The idea
was that it would look at the portal used for that device adapter.
Instead, check the control pointer, which should give the same
indication without having to have a separate check for every type of
device.
2018-06-23 15:34:30 -06:00
Sujin Philip
50248aec9c Fix implicit conversion loses floating-point precision warning 2018-06-22 13:45:42 -04:00
Dave Pugmire
db5ded3a68 Add files for coord sys transform filters. 2018-06-22 09:23:28 -04:00
Dave Pugmire
17087a26ad Filter for coordinate system transform. 2018-06-22 09:20:33 -04:00
Sujin Philip
94bf457da9 Merge topic 'add-ListTagAppend'
ecb46023f Add ListTagAppend and ListTagAppendUnique

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1278
2018-06-21 16:57:29 -04:00
Sujin Philip
ecb46023f6 Add ListTagAppend and ListTagAppendUnique 2018-06-21 15:59:31 -04:00
Robert Maynard
e99aa10ec8 Merge topic 'leverage_decltype_more_often'
dfadaabfb VTK-m Transport doesn't rely on 'ExecutionTypes' typedefs.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1272
2018-06-21 15:56:02 -04:00
Dave Pugmire
05143f633d Merge topic 'coordSysTransform'
74f8885d3 Move helper classes into detail namespace.
9fd821ed9 Template on DeviceAdapter.
961f6a585 Add coordinate system transformation.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1275
2018-06-21 13:48:46 -04:00
Dave Pugmire
74f8885d3b Move helper classes into detail namespace. 2018-06-21 10:46:07 -04:00
Dave Pugmire
9fd821ed92 Template on DeviceAdapter. 2018-06-21 10:00:13 -04:00
Shreeraj Jadhav
55eafbafee Merge topic 'Vec-constructors-constexpr'
947496550 constexpr construction for Vec classes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1254
2018-06-20 17:48:39 -04:00
Dave Pugmire
961f6a5851 Add coordinate system transformation. 2018-06-20 16:40:47 -04:00
David Thompson
d8cf1f7b51 Merge topic 'geometry-squashed'
880d8a989 Add `vtkm/Geometry.h` and test it.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1262
2018-06-20 14:15:50 -04:00
Shreeraj Jadhav
947496550e constexpr construction for Vec classes
Vec class objects can now be constructed during compile-time
as constant expressions by calling Vec( T, ... ) constructors
or through brace-initialization.
Constant expression using fill constructor and nested vectors
of sizes greater than 4 are not supported yet.
Changes made to WrappedOperators.h for resolving overload
ambiguities in Vec construction and typecasting.
Appropriate test cases were added to UnitTestTypes.cxx.
Addresses issue #199.
2018-06-20 14:15:29 -04:00
David Thompson
880d8a989e Add vtkm/Geometry.h and test it.
This commit adds several geometric constructs to vtk-m
in the `vtkm/Geometry.h` header. They may be used from
both the execution and control environments.

We also add methods to perform projection and Gram-Schmidt
orthonormalization to `vtkm/VectorAnalysis.h`.

See `docs/changelog/geometry.md` included in this commit
for more information.
2018-06-20 11:58:14 -04:00
Robert Maynard
dfadaabfb7 VTK-m Transport doesn't rely on 'ExecutionTypes' typedefs.
By using decltype we can allow for more flexible types and
remove the nasty '::template ' syntax.
2018-06-19 14:16:47 -04:00
Sujin Philip
0544ee6b71 Merge topic 'fix-vec-warnings'
d4f94d4e1 Fix Vec <T, sizeof...(Ts)> warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1269
2018-06-19 09:26:45 -04:00
James Kress
4fbb704601 Merge topic 'Create-Point-Filter'
4bdb6baa1 Adding PointTransform filter and updating PointTranform worklet.
429ad9705 Merge remote-tracking branch 'upstream/master'
1cdd59cfa Merge remote-tracking branch 'upstream/master'
d2abcfe89 Adding  copy and assignment operators.
3bdb8cb7c Merge remote-tracking branch 'upstream/master'
b25c8af97 Merge remote-tracking branch 'upstream/master'
26f9dc3c3 Merge remote-tracking branch 'upstream/master'
fef41372c Merge remote-tracking branch 'upstream/master'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !1265
2018-06-18 16:11:20 -04:00
Sujin Philip
d4f94d4e14 Fix Vec <T, sizeof...(Ts)> warnings
Several "conversion to ‘int’ from ‘long unsigned int’" are produced in gcc.
2018-06-18 14:44:35 -04:00
Robert Maynard
8276e35cf4 Mark classes that should not be derived from as final. 2018-06-15 10:49:59 -04:00
luz.paz
940c891886 Misc. typos
Found via `codespell` and `grep`
more typos

includes source typo change and a typo that needs further review
follow-up typos


Follow-up typos


Revert a commit
2018-06-14 16:49:11 -04:00
Kenneth Moreland
9fb6480866 Fix cross product filter interface
The GetPrimaryFieldName and GetPrimaryFieldAssociation methods were
returning values for the secondary field and vice versa. Correct that.
2018-06-14 12:18:08 -06:00
James
4bdb6baa1b Adding PointTransform filter and updating PointTranform worklet. 2018-06-14 12:23:22 -04:00
Haocheng LIU
fb62ed550d Add override keyword to CellSetStructured's member functions 2018-06-13 16:04:24 -04:00
Haocheng LIU
7c25841053 Merge topic 'Add-unload-execution-resources-CellSet'
86f22bf47 Add a release resources API to CellSet and its derived classes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1238
2018-06-12 14:40:39 -04:00
Haocheng LIU
86f22bf47f Add a release resources API to CellSet and its derived classes 2018-06-12 11:44:18 -04:00
Haocheng LIU
5393745ecd Allow histogram filter to take custom types
By passing TypeList and StorageList into FieldRangeGlobalCompute,
upstream users(VTK) can pass custom types into the histogram filter.
2018-06-11 17:10:24 -04:00
Robert Maynard
3126037306 Merge topic 'contour_tree_dont_define_DEBUG_PRINT'
7beb51568 VTK-m worklets no longer define DEBUG_PRINT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1259
2018-06-11 14:23:39 -04:00
Robert Maynard
7beb515687 VTK-m worklets no longer define DEBUG_PRINT
Fixes Issue #239
2018-06-11 13:41:49 -04:00
Allison Vacanti
cc631650c5 Use thrust::swap for vtkm::Swap in CUDA device code. 2018-06-11 12:27:54 -04:00
Kenneth Moreland
7158d56cdc Merge topic 'allocate-implicit-storage'
e62091a61 Add ability to "allocate" implicit storage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Haocheng LIU <haocheng.liu@kitware.com>
Merge-request: !1252
2018-06-11 11:11:56 -04:00
Allison Vacanti
02ce5abee5 Merge topic '238-restore_tbb_parallel_sort'
940fb6f05 Restore TBB parallel_sort.h patch.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1257
2018-06-11 09:28:14 -04:00
Robert Maynard
4aa479b078 Merge topic 'io_writer_copies_by_value_less_frequently'
8e38e383b VTKDataSetWriter now uses const ref wherever possible to reduce copies.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1246
2018-06-11 07:58:31 -04:00
Allison Vacanti
940fb6f05d Restore TBB parallel_sort.h patch. 2018-06-07 11:12:33 -04:00
Matt Larsen
45994bd452 Merge topic 'fix/multi_mapper'
2780bf4d removing extra ;
75f911cf Fixing default sample distance

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1255
2018-06-06 22:25:49 -04:00
mclarsen
2780bf4d37 removing extra ; 2018-06-06 15:17:25 -07:00
mclarsen
75f911cf77 Fixing default sample distance 2018-06-06 15:08:11 -07:00