Robert Maynard
e54896aee7
Document in Readme that OpenMP requires CMake 3.9
2018-06-19 17:13:08 -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
Matt Larsen
e50350d08d
Merge topic 'openmp_4_0'
...
ced5640c updating changelog and readme to reflect openmp 4.0
04162dc6 use openmp 4.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Acked-by: James Kress <james@jameskress.com>
Acked-by: Stephanie Labasan <labasan1@llnl.gov>
Merge-request: !1256
2018-06-07 14:36:31 -04:00
mclarsen
ced5640ca1
updating changelog and readme to reflect openmp 4.0
2018-06-07 08:23:15 -07: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
04162dc652
use openmp 4.0
2018-06-06 15:44:05 -07: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
Allison Vacanti
b0a4d54531
Merge topic 'CUDA_tuple_warnings'
...
abdf24a8 Merge branch 'upstream-taotuple' into CUDA_tuple_warnings
2d7ae33d taotuple 2018-06-05 (ae493658)
04d97866 Suppress NVCC warning 2885.
7c1d2736 taotuple 2018-06-01 (81c6f933)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1250
2018-06-06 09:00:31 -04:00
Kenneth Moreland
e62091a619
Add ability to "allocate" implicit storage
...
Previously, it was not possible to call Allocate or Shrink on an
implicit storage. The reason for this is that the implicit storage does
not represent any real memory and any attempt to modify it is wrong.
However, there are some rare cases where ArrayHandle will attempt to
"allocate" the storage even when behaving in a read-only manner. The use
case this is being created for is when an ArrayHandleImplicit first
calls ReleaseResources and then calls ReleaseResourcesExecution (or
anything else that tries to get a control-side portal). In this case,
the ReleaseResources makes the control side portal invalid and the
ReleaseResourcesExecution attempts to make it valid again by allocating
the storage to size 0. This change solves the problem by allowing the
implicit storage to be "allocated" to something smaller than originally
created.
2018-06-05 17:07:44 -05:00
Kenneth Moreland
9d16fadfc3
Merge topic 'vec-initializer-lists'
...
157894436 Enable Vec construction with intializer_list of single value
79afe2a16 Simplify make_ArrayHandleSwizzle
ae8d994d2 Add support for initializer lists in Vec
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1239
2018-06-05 12:26:21 -04:00
Allison Vacanti
abdf24a8f5
Merge branch 'upstream-taotuple' into CUDA_tuple_warnings
...
* upstream-taotuple:
taotuple 2018-06-05 (ae493658)
2018-06-05 12:24:07 -04:00
TaoCpp Tuple Upstream
2d7ae33db5
taotuple 2018-06-05 (ae493658)
...
Code extracted from:
https://gitlab.kitware.com/third-party/taotuple.git
at commit ae4936580baf117373e73c23f0f8407d7589e6ff (for/vtk-m).
2018-06-05 12:24:07 -04:00
Kenneth Moreland
1578944360
Enable Vec construction with intializer_list of single value
...
Previously, the initilaizer_list of Vec had to be the exact
same number of values as the size of the Vec. Now, we also
accept a single value that is duplicated for all values in
the Vec. That allows you to more easily construct lists
of lists with repeated values.
2018-06-04 21:08:26 -05:00
Allison Vacanti
04d9786688
Suppress NVCC warning 2885.
...
This warning is emitted when constructing a tuple that contains
an object with `__host__`-only constructors.
warning #2885-D: calling a __host__ function(...) from a __host__ __device__ function(...) is not allowed
2018-06-04 14:41:15 -04:00
TaoCpp Tuple Upstream
7c1d273673
taotuple 2018-06-01 (81c6f933)
...
Code extracted from:
https://gitlab.kitware.com/third-party/taotuple.git
at commit 81c6f933832b135bfb07e7c99e33f4dcaa1014af (for/vtk-m).
2018-06-04 14:41:15 -04:00
Allison Vacanti
0200fcbf05
Merge topic 'swap'
...
ec0791e94 Add a swap implementation that works on all backend.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1249
2018-06-04 11:53:45 -04:00
Robert Maynard
6cc9aff11b
Merge topic 'export_DataSetBuilderExplicitIterative'
...
4f42a69da Make sure DataSetBuilderExplicitIterative is usable by vtkm consumers
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1248
2018-06-01 15:05:17 -04:00
Allison Vacanti
ec0791e941
Add a swap implementation that works on all backend.
...
Calling std::swap isn't legal from CUDA code, but the new vtkm::Swap
method is safe. It currently does a naive swap when compiling CUDA
code, and falls back to an ADL swap
2018-06-01 14:13:46 -04:00
Robert Maynard
4f42a69da1
Make sure DataSetBuilderExplicitIterative is usable by vtkm consumers
2018-06-01 13:00:16 -04:00
Robert Maynard
b8468761c7
Merge topic 'wait_for_cuda_streams_to_finish_before_host_access'
...
82cdae002 VTK-m waits for cuda streams to finish before host access
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1244
2018-06-01 12:53:44 -04:00