Commit Graph

2147 Commits

Author SHA1 Message Date
Mark Kim
e3834d1c73 Merge https://gitlab.kitware.com/vtk/vtk-m 2016-08-18 14:33:37 -06:00
Mark Kim
5fbc55fa52 Check to see if osmesa or egl were found before adding testing. 2016-08-18 14:04:37 -06:00
Robert Maynard
9712de8b24 Merge topic 'wavelets'
d677d0d1 small tweaks
816364d2 in an effort to get rid of a warning
778da350 In attempt to fix errors and warnings
bb450c51 fix a warning
49e56b61 two new wavelet filters, HAAR and CDF8/4 supported now
767356bc working on even length filters; need ASYM* support in Extend1D()
a6efad04 half done even length filters implementation
ee32ea4c took off timing code
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !482
2016-08-18 15:47:33 -04:00
Kenneth Moreland
069fc69869 Merge branch 'try-run-on-device' into 'master'
Add general purpose TryExecute

The filters directory had a couple of classes designed to try executing
filters on a list of devices until one succeeds. There was quite a bit
of code duplication in these, and the code was inaccessible to other
parts of VTK-m. This resolves both of these issues by moving the
functionality to a TryExecute method located in the vtkm::cont
package.

See merge request !507
2016-08-18 15:05:03 -04:00
Robert Maynard
377c38247e Merge topic 'remove_default_device_worklet'
b934c1c7 Remove improper defaults for worklets device adapter.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !509
2016-08-18 13:28:49 -04:00
Samuel Li
d677d0d175 small tweaks 2016-08-18 10:28:41 -06:00
Samuel Li
816364d204 in an effort to get rid of a warning 2016-08-18 09:10:38 -06:00
Robert Maynard
b934c1c71b Remove improper defaults for worklets device adapter.
Without requiring c++11 we can't properly provided default device adapters
to templated functions.
2016-08-18 10:15:05 -04:00
Kenneth Moreland
ece53f514a Fix inappropriate placement of typename keyword
How did any compiler accept that?

Also fix minor warning with topology algorithm benchmark.
2016-08-17 15:51:43 -06:00
Kenneth Moreland
e488967c8f Use general TryExecute for filter execution
The TryExecute function was based off of the ResolveFieldTypeAnd*
classes made for filters. To reduce the amount of code duplication,
modify these two filter classes to use the more general TryExecute
functionality.
2016-08-17 14:13:51 -06:00
Samuel Li
778da350d5 In attempt to fix errors and warnings 2016-08-17 09:37:56 -07:00
Samuel Li
bb450c5156 fix a warning 2016-08-17 09:14:29 -07:00
Samuel Li
49e56b61b5 two new wavelet filters, HAAR and CDF8/4 supported now 2016-08-16 15:20:19 -06:00
Samuel Li
767356bc72 working on even length filters; need ASYM* support in Extend1D() 2016-08-15 17:54:15 -06:00
Kenneth Moreland
dd2edcab6c Add general ability to try execution on multiple devices
There are various reasons why you might want to execute something but
not have a specific device to execute on. To mange this, add a general
function that will try a list of devices in order and attempt to run on
them in order.
2016-08-15 17:16:58 -06:00
Kenneth Moreland
cda276970c Merge branch 'fix-unnecessary-typename' into 'master'
Remove unnecessary typename

There was an instance where the typename keyword was used to declare
that an item in a templated class is a type in a place where the full
type is known. Some compilers (e.g. Visual Studio) do not allow using
typename in this case.

See merge request !506
2016-08-15 18:50:03 -04:00
Kenneth Moreland
13c19ecf9a Remove unnecessary typename
There was an instance where the typename keyword was used to declare
that an item in a templated class is a type in a place where the full
type is known. Some compilers (e.g. Visual Studio) do not allow using
typename in this case.
2016-08-15 15:59:36 -06:00
Samuel Li
a6efad0448 half done even length filters implementation 2016-08-15 13:46:35 -06:00
Samuel Li
ee32ea4cf9 took off timing code 2016-08-12 18:07:36 -06:00
Samuel Li
ff5b1b8dbb performance tunes on IDWT worklet 2016-08-12 17:38:04 -06:00
Samuel Li
75d9ffdea2 address a few suggestions by Rob 2016-08-12 16:00:58 -06:00
Robert Maynard
60b63af707 Merge topic 'histogram_filter'
31156d2e Add a histogram filter.
04761975 Refactor FieldHistogram so class is not templated.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !503
2016-08-12 10:01:54 -04:00
Robert Maynard
31156d2e99 Add a histogram filter. 2016-08-12 08:40:11 -04:00
Robert Maynard
ede09ff62d Merge topic 'threshold_worklet_default_deviceadapter'
a8f23ba7 worklet::Threshold now has a default device adapter.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !504
2016-08-11 16:01:52 -04:00
Robert Maynard
a8f23ba7ba worklet::Threshold now has a default device adapter. 2016-08-11 14:47:59 -04:00
Robert Maynard
04761975be Refactor FieldHistogram so class is not templated.
Move the template parameters to the Run method.
2016-08-11 14:46:45 -04:00
Samuel Li
986db4f2bc fix a few warnings 2016-08-11 09:39:20 -07:00
Samuel Li
710d59d33a Change on class signatures of Filter and Base 2016-08-10 17:24:22 -06:00
Samuel Li
e7b288dba1 eliminates explicit calling VTKM_DEFAULT_DEVICE_ADAPTER_TAG 2016-08-10 14:33:14 -06:00
Robert Maynard
a33f2113ef Merge topic 'unify_dynamic_method_names'
2bbbc7d3 Rename DynamicArrayHandle::IsArrayHandleType to IsType

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !502
2016-08-10 14:30:02 -04:00
Robert Maynard
2bbbc7d38e Rename DynamicArrayHandle::IsArrayHandleType to IsType
This way DynamicArrayHandle and DynamicCellSet have a common set
of methods.
2016-08-10 11:03:57 -04:00
Samuel Li
062aec45f7 some helper functions are in 2016-08-09 17:02:10 -06:00
Robert Maynard
0354b2243b Merge topic 'express_threshold_scalar_req'
856b8b54 Express in the the threshold filter policy it only handles scalars.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !500
2016-08-09 08:46:31 -04:00
Mark Kim
7bb3e89e87 Split EGL and OSMesa into separate directories. libGL and libOSMesa do not play well together. 2016-08-08 21:57:38 -04:00
Samuel Li
f3d7aeced1 use std::vector<vtkm::Id> instead of raw arrays for bookkeeping 2016-08-08 17:59:15 -06:00
Samuel Li
8936ef641e fix a warning in ArrayHandleConcatenate, also add tests to TestingFancyArrayHandles 2016-08-08 16:38:41 -06:00
Samuel Li
8210dcda09 fix throw error 2016-08-08 15:55:49 -06:00
Samuel Li
2b3e2f2fc7 throw an error 2016-08-08 15:20:50 -06:00
Robert Maynard
856b8b547d Express in the the threshold filter policy it only handles scalars. 2016-08-08 16:51:09 -04:00
Samuel Li
71454c11b4 took off function in progress 2016-08-08 14:38:38 -06:00
Samuel Li
7ee9c7d949 each enum is now in its own line 2016-08-08 14:35:14 -06:00
Robert Maynard
06abce55f4 Merge topic 'correct_interop_linking_linux'
720dc149 properly link vtkm::interop to pthread.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !499
2016-08-08 14:03:17 -04:00
Samuel Li
c72b135608 Uncomment other build objects 2016-08-08 12:21:08 -04:00
Robert Maynard
720dc149d1 properly link vtkm::interop to pthread. 2016-08-08 11:14:25 -04:00
Robert Maynard
2406f45cd7 Merge topic 'pass_fields_and_coordinates_to_invoke'
08a33675 Prefer vtkm::cont::CastAndCall function over the member method.
31138293 Pass Fields and CoordinateSystems to Dispatcher::Invoke
146d8009 make CastAndCall a free function instead of a class.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: T.J. Corona <tj.corona@kitware.com>
Merge-request: !497
2016-08-08 08:56:01 -04:00
Robert Maynard
d39d46b997 Merge topic 'field_topology_benchmarks'
02929c79 Add more benchmarks that work at the Worklet level.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !478
2016-08-08 08:33:30 -04:00
Robert Maynard
3596120b46 Merge topic 'reduce_number_of_cuda_checks'
8a441d30 Don't run nvcc native detection multiple times, as the results are cached.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !498
2016-08-08 08:19:58 -04:00
Samuel Li
a1bd8ff56d changes to ArrayHandlePermutation reverted 2016-08-06 12:52:55 -07:00
Samuel Li
34ce28576d change unittest for review 2016-08-06 12:34:03 -07:00
Samuel Li
3d29e504cc fixed a memory bug, now I believe it's ready for merge 2016-08-06 00:08:29 -07:00