Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-20 02:55:47 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity
5,963 Commits 9 Branches 24 Tags 38 MiB
c7bd79e789
Commit Graph

5963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steven Walton
c7bd79e789 Extract Structured with Offset 
Added code for giving ExtractStructured an offset value. Unit tests
three different 3D cases and a 3D case.
 2019-05-30 11:13:29 -07:00
Steven Walton
56598ebfa5 Maybe closer 2019-05-30 11:13:17 -07:00
Steven Walton
5feadd1661 Pushing for Abhishek (Don't merge) 2019-05-30 11:13:05 -07:00
Steven Walton
cf61a645ea Getting there with ES 2019-05-30 11:12:47 -07:00
Steven Walton
358d3cf683 Maybe right? 2019-05-30 11:12:26 -07:00
Steven Walton
779b60e9fd Merged and forgot to pull from do reformat 2019-05-30 11:11:08 -07:00
Steven Walton
927effb1d2 Merge branch 'ExtractStructured' of gitlab.kitware.com:stevenwalton/vtk-m into ExtractStructured 2019-05-28 11:21:35 -07:00
Steven Walton
c268f36e03 Clearing out unused variables 2019-05-28 11:21:17 -07:00
Steven Walton
66c011f01f Merged conflicts 2019-05-25 17:40:15 -07:00
Steven Walton
21726038c5 IncludeOffset was defaulting to true when it should default to false 2019-05-25 17:32:50 -07:00
Steven Walton
62edf4e85f Extract Structured with Offset 
Added code for giving ExtractStructured an offset value. Unit tests
three different 3D cases and a 3D case.
 2019-05-24 17:15:28 -07:00
Steven Walton
4c0e55ffe9 Maybe closer 2019-05-08 20:50:55 -07:00
Steven Walton
166255acfa Pushing for Abhishek (Don't merge) 2019-05-07 16:19:52 -07:00
Steven Walton
7d77059339 Getting there with ES 2019-05-06 17:48:07 -07:00
Steven Walton
665f6ec4a8 Merge conflicts 2019-04-18 21:29:42 -07:00
Steven Walton
249c6bfbb2 Maybe right? 2019-04-18 21:22:50 -07:00
Steven Walton
e61b91edb3 Moving to home 2019-04-17 20:13:36 -07:00
Steven Walton
0bf10a0f7c Removed hanging comment and function that wasn't used where complained about whitespace 2019-04-16 17:25:41 -07:00
Steven Walton
6dbd9bb3f1 Adding global offsets 2019-04-16 17:18:24 -07:00
Robert Maynard
9cf1dc1883 Merge topic 'cuda_reduce_handle_pair_output' 
89ec4aae2 Reduction on CUDA handles different input and output types better

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1638
 2019-04-10 19:17:23 -04:00
Sujin Philip
4a20c8fabd Merge topic 'remove-SimplePolymorphicContainer' 
b391acf4c Remove SimplePolymorphicContainer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1634
 2019-04-10 16:18:47 -04:00
Robert Maynard
3f80a5602d Merge topic 'correct_thrust_patch_for_cuda_10' 
1d980ed14 Thrust Patches tried to apply CUDA 10.1 patches to CUDA 10.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1639
 2019-04-10 14:47:38 -04:00
Robert Maynard
1d980ed147 Thrust Patches tried to apply CUDA 10.1 patches to CUDA 10.0 2019-04-10 14:46:56 -04:00
Robert Maynard
89ec4aae2f Reduction on CUDA handles different input and output types better 
When reducing an input type that differs from the output type
you need to write a custom binary operator that also implements
how to do the unary transformation.
 2019-04-10 14:44:44 -04:00
Sujin Philip
b391acf4c0 Remove SimplePolymorphicContainer 
The last place remaining where it is being used is DynamicCellSet, which can
instead use `vtkm::cont::CellSet` as it itself is polymorphic.
 2019-04-10 14:00:39 -04:00
Robert Maynard
fda02b3a91 Merge topic 'thrust_stateless_resource_allocator_warnings' 
f05940aac ThrustPatches now only patches fixes for relevant cuda versions
20d6201a9 Suppress thrust::mr::stateless_resource_allocator host/device warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1637
 2019-04-10 13:35:39 -04:00
Robert Maynard
f05940aaca ThrustPatches now only patches fixes for relevant cuda versions 
Rather than always patch Thrust functions, we now only patch
based on the Thrust version.
 2019-04-10 11:18:42 -04:00
Robert Maynard
20d6201a98 Suppress thrust::mr::stateless_resource_allocator host/device warnings 2019-04-10 09:46:34 -04:00
Robert Maynard
ece078b82f Merge topic 'clang_warnings' 
0130088b8 Suppress more self-assign-overloaded warnings found by clang
fa5455854 UnitTestArrayPortalValueReference doesn't warn when compiled with appleclang
5cc0d03f6 Merge branch 'upstream-diy' into clang_warnings
dbd3781d5 diy 2019-04-09 (f7a68da4)
5c2f2ebce suppress warnings found by Wself-assign-overloaded
77426f044 Correct casting long to long long warning from clang.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1635
 2019-04-09 15:54:57 -04:00
Robert Maynard
0130088b86 Suppress more self-assign-overloaded warnings found by clang 2019-04-09 14:09:54 -04:00
Robert Maynard
fa54558542 UnitTestArrayPortalValueReference doesn't warn when compiled with appleclang 2019-04-09 12:26:22 -04:00
Robert Maynard
5cc0d03f64 Merge branch 'upstream-diy' into clang_warnings 
* upstream-diy:
  diy 2019-04-09 (f7a68da4)
 2019-04-09 11:42:54 -04:00
Diy Upstream
dbd3781d5c diy 2019-04-09 (f7a68da4) 
Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit f7a68da4fbe93ae7a8699b66f125a98ace842998 (for/vtk-m).
 2019-04-09 11:42:54 -04:00
Robert Maynard
5c2f2ebce9 suppress warnings found by Wself-assign-overloaded 2019-04-09 11:42:45 -04:00
Robert Maynard
77426f0447 Correct casting long to long long warning from clang. 2019-04-09 11:42:45 -04:00
Sujin Philip
e7b26f5c88 Merge topic 'bugfixes-ArrayHandleVirtual' 
dae779b9f ArrayHandleVirtual bugfixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1632
 2019-04-09 08:36:12 -04:00
Sujin Philip
830f16c44c Merge topic 'bugfix-MakeTestDataset' 
2bbf501c5 Fix a bug in MakeTestDataset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1633
 2019-04-09 08:35:34 -04:00
Sujin Philip
2bbf501c53 Fix a bug in MakeTestDataset 
In Make3DExplicitDataSetZoo, only 25 cells are added, but the variable `nCells`
is set to 27.
 2019-04-08 16:41:56 -04:00
Sujin Philip
dae779b9f8 ArrayHandleVirtual bugfixes 
After the change to `ArrayHandleVirtual` where it became a subclass of
`vtkm::cont::ArrayHandle`, a few extra changes are required.

1. Functions with `ArrayHandleVirtual` as parameters will not be callable
with the superclass `ArrayHandle`. This is fixed by changing the argument
types to the superclass.
2. Add Serialization classes specializations for the superclass, as "is-a"
relation is not considered for class template parameters.
 2019-04-08 15:42:53 -04:00
Robert Maynard
d0d33f9807 Merge topic 'correct_cellhelper_overrides' 
364bdce53 Correctly override the proper PrepareForExecution method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1631
 2019-04-05 17:37:08 -04:00
Robert Maynard
364bdce530 Correctly override the proper PrepareForExecution method 2019-04-05 17:14:46 -04:00
Robert Maynard
68bf5b6153 Merge topic 'correct_clang_as_cuda_compiler_warnings' 
58884a729 Fix warnings found when cuda is the cuda host compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1630
 2019-04-05 16:02:28 -04:00
Robert Maynard
58884a7299 Fix warnings found when cuda is the cuda host compiler 2019-04-05 15:40:03 -04:00
Robert Maynard
107edaff75 Merge topic 'move_device_adapter_tag_to_vtkm_cont' 
1d20ae4f7 Move DeviceAdapterTag to vtkm/cont

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1624
 2019-04-05 08:03:53 -04:00
Robert Maynard
34dd533179 Merge topic 'refactor_celllocator_prepareforexec' 
30aedf287 Refactor the design of CellLocator::PrepareForExecution

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1627
 2019-04-05 08:03:32 -04:00
Kenneth Moreland
3048bd2b4c Merge topic 'pyexpander-python3' 
e43770a37 Update pyexpander input files to work with python 3
23f0905a1 Support pyexpander using python 3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1628
 2019-04-04 16:18:35 -04:00
Kenneth Moreland
e43770a376 Update pyexpander input files to work with python 3 
Python 3 does not use xrange anymore. Use the range function instead.
 2019-04-04 11:20:56 -06:00
Robert Maynard
30aedf287f Refactor the design of CellLocator::PrepareForExecution 
The try execute functor now doesn't need to be a member of the
class. This helps with the separation of concerns.
 2019-04-04 13:17:49 -04:00
Kenneth Moreland
23f0905a1e Support pyexpander using python 3 
When you install pyexpander with pip under python 3, the executable
script is now named expander3.py instead of expander.py. Support using
either file.
 2019-04-04 11:05:13 -06:00
Robert Maynard
1d20ae4f7b Move DeviceAdapterTag to vtkm/cont 2019-04-04 11:58:51 -04:00