Sujin Philip
4c51138f60
Add new lines at end of files.
2015-06-05 13:14:28 -04:00
Robert Maynard
73d27435f1
Merge branch 'dynamic_handles_to_worklet_warnings'
2015-06-04 13:49:28 -04:00
Robert Maynard
60e8166290
Add a simple example on how to handle multiple params to a worklet.
...
Mainly showing how to constrain the type for all parameters to be the
same, and to throw an error otherwise.
2015-06-04 13:12:52 -04:00
Robert Maynard
ae9914e9c8
Add full support for dynamic array handles to Topology test worklets.
...
Currently the topology test worklets only worked for Float32, and produced
warnings when generating the Float64 code paths, this solves this problem.
2015-06-04 13:11:49 -04:00
Robert Maynard
342a9989a5
Correct double to float conversion warnings.
2015-06-04 09:06:47 -04:00
Robert Maynard
0a433303e6
Correct headers to have the new copyright.
2015-06-03 15:06:43 -04:00
Robert Maynard
6af4961e40
Remove unneeded test file.
2015-06-03 15:06:32 -04:00
Robert Maynard
7f2ee8d050
Merge branch 'master' into datamodel-design
2015-06-03 14:36:53 -04:00
Robert Maynard
0748cdb320
Merge branch 'implicit_shortening_on_mult'
2015-06-03 08:46:30 -04:00
Robert Maynard
e0e6ffb705
Suppress warnings generated by TBB code, which we can change.
...
These warnings are caused by tbb code, which we have zero control over.
2015-06-02 09:42:40 -04:00
Robert Maynard
f427d6d8d8
Cast back to int8/16 after compiler does integer promotion.
...
When multiplying integer values of a width less than an integer c++ actually
converts up to an integer implicitly. So we silence the warnings that the
result of the multiply could be larger than the original type. If people want
to do multiplies on int8/16 they better know what they are doing.
2015-06-02 09:10:46 -04:00
Robert Maynard
f88992e2f7
cuda can't handle invoking worklets from anonymous namespaces.
2015-06-01 17:20:02 -04:00
Robert Maynard
3a532160c9
cuda device adapter now support different value types for keys and values.
2015-06-01 17:19:33 -04:00
Robert Maynard
98bd557a4f
TestingDeviceAdapter now doesn't use initializer lists for vtkm::Vec
...
Since initializer lists are a c++11 feature we shouldn't use them.
2015-06-01 14:50:35 -04:00
Robert Maynard
ca3a91ef6e
Merge branch 'add-tbb-backend'
2015-06-01 14:31:01 -04:00
Sujin Philip
08f88b1cb9
Add TBB backend.
2015-06-01 13:57:37 -04:00
Chun-Ming Chen
7ea9563d19
Fixed bug in ReduceByKey
2015-06-01 12:33:08 -04:00
Robert Maynard
81450f2317
CellSetExplicit can now use different storage backends.
...
CellSetExplicit can now use different storage backends to allow
for cheaper representations of the data. For example a pool of triangles
can now implicit handles for shape and num indices.
This does raise the question if runtime polymorphism is the best approach
for CellSet, or if we should do some from of CRTP.
2015-06-01 09:55:53 -04:00
Robert Maynard
ecec6945bf
ExplicitConnectivity can now use different storage backends.
...
ExplicitConnectivity can now use different storage backends to allow
for cheaper representations of the data. For example a pool of triangles
can now implicit handles for shape and num indices.
2015-06-01 09:42:10 -04:00
Robert Maynard
9eb84295fa
correct a bad file being in the cmakelists.
2015-05-29 15:53:20 -04:00
Robert Maynard
25722fec2e
Merge 'origin/datamodel-design' into datamodel-design
...
Conflicts:
vtkm/cont/ExplicitConnectivity.h
vtkm/cont/Field.h
2015-05-29 13:54:10 -04:00
Dave Pugmire
089864d6f3
minor fixes and code cleanup for merge to trunk.
...
added vtkm_cont_export to ExplicitConnectivity classes.
2015-05-29 12:48:31 -04:00
Dave Pugmire
4af48552b8
added vtkm_cont_export
2015-05-29 12:22:00 -04:00
Robert Maynard
7552509e4b
Include all the new DataSet header in CMakeLists.
...
This will make sure that we properly install these headers.
2015-05-29 12:07:46 -04:00
Robert Maynard
9e75fb9ca3
ExplicitConnectivity now uses ArrayHandle.allocate + std::copy in FillViaCopy.
...
The original implementation use the naive approach of the device adapter
to copy the memory to the dynamic array handle. The issue with this approach
is that it would do a upload to device, and than a copy on device. Instead
we should prefer a copy on host, and than an upload to device.
2015-05-29 10:42:15 -04:00
Robert Maynard
dd298b1826
ExplicitConnectivity and RegularConnectivity can now upload to any device.
...
Previously we had accidentally bound the PrepareForInput method to upload
only to the default device adapter, which breaks the use case of allowing
multiple simultaneous backends at runtime.
2015-05-29 10:34:06 -04:00
Robert Maynard
42dc45c8b7
Correct the include guards on vtkm::cont::Field.
2015-05-29 09:51:11 -04:00
Robert Maynard
b8ac6d6a81
Field now uses ArrayHandle.allocate + std::copy in CopyData.
...
The original implementation use the naive approach of the device adapter
to copy the memory to the dynamic array handle. The issue with this approach
is that it would do a upload to device, and than a copy on device. Instead
we should prefer a copy on host, and than an upload to device.
2015-05-29 09:48:48 -04:00
Robert Maynard
e4423944a2
CellSet's now hold logical structure by value, instead of by pointer.
2015-05-29 09:07:40 -04:00
Robert Maynard
895a0dff6c
Correct testing results for UnitTestWorkletMapTopologyExplicit.
...
Looking at the cell fields in MakeTestDataSet, I have computed the corrected
average values that we should expect.
2015-05-29 09:07:24 -04:00
Robert Maynard
41a22b7bfb
mark variables in Topology tests as vtkmNotUsed.
2015-05-28 16:53:53 -04:00
Robert Maynard
a61989a6d5
Redesign RegularStructure and RegularConnectivity to use vtkm::Vec.
...
By having them use vtkm::Vec the code becomes safer ( no bad indexes on dim=2).
Plus CellSetStructured becomes super simple.
2015-05-28 16:49:40 -04:00
Robert Maynard
b1dfa20d45
All test vtkm::cont::DataSets are now made on the stack.
...
No need to heap allocate vtkm::cont::DataSet now.
2015-05-28 15:35:19 -04:00
Robert Maynard
a7bfc99579
DataSet now holds all CellSets by shared pointer.
...
This clarifies the ownership semantics of the CellSets.
2015-05-28 15:30:13 -04:00
Robert Maynard
b695460f39
Merge branch 'faster_extent_methods'
2015-05-28 09:12:04 -04:00
Robert Maynard
07970cf476
Correct all signed / unsigned and narrowing warnings ( 64bit to 32bit ).
2015-05-28 09:05:17 -04:00
Robert Maynard
e17b072ac6
Add optimized versions of ExtentIndexToFlatIndex for dim=1,2,3.
2015-05-28 08:28:13 -04:00
Brent Lessley
0a72789304
Resolved all implicit conversions between unsigned int and vtkm::Id.
2015-05-26 09:34:43 -04:00
Robert Maynard
d54aee7eb5
Merge branch 'fix_typo_in_copyright'
2015-05-21 10:32:08 -04:00
Robert Maynard
6b8e7822be
The Copyright statement now has all the periods in the correct location.
2015-05-21 10:30:11 -04:00
Robert Maynard
38258e0f71
Merge branch 'reduce_by_key'
2015-05-21 08:50:39 -04:00
Robert Maynard
0dde5fec68
Remove duplicate testing code from UnitTestFunctionInterface.
2015-05-21 08:50:08 -04:00
Robert Maynard
f2b47ffd4a
Add ReduceByKey to the DeviceAdapter.
2015-05-21 08:23:28 -04:00
Robert Maynard
be193542ac
Introduce StreamCompact with a custom stencil unary predicate.
2015-05-21 08:23:28 -04:00
Dave Pugmire
14a0b5f1f7
remove a print
2015-05-20 15:29:57 -04:00
Dave Pugmire
dac2bd0db6
Merge branch 'datamodel-design' of public.kitware.com:vtkm into datamodel-design
2015-05-20 15:26:38 -04:00
Dave Pugmire
e1bbda8cae
Add PrintSummary() for DataSet.
2015-05-20 15:26:10 -04:00
Jeremy Meredith
8a7f0add99
removing some debug code.
2015-05-20 12:56:16 -04:00
Jeremy Meredith
c55d764c50
adding coordinate systems instead of axis indices.
2015-05-20 12:46:00 -04:00
Jeremy Meredith
019e30a263
allow requesting fields by name, and make test data set names more sensible.
2015-05-20 11:46:04 -04:00
