Commit Graph

4893 Commits

Author SHA1 Message Date
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
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
Sujin Philip
c9762661c6 Merge topic 'fix-multibackend-example'
01a45d8e5 Workaround compiling error in multi-backend example with some gcc versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1277
2018-06-21 14:16: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
Sujin Philip
01a45d8e5e Workaround compiling error in multi-backend example with some gcc versions 2018-06-21 12:07:12 -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
7de4bba7e9 Merge topic 'update_readme_with_new_cmake_ver'
e54896aee Document in Readme that OpenMP requires CMake 3.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1273
2018-06-19 17:14:05 -04:00
Robert Maynard
e54896aee7 Document in Readme that OpenMP requires CMake 3.9 2018-06-19 17:13:08 -04:00
Robert Maynard
303cf06e4c Merge topic 'cmake_set_policies_to_new'
9861cdecb Use CMake to automatically set policies to NEW.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1270
2018-06-19 17:11:58 -04:00
Robert Maynard
195552f540 Merge topic 'openmp_cuda_flags'
0e4bcf757 VTK-m supports openmp and cuda devices in same translation unit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1271
2018-06-19 16:52:02 -04:00
Robert Maynard
9861cdecb1 Use CMake to automatically set policies to NEW.
CMake 3.12 introduces a ...<max> syntax in the version given to
cmake_minimum_required to automatically set policies to NEW up
to that version. Use it to avoid listing policies explicitly.
2018-06-19 16:12:48 -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
Robert Maynard
0e4bcf757c VTK-m supports openmp and cuda devices in same translation unit 2018-06-19 13:47:03 -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
Robert Maynard
d07e1f1e94 Merge topic 'tbb_not_found'
bef1965cd VTK-m now handles when TBB uses link scripts.
b2682ec5f VTK-m properly specifies the linker language of imported targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !1264
2018-06-18 17:46:27 -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
bef1965cd5 VTK-m now handles when TBB uses link scripts.
If somebody is using the official TBB binaries on linux
they will encounter issues as the .so files are actually
link scripts which CMake doesn't support. We now manually
work around this problem.
2018-06-18 14:41:00 -04:00
Robert Maynard
cc82f5338e Merge topic 'mark_more_classes_as_final'
8276e35cf Mark classes that should not be derived from as final.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1267
2018-06-15 13:15:37 -04:00
Robert Maynard
8276e35cf4 Mark classes that should not be derived from as final. 2018-06-15 10:49:59 -04:00
Robert Maynard
2714cbe50a Merge topic 'misc-typos'
940c89188 Misc. typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1202
2018-06-14 16:59:31 -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
827d361f24 Merge topic 'fix-cross-product-interface'
9fb648086 Fix cross product filter interface

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Haocheng LIU <haocheng.liu@kitware.com>
Merge-request: !1266
2018-06-14 15:37:16 -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
Robert Maynard
b2682ec5fc VTK-m properly specifies the linker language of imported targets 2018-06-14 09:08:00 -04:00
Haocheng LIU
d5c0c8f278 Merge topic 'Add-override-keyword-to-CellSetStructured'
fb62ed550 Add override keyword to CellSetStructured's member functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1263
2018-06-13 17:25:25 -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
Allison Vacanti
15f0c9e22e Merge topic '233-redundant_testing'
4e07825ad Hide BUILD_TESTING cmake option.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1251
2018-06-12 13:42:33 -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
08061ab2d0 Merge topic 'Allow-custom-range-in-histogram-filter'
5393745ec Allow histogram filter to take custom types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !1261
2018-06-12 09:47:00 -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
Allison Vacanti
f1bb806333 Merge topic 'use_thrust_swap'
cc631650c Use thrust::swap for vtkm::Swap in CUDA device code.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1260
2018-06-11 14:18:14 -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
Allison Vacanti
4e07825ad6 Hide BUILD_TESTING cmake option.
We use VTKm_ENABLE_TESTING to disable/enable tests.
2018-06-11 12:01:35 -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
James
429ad97052 Merge remote-tracking branch 'upstream/master' 2018-06-11 09:18:07 -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