Kenneth Moreland
2e426ad547
Run the update-control-signature-tags.sh script
2019-01-11 12:23:10 -07:00
Kenneth Moreland
42f810f70e
Remove type lists from ControlSignature arguments for arrays
...
The typelist arguments for ControlSignature tags are antiquated. Remove
them.
2019-01-11 12:15:16 -07:00
Robert Maynard
ac61044422
Merge topic 'dejagore_warnings'
...
f848bc354 Correct warnings from switch statements with no case labels.
90bca8a53 Remove unnecessary constructor from IntersectionPointMap
3c96b5a7b Suppress stack warnings generated by BoundingIntervalHierarchyTester
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1515
2019-01-11 11:44:50 -05:00
Robert Maynard
f848bc3541
Correct warnings from switch statements with no case labels.
2019-01-10 15:16:53 -05:00
Robert Maynard
e72d0d5dde
Merge topic 'annotation_warning_arrayportal_virtual'
...
cead0e26a ArrayPortalVirtual+ nvcc 9 fix annotation warnings on defaulted methods
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !1512
2019-01-10 10:49:39 -05:00
Robert Maynard
90bca8a53f
Remove unnecessary constructor from IntersectionPointMap
2019-01-10 09:25:27 -05:00
Robert Maynard
628dce822e
Merge topic 'require_cmake38'
...
f1e1a524e Require CMake 3.8 to build VTK-m.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1514
2019-01-09 17:02:52 -05:00
Abhishek Yenpure
afd0409189
Merge topic 'code_sprint_locator_fixes'
...
9b56d41fe Fixing Rectilinear Grid Cell Locator
10e9d47dc Removing std::out print statement from test
34c7b57d8 Merge branch 'code_sprint_locator_fixes' of gitlab.kitware.com:ayenpure/vtk-m into code_sprint_locator_fixes
62ee1a2c8 Updates to the Cell Locators
7eb0de5b7 Merge branch 'code_sprint_locator_fixes' of gitlab.kitware.com:ayenpure/vtk-m into code_sprint_locator_fixes
866b0798d Resolving type warnings
c062f2e26 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into code_sprint_locator_fixes
797c83891 Adding default constructor and removing wrong comment
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1395
2019-01-09 16:23:17 -05:00
Robert Maynard
f1e1a524e9
Require CMake 3.8 to build VTK-m.
2019-01-09 16:01:22 -05:00
Robert Maynard
9bfe670e1c
Merge topic 'correct_more_diy2_warnings'
...
f4a96cf1f Correct warning in StorageBasic logging when using 32bit ids.
281284298 Merge branch 'upstream-diy' into correct_more_diy2_warnings
3c130d166 diy 2019-01-09 (149953b0)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1513
2019-01-09 14:21:40 -05:00
Robert Maynard
f4a96cf1fb
Correct warning in StorageBasic logging when using 32bit ids.
2019-01-09 12:56:34 -05:00
Robert Maynard
2812842984
Merge branch 'upstream-diy' into correct_more_diy2_warnings
...
* upstream-diy:
diy 2019-01-09 (149953b0)
2019-01-09 11:04:01 -05:00
Robert Maynard
d29bdb2e39
VariantArrayHandleContainer casting operations have minimal overhead.
...
We want to make sure that VariantArrayHandleContainer has as little
overhead when launch worklets as possible. To do so we cache
type information to make deducing the `T` type of ArrayHandles
as fast as possible.
2019-01-09 08:27:14 -05:00
Robert Maynard
831a0bf844
Merge topic 'reduce_array_handle_virtual_binary_size'
...
a9d092efa Optimize TransferInfo / VirtualObjectTransfer for shared memory systems
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1498
2019-01-09 08:25:18 -05:00
Robert Maynard
c89f633d11
Merge topic 'fix_diy2_unused_call_result_warning'
...
5fa086f7d Merge branch 'upstream-diy' into fix_diy2_unused_call_result_warning
c445f9693 diy 2019-01-08 (839fd11e)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1511
2019-01-08 15:06:40 -05:00
Robert Maynard
cead0e26ac
ArrayPortalVirtual+ nvcc 9 fix annotation warnings on defaulted methods
2019-01-08 12:40:15 -05:00
Robert Maynard
5fa086f7d4
Merge branch 'upstream-diy' into fix_diy2_unused_call_result_warning
...
* upstream-diy:
diy 2019-01-08 (839fd11e)
2019-01-08 12:35:31 -05:00
Robert Maynard
2e93443b10
All bit shifting in vtkm::cont::Logging happens in unsigned space
2019-01-08 09:49:15 -05:00
ayenpure
9b56d41fe0
Fixing Rectilinear Grid Cell Locator
...
- Using exec portal in cont environment made the tests to fail
on the GPUs.
2019-01-07 18:11:35 -08:00
Robert Maynard
1ba38c59f7
Merge topic 'move_human_size_to_logging'
...
543255c37 Move the HumanSize function to Logging.cxx as it is only used by the logger
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1508
2019-01-07 17:42:50 -05:00
Robert Maynard
543255c374
Move the HumanSize function to Logging.cxx as it is only used by the logger
2019-01-07 16:24:49 -05:00
Robert Maynard
ce95b8f788
VTK-m now supports case-insensitive construction of devices from strings.
...
Previously you had to exactly match the case of a device adapter's name to
construct it, which was a source of lots of problems ( OpenMP versus OPENMP, CUDA or Cuda ).
Now `vtkm::cont::make_DeviceAdapterId` and `vtkm::cont::RuntimeDeviceTracker` support
case-insensitive device construction.
2019-01-07 08:12:25 -05:00
ayenpure
10e9d47dc3
Removing std::out print statement from test
2019-01-06 17:27:51 -08:00
ayenpure
62ee1a2c8a
Updates to the Cell Locators
...
- Adding updates to uniform grid cell locator
- adding OpenMP test, updating copyrights
- Adding rectilinear grid cell locator
- adding unit tests for serial, tbb, OpenMP, and cuda
- Updating CMakeLists to honor the alphabetical ordering
2019-01-06 17:18:23 -08:00
Robert Maynard
0ae31eb637
Merge topic 'probe_syntactic_disambiguation_warning'
...
a5cd7b2e3 Remove un-needed `.template` that caused warning in probe filter test
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1507
2019-01-04 15:06:35 -05:00
Robert Maynard
a5cd7b2e3c
Remove un-needed .template
that caused warning in probe filter test
2019-01-04 12:49:05 -05:00
Robert Maynard
eaf235ab9d
Merge topic 'decrease_cost_of_runtime_tracker_deep_copy'
...
10895f0ea RuntimeDeviceTracker DeepyCopy is better optimized.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1504
2019-01-04 11:55:15 -05:00
Robert Maynard
10895f0ea5
RuntimeDeviceTracker DeepyCopy is better optimized.
...
The DeepCopy method is used when a ScopedGlobalRuntimeDeviceTracker
is constructed. This in turn causes the rebuilding of the device
names and states which isn't a free operation. Now we copy the already
computed information.
This was noticeable when using ArrayHandleTransform since it uses
ScopedGlobalRuntimeDeviceTracker when construction host side
portals.
2019-01-03 15:03:35 -05:00
Haocheng LIU
9cb099a83d
Merge topic 'remove-compile-time-device-check-unittestBIH'
...
5251091e5 Remove compile time adapter checks in UnitTestBoundingIntervalHierarchy
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1503
2019-01-03 10:48:39 -05:00
Haocheng LIU
5251091e54
Remove compile time adapter checks in UnitTestBoundingIntervalHierarchy
2019-01-03 09:22:35 -05:00
Robert Maynard
f955103cad
Merge topic 'add_more_types_to_move_constructor_test'
...
4e9b4c37e Verify more core vtkm types have proper move semantics.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1499
2019-01-02 16:50:31 -05:00
Robert Maynard
4e9b4c37e1
Verify more core vtkm types have proper move semantics.
2019-01-02 12:46:30 -05:00
Robert Maynard
0ee5753724
VTK-m now logs whenever at runtime a device is enabled/disabled.
...
Previously we only logged when a user requested a device on the
command line, but that doesn't capture when code forces a device
2019-01-02 09:34:50 -05:00
Robert Maynard
169f55161f
Merge topic 'run_filter_tests_with_per_device'
...
fda911377 vtkm::filter now run each test with an explicit device adapter set
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1497
2019-01-01 16:05:26 -05:00
Robert Maynard
a9d092efac
Optimize TransferInfo / VirtualObjectTransfer for shared memory systems
2019-01-01 15:58:57 -05:00
Robert Maynard
fda9113779
vtkm::filter now run each test with an explicit device adapter set
...
This allows the filters to be tested with each device
2019-01-01 14:13:08 -05:00
Robert Maynard
ee6917a5c5
Merge topic 'array_handle_virtual_is_type_no_static_asserts'
...
61b1b5157 Make IsType and Cast not error at compile time when given bad types
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1496
2019-01-01 08:58:06 -05:00
Robert Maynard
61b1b51577
Make IsType and Cast not error at compile time when given bad types
...
Previously these two functions would give compile errors when asked to
compare against an Array with a different value type. This makes it easier
to write generic code that compares virtual handles.
2018-12-31 13:03:42 -05:00
ayenpure
7ee51f65de
Adding clipping test for volumetric data
...
- Added to detect cases like bug #329
https://gitlab.kitware.com/vtk/vtk-m/issues/329
- This is just to execute the clipping filter with a larger
dataset, and to ensure it can pass without failures and crashes.
2018-12-30 12:36:01 -08:00
ayenpure
f0a342e4d1
Adding fix for Clip failure
...
- Failure reported by Matt Larsen
Bug : https://gitlab.kitware.com/vtk/vtk-m/issues/329
2018-12-29 13:50:43 -08:00
Robert Maynard
718caaaeac
CudaAllocator allows managed memory to be explicitly disabled
2018-12-28 11:30:29 -05:00
Robert Maynard
3445047f9e
Refactor vtkm::cont::ArrayHandleAny into vtkm::cont::ArrayHandleVirtual
...
ArrayHandleVirtual can automatically be constructed from any ArrayHandle.
In the cases where the input ArrayHandle doesn't derived from ArrayHandleVirtual,
it will automatically construct StorageAny to hold the array.
2018-12-27 15:42:03 -05:00
Robert Maynard
bef70820c9
Update new worklets to work with ArrayHandleVariant
2018-12-27 14:35:56 -05:00
Robert Maynard
1f2abbc9c4
vtkm::cont::IsType and vtkm::cont::Cast support VariantArrayHandle
2018-12-27 14:35:56 -05:00
Robert Maynard
acf825b279
Correct IsType and Cast on ArrayHandleVirtual to work on OSX.
2018-12-27 14:35:56 -05:00
Robert Maynard
7b9fa975f2
Rename: IsVirtualType to IsValueType.
2018-12-27 14:35:56 -05:00
Robert Maynard
9c496e5da0
Correct warning found in ArrayHandleVirtualCoordinates with cuda 8.0
2018-12-27 14:35:56 -05:00
Robert Maynard
78e9cf0929
ArrayRangeCompute now supports ArrayHandleVirtual<vec3f>
2018-12-27 14:35:56 -05:00
Robert Maynard
7eb1e31b11
Remove vtkm::cont::DynamicArrayHandle.
2018-12-27 14:35:56 -05:00
Robert Maynard
0a40c620ac
Rename ArrayHandleVariant to VariantArrayHandle.
2018-12-27 14:35:56 -05:00
Robert Maynard
f63be1abe6
Update vtkm/filter to work with ArrayHandleVariant
2018-12-27 14:35:56 -05:00
Robert Maynard
eed321aad0
Update vtkm/worklet to work with ArrayHandleVariant
2018-12-27 14:35:56 -05:00
Robert Maynard
09383ceb52
Update vtkm/rendering to work with vtkm::cont::ArrayHandleVariant
2018-12-27 14:35:56 -05:00
Robert Maynard
39929d5a7c
Update vtkm/io to work with vtkm::cont::ArrayHandleVariant
2018-12-27 14:35:56 -05:00
Robert Maynard
0c72555ee1
Update vtkm/cont/testing to work with ArrayHandleVariant
2018-12-27 14:35:56 -05:00
Robert Maynard
8deb661409
Add serialization support to ArrayHandle Virtual, Any, and Variant.
2018-12-27 14:35:56 -05:00
Robert Maynard
28757bda4b
ArrayHandleVirtual supports comparison operators
2018-12-27 14:35:56 -05:00
Robert Maynard
4c23f50227
ArrayHandleVirtual can be used as AtomicArrayInOut tag type
2018-12-27 14:35:56 -05:00
Robert Maynard
b57dc5d289
Update ArrayHandleVirtual to handle PrepareForInPlace.
2018-12-27 14:35:56 -05:00
Robert Maynard
3c6246140d
ArrayRangeCompute now states it has uniform point coord optimization
2018-12-27 14:35:56 -05:00
Robert Maynard
ef83adf3bd
Field, CoordinateSystem, VirtualCoordinates all use the new virtual code
2018-12-27 14:35:56 -05:00
Robert Maynard
3d67a00822
Add ArrayHandleVariant to vtkm::cont which will replace DynamicArrayhandle
2018-12-27 14:35:56 -05:00
Robert Maynard
90223b390c
Add ArrayHandleAny to vtkm::cont
2018-12-27 14:35:56 -05:00
Robert Maynard
6e1cbaa16a
Add StorageVirtual and ArrayHandleVirtual to vtkm::cont
2018-12-27 14:35:56 -05:00
Robert Maynard
20d02fdec2
Support pointers in vtkm::exec::Fetch classes
2018-12-27 13:19:40 -05:00
Robert Maynard
65b019d443
raytracing intersector kernels use FieldOut where appropriate.
...
Previously a couple used FieldInOut when they only needed FieldOut,
this can help performance if the input is not already on the device
2018-12-27 13:19:40 -05:00
Robert Maynard
7ba3c66727
Make sure rendering builds Actor with cuda as it calls worklets
2018-12-27 13:19:40 -05:00
Robert Maynard
36100311d0
BoundingVolumeHierarchy now uses Invoker to simplify worklet dispatching
2018-12-27 13:19:40 -05:00
Robert Maynard
e31c73ef69
vtkm::cont Locators include all headers they need.
2018-12-27 13:19:40 -05:00
Robert Maynard
181d5f9f30
ArrayHandleZip now gracefully handles writes to implicit handles.
2018-12-27 13:19:40 -05:00
Sujin Philip
7c27bedc08
Enable Separable Compilation for CUDA
2018-12-27 13:19:40 -05:00
Robert Maynard
ecd6e3684c
Merge topic 'correct_issues_found_in_examples'
...
6e22bb5dc Cosmotools exmaples builds again with the change of vtkm::cont::Initialize
ab3d89d4e Simplify the example/demo CMakeLists.txt
028e954b4 Game Of Life example now supports -d/--device command line argument
e2c61e010 Update the HelloWorld example to use VTK-m runtime device adapter logic
34165c8e7 Correct crashes in the GameOfLife example
cdbee58c1 Remove the dynamic_dispatcher example as is a compiler benchmark
7c2c1d5fb Interop now works when device adapter isn't known.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1491
2018-12-27 13:10:39 -05:00
Robert Maynard
7c2c1d5fbc
Interop now works when device adapter isn't known.
...
Additionally the Interop calls now pass the ArrayHandle by const ref.
2018-12-27 11:44:19 -05:00
Robert Maynard
fcced13475
Correct maybe-uninitialized warnings found from examples
2018-12-27 10:10:36 -05:00
Robert Maynard
161ffdff3a
Move zfp helper functions to zfp namespace and remove debug code
2018-12-21 16:36:09 -05:00
Robert Maynard
bb74e17738
zfp worklets now don't dump data to file when executing
2018-12-21 16:36:09 -05:00
Robert Maynard
f5ce79e42d
zfp worklets now can handle array handles with non default storage
2018-12-21 16:36:09 -05:00
Allison Vacanti
35b739083a
Merge topic 'return_args_exec_sig'
...
58509f647 Store return value after parameters.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1487
2018-12-21 13:44:48 -05:00
Robert Maynard
a507e784fe
Merge topic 'fix_logic_error_in_enable_cuda_managed_memory'
...
90bb23de6 CudaAllocator::Initialize correctly uses managed memory when possible
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Haocheng LIU <haocheng.liu@kitware.com>
Merge-request: !1486
2018-12-21 13:23:56 -05:00
Allison Vacanti
58509f647e
Store return value after parameters.
...
This allows execution signatures like
using ExecutionSignature = _1(_1, ...)
to work as expected.
2018-12-21 11:37:45 -05:00
Robert Maynard
90bb23de6b
CudaAllocator::Initialize correctly uses managed memory when possible
...
Previously the logic would always think managed memory wasn't supported
2018-12-20 17:21:55 -05:00
Robert Maynard
376ef07fa3
Merge topic 'more_storage_basic_logging'
...
d5dc414e7 StorageBasic allocation logic now reports number of elements
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1484
2018-12-20 17:16:04 -05:00
Robert Maynard
d5dc414e74
StorageBasic allocation logic now reports number of elements
...
When looking at allocations it is useful to have memory size and
the number of elements so you can figure out what type/sizeof(type)
is being allocated
2018-12-20 10:13:54 -05:00
Abhishek Yenpure
80fffd1d64
Merge topic 'visit_clipping'
...
977d0cdb2 Removing redundant code line
33a04c34c Fixing variable name according to standard
2b4801239 Moving ClipTables
d1d495d43 Fixing warnings
e340cdf88 Fixing warnings
d0cf80bdd Updating tests for the new Clip tables
831914f31 Fising warnings
1ca02af98 Removing whitespaces
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1476
2018-12-19 13:12:23 -05:00
ayenpure
977d0cdb20
Removing redundant code line
2018-12-19 20:02:08 +05:30
ayenpure
33a04c34c3
Fixing variable name according to standard
2018-12-19 10:51:16 +05:30
Matt Larsen
011f08363e
Merge topic 'remove_inverse_check'
...
882900477 removing matrix inverse because of false negatives
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1483
2018-12-18 23:06:22 -05:00
mclarsen
8829004772
removing matrix inverse because of false negatives
2018-12-18 15:49:41 -08:00
Mark Kim
865942f189
Home stretch of warnings...(?)
2018-12-18 12:15:13 -05:00
Mark Kim
f5569fb931
More warnings.
2018-12-18 11:09:43 -05:00
Mark Kim
6beefb4ab2
Technically need default initialization.
2018-12-18 00:51:56 -05:00
ayenpure
2b4801239e
Moving ClipTables
...
moving ClipTables from vtkm/worklet/internal to vtkm/worklet/clip
2018-12-18 09:57:00 +05:30
Mark Kim
6f86d21e35
clang is my nemesis.
2018-12-17 23:04:34 -05:00
Mark Kim
ce00cc6e6e
straggling function variables.
2018-12-17 21:40:12 -05:00
Mark Kim
3dae0b08fd
CUDA can still be finicky.
2018-12-17 19:48:57 -05:00
Mark Kim
e7c1151c74
So many warnings.
2018-12-17 17:54:26 -05:00
Mark Kim
f5ca28f5c7
More compiler warnings.
2018-12-17 17:14:42 -05:00
Mark Kim
59b1efaf44
Testing output.
2018-12-17 17:07:50 -05:00
Mark Kim
d52928c9f2
edited wrong MakeTest. Fixed.
2018-12-17 10:43:07 -05:00
Mark Kim
3fed771265
added copyright.
2018-12-17 10:22:23 -05:00
Mark Kim
a08fe42d0b
Missing a header file.
2018-12-17 10:21:47 -05:00
Mark Kim
30be47ee78
Mismatched types from MakeTest.
2018-12-16 23:23:33 -05:00
Mark Kim
03fc341e5b
uint is not a supported type with VC++.
2018-12-14 23:04:26 -05:00
Mark Kim
08f8bbd7f1
Visual Studio doesn't support this initialization.
2018-12-14 23:03:12 -05:00
Mark Kim
3de1944dbf
Remove warnings.
2018-12-13 14:49:38 -05:00
Mark Kim
51d19d9bef
cleanup debug prints
2018-12-13 14:49:38 -05:00
Mark Kim
ba60650706
little late finding this is invalid for CUDA.
2018-12-13 14:49:38 -05:00
Mark Kim
da73dfaff5
more warnings cleanup.
2018-12-13 14:49:38 -05:00
Mark Kim
20328534b5
clean up warnings.
2018-12-13 14:49:38 -05:00
Mark Kim
9c86727225
3d zfp decompress filter.
2018-12-13 14:49:38 -05:00
Mark Kim
7655797321
3d zfp compressor filter.
2018-12-13 14:49:38 -05:00
Mark Kim
a6bcf8a0ab
something's not quite right.
2018-12-13 14:49:38 -05:00
Mark Kim
ce44a4d183
better tests.
2018-12-13 14:49:38 -05:00
Mark Kim
e033fe8eea
fix new 1d data generator.
2018-12-13 14:49:38 -05:00
Mark Kim
8a9bfcba1b
zfp 1d worklet.
2018-12-13 14:49:38 -05:00
Mark Kim
ece5913869
good to use the actual 1D compressor.
2018-12-13 14:49:38 -05:00
Mark Kim
aad7498387
1d compressor filter
2018-12-13 14:49:37 -05:00
Mark Kim
c08a0bf3f8
visual check of compression/decompression
2018-12-13 14:49:37 -05:00
Mark Kim
851c424a16
fix some bugs.
2018-12-13 14:49:37 -05:00
Mark Kim
cb8a5fd9c8
update 2d zfp filter to new 2d encode/decode worklets.
2018-12-13 14:49:37 -05:00
Mark Kim
95636ff2cd
decode/encode 2d.
2018-12-13 14:49:37 -05:00
Mark Kim
d06190fdc2
how will we pass the original type?
2018-12-13 14:49:37 -05:00
Mark Kim
b41b89312c
2d zfp compress/decompress and tests.
2018-12-13 14:49:37 -05:00
Mark Kim
7118139b93
add filter testing for zfp 1d.
2018-12-13 14:49:37 -05:00
Mark Kim
2026eba609
forgot stuff.
2018-12-13 14:49:37 -05:00
Mark Kim
3b99722f6e
Prototyping zfp 1d filter.
2018-12-13 14:49:37 -05:00
mclarsen
aa891c58a7
fixed decompression porting bugs
2018-12-13 14:49:37 -05:00
mclarsen
37cba9e99f
adding path for decompress
2018-12-13 14:49:37 -05:00
mclarsen
0c788b92a2
fixed error with integer types
2018-12-13 14:49:37 -05:00
mclarsen
584b36d64e
adding partial gather3
2018-12-13 14:49:37 -05:00
mclarsen
4650881f58
something
2018-12-13 14:49:37 -05:00
mclarsen
1020cb43e6
more missing files
2018-12-13 14:49:37 -05:00
mclarsen
cf3d24d1aa
more missing files
2018-12-13 14:49:37 -05:00
mclarsen
baa0ad77c7
adding missing file
2018-12-13 14:49:36 -05:00
mclarsen
bcd0150e9e
save point
2018-12-13 14:49:36 -05:00
mclarsen
1c45e48fac
compression working and benchmarked
2018-12-13 14:49:36 -05:00
mclarsen
c01e1b7349
debugging cuda failure
2018-12-13 14:49:36 -05:00
mclarsen
8cd7c5db32
fixed the gather
2018-12-13 14:49:36 -05:00
mclarsen
ea9bef19da
init zfp
2018-12-13 14:49:36 -05:00
Allison Vacanti
f3536e44f8
Merge topic '320-vtkm_init'
...
cdb1f5680 Add vtkm::cont::Initialize.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Acked-by: Haocheng LIU <haocheng.liu@kitware.com>
Merge-request: !1475
2018-12-13 12:01:57 -05:00
Allison Vacanti
cdb1f5680a
Add vtkm::cont::Initialize.
...
Also
- Renamed vtkm::cont::make_DeviceAdapterIdFromName to just overload
make_DeviceAdapterId.
- Refactored CMake logic for unit tests
- Since we're now querying the device tracker for the names, they
cannot be all caps.
- Updated usages of InitLogging to use Initialize instead.
- Added changelog.
2018-12-13 10:15:44 -05:00
Kenneth Moreland
81a22ff64f
Change ConvertNumComponentsToOffsets to use DeviceAdapterId
...
The vtkm::cont::ConvertNumComponentsToOffsets method was originally
created before vtkm::cont::DeviceAdapterId and the dynamic
vtkm::cont::Algorithm classes were created. Thus, it contained its own
version of TryExecute and did not support the direct selection of a
device at runtime. Change the function to use the new dynamic device
adapter id, which makes this more consistent with the rest of VTK-m and
cleans up the implementation quite a bit.
2018-12-12 08:18:47 -07:00
Robert Maynard
4994190064
UnitTestMoveConstructors will now compile with gcc 4.9 and Intel < 17.
2018-12-11 09:29:08 -05:00
Robert Maynard
0da7830d9a
Make sure important vtkm::cont classes have noexcept move ops.
...
This is important so they can be stored efficiently inside
containers such as std::vector that require strong move guarantees.
2018-12-10 10:33:18 -05:00
ayenpure
d1d495d435
Fixing warnings
2018-12-08 14:41:59 +05:30
ayenpure
e340cdf88c
Fixing warnings
2018-12-08 14:17:28 +05:30
ayenpure
d0cf80bddd
Updating tests for the new Clip tables
2018-12-08 11:57:34 +05:30
ayenpure
831914f318
Fising warnings
2018-12-08 08:14:05 +05:30
ayenpure
1ca02af988
Removing whitespaces
2018-12-07 23:33:08 +05:30
ayenpure
f72299c948
Resolving warnings from last iteration
2018-12-07 23:28:31 +05:30
Robert Maynard
6520ca1ff9
Merge topic 'improve_array_handle_basic_serialization_perf'
...
fee6ef591 Improve serialization performance of ArrayHandle with BasicStorage
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1474
2018-12-07 10:22:41 -05:00
ayenpure
cab80e8e3f
Adding Clip files
2018-12-07 20:39:21 +05:30
Robert Maynard
dd0cbc3689
Merge topic 'disable_cuda_optimizations_for_UnitTestBoundingIntervalHierarchy'
...
a9c151188 Disable ptxas for CUDA 8 && 9 for UnitTestBoundingIntervalHierarchy.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1465
2018-12-07 08:28:04 -05:00
Robert Maynard
fee6ef591b
Improve serialization performance of ArrayHandle with BasicStorage
2018-12-06 09:21:06 -05:00
Kenneth Moreland
1766f213ea
Merge topic 'dynamic-neighborhood-size'
...
82536092c Rename boundary classes
e008aff27 Change neighborhood parameter from layer to radius
7f627380b Fix Marching Cubes regression test
01a9e8541 Change WorkletPointNeighborhood to specify neighborhood at runtime
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1457
2018-12-04 16:02:46 -05:00
Sujin Philip
6d81bc8b06
Implement extents support
...
Adds a variable `GlobalPointIndexStart` to `CellSetStructured`.
Adding this to the cell-set, instead of the coordinate system, enables this
feature for different types of datasets like uniform grid, rectilinear, etc.,
with this one change.
The extents can be computed using `GlobalPointIndexStart` and `PointDimensions`.
2018-12-03 15:56:45 -05:00
Kenneth Moreland
82536092cc
Rename boundary classes
...
Did a bit of renaming of the support classes used for
WorkletPointNeighborhood. First, the OnBoundary tag is changed to
Boundary to match other tags and reflect some changes in the resulting
methods. Also moved the BoundaryState and Neighborhood classes from
vtkm::exec::arg to vtkm::exec to be more accessible. Finally, the
Neighborhood class name was changed to FieldNeighborhood to be more
specific on what role this class plays with neighborhood.
2018-12-03 12:45:23 -07:00
Kenneth Moreland
e008aff27b
Change neighborhood parameter from layer to radius
...
It was determined that the word "radius" more clearly described how the
size of the neighborhood is determined.
2018-12-03 12:45:23 -07:00
Kenneth Moreland
7f627380b6
Fix Marching Cubes regression test
...
Turns out there was a bug in the way Marching Cubes computed gradients
on a structured grid. A recent change to Boundary also had a similar bug
that ended in the same behavior. The recent changes to BoundaryState
fixed the problem, but caused the Marching Cubes test to fail because it
was comparing against bad gradient values.
This change fixes the array of gradient values. I'm pretty sure these
are correct since I generated them with ParaView (using a completely
separate implementation).
2018-12-03 12:45:23 -07:00
Kenneth Moreland
01a9e85416
Change WorkletPointNeighborhood to specify neighborhood at runtime
...
Previously, WorkletPointNeighborhood had a template argument to select
the size of the neighborhood. This change removes that template
argument. Instead, the vtkm::exec::arg::BoundaryState methods now take
in a size parameter when determining when it overlaps the boundary.
If in the future we want to add the ability to select the neighborhood
size at compile-time (for performance reasons), I suggest adding this
template argument to the OnBoundary tag for ExecutionSignature.
2018-12-03 12:45:23 -07:00
ayenpure
7eb0de5b74
Merge branch 'code_sprint_locator_fixes' of gitlab.kitware.com:ayenpure/vtk-m into code_sprint_locator_fixes
2018-12-03 08:07:07 -08:00
ayenpure
866b0798d4
Resolving type warnings
2018-12-03 08:03:36 -08:00
ayenpure
c062f2e26c
Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into code_sprint_locator_fixes
2018-12-03 07:44:31 -08:00
larsen30@llnl.gov
361c5695bc
adjusing ray start
2018-12-02 19:14:27 -08:00
Haocheng LIU
deeb9c4183
Remove a mis-added autossave file
2018-11-30 08:40:10 -05:00
Haocheng LIU
0d39806f4f
Rename worklet testing executable
...
Now it's in accordance with vtkm testing name convension as
UnitTests_vtkm_worklet_testing.
2018-11-29 15:51:41 -05:00
Robert Maynard
a9c1511888
Disable ptxas for CUDA 8 && 9 for UnitTestBoundingIntervalHierarchy.
2018-11-28 11:14:59 -05:00
Kenneth Moreland
0725bd4578
Merge topic 'average-by-key-warning'
...
6ebc3ea76 Fix potential warning in AverageByKey
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1463
2018-11-27 17:53:20 -05:00
Haocheng LIU
9bd30571f5
Fix link errors for vtkm_cont when logging is enabled
2018-11-27 11:37:51 -05:00
Kenneth Moreland
6ebc3ea761
Fix potential warning in AverageByKey
...
To get the average, we (of course) divide the sum by the amount of
values, which is returned from valuesIn.GetNumberOfComponents(). To do
this, we need to cast the number of components (returned as a
vtkm::IdComponent) to a FieldType. This is a little more complex than it
first seems because FieldType might be a Vec type. If you just try a
static_cast<FieldType>(), it will use the constructor to FieldType which
might be a Vec constructor expecting the type of the component. This in
turn could cause a warning because the vtkm::IdComponent is implicitly
converted to the Vec's component type.
Get around this problem by first casting to the component type of the
field and then constructing a field value from that.
2018-11-27 09:31:23 -07:00
Haocheng LIU
8859636672
Merge worklet testing executables into a device dependent shared library
...
VTK-m has been updated to replace old per device worklet testing executables with a device
dependent shared library so that it's able to accept a device adapter
at runtime.
Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run
function would call ForceDevice when needed and if users need the device
adapter info at runtime, RunOnDevice function would pass the adapter into the functor.
Optional Parser is bumped from 1.3 to 1.7.
2018-11-23 10:13:56 -05:00
Haocheng LIU
88bcd06964
Bump Mean C++ Option Parser
...
This MR bumps the version from 1.3 to 1.7 to absorb MSC compiler
fixes and const-correctness.
2018-11-23 10:13:56 -05:00
Robert Maynard
b922851bf2
Correct rendering warning of a 64bit to 32bit conversion
2018-11-19 14:20:45 -05:00
Kenneth Moreland
6002b1c1b5
Merge topic 'more-precise-boundary-state'
...
3e3baad6f Add better queries to vtkm::exec::arg::BoundaryState
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1456
2018-11-14 18:17:36 -05:00
Kenneth Moreland
33db6655fc
Make the building of static color table presets is thread safe
...
If multiple threads call a function with a static function
simultaneously for the first time, C++ does not guarantee that the
static member will be constructed correctly. Make sure that it happens
correctly.
2018-11-14 09:19:07 -06:00
Kenneth Moreland
3e3baad6f8
Add better queries to vtkm::exec::arg::BoundaryState
...
Previously, vtkm::exec::arg::BoundaryState only provided methods that
said whether or not the neighborhood extened past the boundary of a
mesh. That is fine for a 3x3x3 neighborhood, which can only extend over
the boundary by one. However, that is problematic for larger
neighborhoods where you may need to know how far neighborhood extends
over the boundary.
This changes allows you to query how far the neighborhood extends within
the constrains of the boundary.
2018-11-13 22:45:06 -06:00
Kenneth Moreland
8984e74e8c
Hold preset information in simple struct
...
Creating all the presets as vtkm::cont::ColorTable objects and passing
them back was problematic. It caused state to be shared and caused
issues when deallocating after the device deallocation methods were
finalized. Instead, make a simple struct and build new color tables on
the fly.
2018-11-11 17:30:11 -07:00
Kenneth Moreland
70e10459c7
Update presets for ColorTable
...
The ParaView project went through a rigourous selection process
for a short list of color tables. Let's replicate that for our
presets.
2018-11-09 09:02:10 -07:00
Dave Pugmire
1e9c7b3c2a
Add tests for rectilinear and explicit datasets. Remove a commented-out line.
2018-11-06 16:39:56 -05:00
Robert Maynard
dadfeab00a
Simplify vtkm::cont::Field by using delegating constructors.
2018-11-02 14:18:09 -04:00
Haocheng LIU
e178b8c4cd
Merge topic 'change-RuntimeDeviceInformation-template-independent'
...
bb0671780 Make RuntimeDeviceInformation class template independent
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1446
2018-11-02 10:20:36 -04:00
Kenneth Moreland
67c9af91a9
Merge topic 'policies-for-auxiliary-fields'
...
86a747a11 Add ability to customize filter policy to auxiliary input fields
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1442
2018-11-01 20:04:01 -04:00
Haocheng LIU
bb06717803
Make RuntimeDeviceInformation class template independent
...
By making RuntimeDeviceInformation class template independent, vtkm is
able to detect
device info at runtime with a runtime specified deviceId. In the past
it's impossible
because the CRTP pattern does not allow function overloading(compiler
would complain
that DeviceAdapterRuntimeDetector does not have Exists() function
defined).
2018-11-01 14:55:33 -04:00
mclarsen
2d782ff7d0
removing some entries from test build exclusion (colors)
2018-11-01 09:45:57 -07:00
mclarsen
2addf93938
removing color conversion files from test build
2018-11-01 09:36:19 -07:00
mclarsen
e5d03852b1
add subdirectory for colorconversion
2018-11-01 09:25:10 -07:00
Kenneth Moreland
86a747a117
Add ability to customize filter policy to auxiliary input fields
...
The field infrastructure has a "trait" that specifies the valid types
for the default active scalar field. Most filters have at most one input
field. The majority of the remaining filters use the same types for
inputs. There are some examples, however, where some auxiliary fields
use different types. This change adds a second template parameter to
FieldTraits to customize the valid types of the input scalar field to
different fields.
These changes are in anticipation of the removal of list specifier tags
on worklet ControlSignature arguments.
2018-10-31 23:51:36 +01:00
Robert Maynard
154b65f47a
Install vtkm/cont/ColorTable.hxx so users can use color tables
2018-10-31 17:02:12 -04:00
Matt Larsen
27d7162b1e
Merge topic 'partial_composites'
...
fd4ff8c1f adding files patch forgot
e03703578 removing unused variable
5a1685d8a updates to the connectivity tracer
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1447
2018-10-31 11:40:29 -04:00
Robert Maynard
458fc974b5
Merge topic 'rework_colortable_for_separable_compilation'
...
169ca722b Redesign vtkm::cont::ColorTable to work with separable compilation.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1445
2018-10-31 11:24:43 -04:00
Robert Maynard
169ca722b3
Redesign vtkm::cont::ColorTable to work with separable compilation.
2018-10-31 08:18:08 -04:00
Matt Larsen
fd4ff8c1f3
adding files patch forgot
2018-10-30 08:18:56 -07:00
Matt Larsen
e037035780
removing unused variable
2018-10-30 08:09:11 -07:00
Matt Larsen
5a1685d8aa
updates to the connectivity tracer
2018-10-30 07:46:42 -07:00
Robert Maynard
8237db209e
Merge topic 'noexcept_move_constructors'
...
c66a6e480 Provided vtkm::cont::Storage with move schematics
1f86878f7 Make the ArrayHandle move constructors noexcept.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1439
2018-10-29 10:24:48 -04:00
Robert Maynard
e549cea8eb
Merge topic 'openmp_rendering_tests'
...
184bdf9d6 Test rendering with OpenMP
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1441
2018-10-25 08:29:31 -04:00
Robert Maynard
c66a6e480d
Provided vtkm::cont::Storage with move schematics
2018-10-24 15:45:55 -04:00
Robert Maynard
184bdf9d60
Test rendering with OpenMP
2018-10-24 15:39:54 -04:00
Matthew Letter
5426ae0ed3
added runtime device tracker force
...
added `vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(VTKM_DEFAULT_DEVICE_ADAPTER_TAG());`
2018-10-24 11:19:52 -06:00
Matthew Letter
cb03238804
removed device from run function for AverageByKey
...
I also cleaned up the unit test to no longer pass the device
2018-10-24 10:28:12 -06:00