Commit Graph

419 Commits

Author SHA1 Message Date
Jimmy
3c25024781 hide debug / benchmark outputs 2015-06-24 15:13:16 -04:00
Jimmy
4220b37135 Finish testing codes for VertexClustering 2015-06-24 14:55:22 -04:00
Chun-Ming Chen
470c93fe69 move VertexClustering codes to /vtkm/cont/worklet 2015-06-24 14:55:22 -04:00
Chun-Ming Chen
71974e4cd3 Add vtkm/worklet/testing/UnitTestVertexClustering.cxx 2015-06-24 14:55:22 -04:00
Chun-Ming Chen
ebd6e43409 Added VertexClustering test 2015-06-24 14:55:22 -04:00
Chun-Ming Chen
4f813ca4c5 Prepare for vertex clustering algorithm 2015-06-24 14:55:21 -04:00
Sujin Philip
273281f581 Fix Parallel Scan implementation for TBB Device
The previous implementation assumed the identity value to be zero, which does
not work for multiplication. Changed the interface to require an initial value
for Exclusive Scan with custom operator (TBB Device only, for now).
2015-06-24 09:24:58 -04:00
Robert Maynard
6b70893b96 Merge branch 'clarify_unary_and_binary_operator_names' into 'master'
Clarify unary and binary operator names

Fixes the naming issues brought up in Issue #6.

See merge request !54
2015-06-23 15:49:03 -04:00
Robert Maynard
459552d795 Update the name of the binary functor for UpperBounds 2015-06-23 09:19:09 -04:00
Robert Maynard
3cbac03810 Update the name of the binary functor Unique 2015-06-23 08:58:53 -04:00
Robert Maynard
e6cadef457 Update the name of the unary functor for StreamCompact. 2015-06-23 08:56:18 -04:00
Robert Maynard
7ee3084868 Update the name of the binary functor for Sort. 2015-06-23 08:36:42 -04:00
Robert Maynard
604289c1ce Update the name of the binary functor for ScanInclusive 2015-06-23 08:26:04 -04:00
Robert Maynard
c3f2c34606 Merge branch '3dScheduling' into 'master'
Allow invocation of worklets to use vtkm::Id3

@kmorel, @jsmeredith, @dpugmire

This allow invocation of worklets whose input domain is regular connectivity to be scheduled use the ```DeviceAdapters Schedule(vtkm::Id3)``` method.

This is just the first step in having efficient 3d scheduling. The next step is to upgrade all the ```vtkm::exec::arg``` to support Id3 index's for the load and store methods.

Note:
I would love somebody to suggest a better name for ```GetSchedulingDimensions```

See merge request !53
2015-06-22 17:47:28 -04:00
Robert Maynard
36c2740072 Teach DispatcherMapTopology how to do 2d and 3d scheduling.
The requirements for 2d/3d scheduling are that the input domain must be a
regularly structured grid.
2015-06-22 16:05:32 -04:00
Robert Maynard
8ba0dacc65 Update the name of the binary functor for Reduce. 2015-06-22 11:55:02 -04:00
Robert Maynard
0901e71574 Update the name of the binary comparison for LowerBounds. 2015-06-22 11:49:11 -04:00
Robert Maynard
9597620a60 Update the name of predicates, and binary functors. 2015-06-22 11:13:27 -04:00
Robert Maynard
10fdb5baf3 Update the Documentation for DeviceAdapter::Copy 2015-06-22 11:13:27 -04:00
Robert Maynard
1442400018 Merge branch 'faster_tbb_algorithms' into 'master'
Improve the performance of tbb sortbykey with heavy value arrays.

See merge request !52
2015-06-22 09:20:18 -04:00
Robert Maynard
4175ff2915 Allow dispatching based on a vtkm::Id2.
This is being added so that it is easy to schedule 2d grids easily, without
them having to pass in a 3d range.
2015-06-22 09:07:27 -04:00
Robert Maynard
2a66dec110 Correct a bug in the logic of determining the block size. 2015-06-22 08:51:25 -04:00
Robert Maynard
49467f3c33 Clean up indentation and remove dead code. 2015-06-19 15:30:03 -04:00
Robert Maynard
b36211baf2 Improve the performance of tbb sortbykey with heavy value arrays. 2015-06-19 14:37:59 -04:00
Robert Maynard
d57c39863a Merge branch 'unify_iterator_syntax' into 'master'
ArrayPortalFromIterators uses the GetIteratorBegin method signature.

This makes all the custom ArrayPortals have the same syntax,
which is nice when writing new backends.

See merge request !48
2015-06-19 14:36:34 -04:00
Robert Maynard
7c60e7649b Merge branch 'simplify_serial_sort' into 'master'
Simplify serial sort

See merge request !49
2015-06-19 14:27:21 -04:00
Robert Maynard
640aa69b0f ArrayPortalFromIterators uses the GetIteratorBegin method signature.
This makes all the custom ArrayPortals have the same syntax,
which is nice when writing new backends.
2015-06-19 13:04:53 -04:00
Robert Maynard
fa78610ea1 Remove inclusion of iostream header. 2015-06-19 13:03:56 -04:00
Robert Maynard
f2d5b49823 Remove the ZipHandle special case from DeviceAdapterAlgorithmSerial 2015-06-19 13:01:49 -04:00
Robert Maynard
5e63e0d60f Remove less operator from IteratorFromArrayPortal.h 2015-06-19 12:56:46 -04:00
Robert Maynard
9c1012b782 Merge branch 'verify_permutation_array' into 'master'
Verify permutation array works with Sort and Reduce.

See merge request !46
2015-06-19 09:31:55 -04:00
Robert Maynard
011b79ba00 Verify permutation array works with Sort and Reduce. 2015-06-19 08:44:21 -04:00
Robert Maynard
6c3f669398 Remove dead code for converting zip handles to iterators for cuda.
This code isn't needed anymore as the new iterator facade handles this
use case properly.
2015-06-18 13:53:02 -04:00
Robert Maynard
9d350fb023 Correct undefined behavior that was causing scan test failures.
We need call PrepareForInput on the input argument before invoking a function.
The order of execution of parameters of a function is undefined, so we need to
make sure input is called before output, or else in-place use case breaks.
2015-06-17 15:35:27 -04:00
Kenneth Moreland
46e1d9e5e7 Add NewInstance method to DynamicArrayHandle. 2015-06-16 15:23:50 -06:00
Robert Maynard
1c14539579 Merge branch 'correct_vtkm_pair_init' into 'master'
Properly initialize vtkm::Pair, and remove the TypeTrait for it.

vtkm::Pair can hold vtkm::Vec so we need to call the proper constructor
for vtkm::Vec.

Now that vtkm::TypeTraits don't error out on unknown types, we don't need
the weird specialization for vtkm::Pair.

See merge request !39
2015-06-16 16:00:44 -04:00
Robert Maynard
6279b8ed28 Correct tbb to properly sort all arrrays in parallel. 2015-06-16 14:40:25 -04:00
Robert Maynard
9ef7fa9b3a Merge branch 'iterator_operator_square_bracket_corrected' into 'master'
Make sure we use ptrdiff_t for index into arrays.

This is a requirement since you can use negative indices into arrays.

See merge request !41
2015-06-16 13:09:17 -04:00
Robert Maynard
eb7e388adc Properly initialize vtkm::Pair, and remove the TypeTrait for it.
vtkm::Pair can hold vtkm::Vec so we need to call the proper constructor
for vtkm::Vec.

Now that vtkm::TypeTraits don't error out on unknown types, we don't need
the weird specialization for vtkm::Pair.
2015-06-16 13:06:08 -04:00
Robert Maynard
726c914ee5 Make sure we use ptrdiff_t for index into arrays.
This is a requirement since you can use negative indices into arrays.
2015-06-16 11:00:01 -04:00
Robert Maynard
eb6c698e63 Remove un-needed overloads from WrappedOperators for cuda. 2015-06-16 09:48:12 -04:00
Robert Maynard
2ce14c7760 DeviceAdapter's now properly init all value types.
This is needed when use vtkm::Vec, as it doesn't zero the memory it contains.
2015-06-16 08:35:04 -04:00
Robert Maynard
095f25c3ac vtkm::TypeTraits now work on all types. Plus has ZeroInit helper function. 2015-06-16 08:34:29 -04:00
Robert Maynard
2c91cdfa3b Update cuda/thrust backend scan algorithms to work with vec types. 2015-06-16 08:28:31 -04:00
Robert Maynard
19121fbbfb Remove creating a vtkm::vec from a pointer.
We need to remove this overload to simplify the constructors, and to
allow code such as vtkm::Vec<float,3> f(0). Which when you have both
overloads is ambiguous.
2015-06-16 08:27:37 -04:00
Robert Maynard
e44510eef7 Testing was calling host functions from device+host functions. 2015-06-16 08:27:37 -04:00
Robert Maynard
b7537fec9c Merge branch 'unused_typedef_warnings' into 'master'
Unused typedef warnings

See merge request !37
2015-06-15 14:15:09 -04:00
Robert Maynard
4088db797d disable conversion warnings inside boost 2015-06-15 11:45:31 -04:00
Robert Maynard
2eba6ecb32 Remove uneeded typedefs. 2015-06-15 11:45:31 -04:00
Chun-Ming Chen
32f3fa6d87 Fix unmerged codes from the previous merge. Use multiply in customed operator ReduceByKey test 2015-06-15 11:12:51 -04:00