Commit Graph

1557 Commits

Author SHA1 Message Date
Robert Maynard
a8f23ba7ba worklet::Threshold now has a default device adapter. 2016-08-11 14:47:59 -04:00
Robert Maynard
856b8b547d Express in the the threshold filter policy it only handles scalars. 2016-08-08 16:51:09 -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
02929c79e4 Add more benchmarks that work at the Worklet level.
These benchmarks are the foundation to expanding the benchmarking folder
to verify the performance of more than just the device adapter.
2016-08-05 16:30:20 -04:00
Robert Maynard
0f545c53e3 Merge topic 'now_can_build_with_cxx11'
a6609311 Silence auto_ptr deprecation warnings with older boosts ( < 1.61 )
6d38f44d Update ListTag and DispatcherBase to leverage C++11 features.
ea0d84a8 Remove VTK-m Variadic defines and replace them with a single CXX11 define
77121d18 Add support to VTK-m to build with C++11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !475
2016-08-05 16:03:35 -04:00
Robert Maynard
08a33675f6 Prefer vtkm::cont::CastAndCall function over the member method. 2016-08-05 15:29:39 -04:00
Robert Maynard
31138293f9 Pass Fields and CoordinateSystems to Dispatcher::Invoke
Now that we can handle scheduling Fields and CoordinateSystems, do
2016-08-05 15:26:17 -04:00
Robert Maynard
146d800968 make CastAndCall a free function instead of a class.
Overloading the function serves the same purpose of specializing the
class, but requires less syntax sugar to do.
2016-08-05 15:18:22 -04:00
T.J. Corona
9e9e32ace7 Merge topic 'field-coordsystem-invoke'
927387b1 Add vtkm::cont::Field,CoordinateSystem as Invokable parameters.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !494
2016-08-03 17:24:13 -04:00
Sujin Philip
746d6fc7b2 Fix configuration of vectorization
1. Re-enable vectorization setup in cmake
2. Set vectorization flags to empty when "none" is specified.
2016-08-03 16:07:21 -04:00
T.J. Corona
927387b1a2 Add vtkm::cont::Field,CoordinateSystem as Invokable parameters.
Originally, only array handles could be passed to the dispatcher.
This update extends the list to Field and CoordinateSystem as
dynamic objects.
2016-08-03 15:46:30 -04:00
Robert Maynard
a6609311fa Silence auto_ptr deprecation warnings with older boosts ( < 1.61 ) 2016-08-03 15:38:38 -04:00
Robert Maynard
6d38f44d6c Update ListTag and DispatcherBase to leverage C++11 features. 2016-08-03 15:38:38 -04:00
Robert Maynard
ea0d84a810 Remove VTK-m Variadic defines and replace them with a single CXX11 define 2016-08-03 15:38:38 -04:00
Robert Maynard
2b011c621c Merge topic 'add-device-to-filter-policy'
e177e5a9 Add device list to filter policy.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !491
2016-08-03 10:34:47 -04:00
T.J. Corona
e177e5a9ff Add device list to filter policy. 2016-08-03 10:17:20 -04:00
Kenneth Moreland
dcb032fc00 Merge branch 'expose-storage' into 'master'
Expose storage in ArrayHandle, and Expose data array in StorageBasic.



See merge request !487
2016-08-03 08:51:12 -04:00
Robert Maynard
b50e18b374 Merge topic 'cellsetexplicit-addcell-indexable-type'
62fa852e In CellSetExplicit::AddCell, change vtkm::Vec to template parameter.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !490
2016-08-03 08:21:49 -04:00
T.J. Corona
3461f5c940 Merge topic 'division-op-for-vec'
3463db3b Add division operator for Vec/scalar operations.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brent Lessley <blessley@cs.uoregon.edu>
Merge-request: !489
2016-08-02 14:44:43 -04:00
T.J. Corona
62fa852e12 In CellSetExplicit::AddCell, change vtkm::Vec to template parameter.
This commit is in reference to Issue #40.
2016-08-02 14:40:59 -04:00
T.J. Corona
e07e4aeda7 Merge topic 'expose-cellarray-api'
8ad8eeda In DynamicCellSet, expose CellSet API.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !488
2016-08-02 14:25:15 -04:00
T.J. Corona
3463db3b28 Add division operator for Vec/scalar operations. 2016-08-02 14:21:19 -04:00
T.J. Corona
2ade3ba8d8 Expose storage in ArrayHandle, and Expose data array in StorageBasic. 2016-08-02 14:05:05 -04:00
T.J. Corona
8ad8eeda77 In DynamicCellSet, expose CellSet API.
Also changes GetCellSet() to CastToBase().
2016-08-02 13:39:25 -04:00
T.J. Corona
2e33f8830f Collapse exec and cont portals into one class. 2016-08-02 11:26:29 -04:00
Kenneth Moreland
8863769ea7 Fix an infinite recursion where the wrong overload was called
The intension was that if Camera::Zoom was called with a Float64, it
would call the Float32 version. However, I made a type where it called
itself. The latest version of XCode called me out on this infinite
recursion.

I think this is the equivalent of the compiler calling me a dumb-ass.
2016-07-31 11:47:30 -06:00
Matt Larsen
a4012c1667 Rmoving throw from worklet that prevents rendering from compiling with CUDA 2016-07-29 07:50:14 -07:00
Robert Maynard
063a4248b3 Merge topic 'unify_contour'
73440ccb vtkm::filter::MarchingCubes now uses vtkm::worklet
33d7ad8f Unify the contour MarchingCubes implementations.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !476
2016-07-28 11:45:38 -04:00
Robert Maynard
73440ccb4e vtkm::filter::MarchingCubes now uses vtkm::worklet
Instead of having two separate implementations of MarchingCubes, we have
a single implementation in worklet, and filter uses that.

That does mean that the version in worklet has been updated to support
merging of duplicate point coordinates.
2016-07-28 08:52:34 -04:00
Robert Maynard
45ada6b55a Rework ArrayHandleCuda to make it stop generate warnings 2016-07-20 12:41:13 -04:00
Robert Maynard
33d7ad8f86 Unify the contour MarchingCubes implementations. 2016-07-20 12:40:03 -04:00
Robert Maynard
4ca6ce2ad6 nvcc doesn't have troubles with boost shared_ptr optimizations 2016-07-19 13:26:23 -04:00
Robert Maynard
76cd2ac4da More corrections needed to suppress false positive host / device warnings. 2016-06-30 16:04:37 -04:00
Kenneth Moreland
6dbff1b778 Fix template issue with IteratorFromArrayPortal
I don't know why, but under some circumstances when compiling with CUDA
and Visual Studio, the compiler was giving syntax errors when the
IteratorFromArrayPortal was using the typename keyword to reference a
type in its superclass. Get around the problem by looking directly in
the superclass.
2016-06-27 14:30:02 -06:00
Kenneth Moreland
d7ed37cd1e Fix incorrect export macro in FieldStatistics worklet 2016-06-27 13:39:03 -06:00
Kenneth Moreland
acf28962d6 Make sure Configure.h included with Assume.h
The VTKM_ASSUME macro uses some of the definitions defined in
Configure.h, but it never included that file. So unless that file
happened to be included before Assume.h, VTKM_ASSUME could be declared
incorrectly.

Actually added the include to Assert.h, which Assume.h includes.
2016-06-27 13:26:39 -06:00
Kenneth Moreland
eb8ca27932 VTKM_SUPPRESS_EXEC_WARNINGS was in the wrong place
The VTKM_SUPPRESS_EXEC_WARNINGS should go before the template keyword,
but on a couple of methods in FunctionInterfaceDetailPre.h.in it was
after the template keyword.
2016-06-27 13:08:35 -06:00
Kenneth Moreland
4c272b5b43 Remove thrust warnings about type conversion
Add pragmas to disable warnings 4244 and 4800 on Visual Studio when
compiling third party libraries. This gets around some warnings inside
the thrust library.
2016-06-27 07:50:17 -06:00
Kenneth Moreland
51a35cb4fe Fix warnings about type conversions 2016-06-27 07:50:15 -06:00
Kenneth Moreland
fd29c81bde Fix warnings about redefined macros
The build automatically sets some macros when building CUDA files. Some
of the CUDA sources were setting the same macros, which was causing
warnings. Change the code to be more careful about setting preprocessor
macros.
2016-06-27 07:50:13 -06:00
Kenneth Moreland
968e1b6008 Make sure tests for many devices are using requested devices
There are several tests in the cont directory that are in header files so
that they can be recompiled for different devices. Make sure that the
tests are exclusively using the device being tested by making the error
device adapter the default.

If any part of the test tries to use the default device (which could be
different than the one being tested), a compile error will occur. Several
of these compile errors are fixed in this commit.
2016-06-23 17:34:01 -06:00
Robert Maynard
a23a9397bb MarchingCubes now works on structured and unstructured cellsets.
Previously it was only working on structured cellsets.
2016-06-23 10:05:07 -04:00
Kenneth Moreland
1f5a74fb30 Merge branch 'cmake-package-update' into 'master'
Update the CMake package

These commits update how the CMake configuration sets up the
find_package information (accessed in VTKmConfig.cmake). It 
establishes a bunch of components that can be used in the
find_package command to load various aspects like CUDA and
TBB.

See merge request !460
2016-06-22 17:04:49 -04:00
Kenneth Moreland
9b82518836 Fix warning about using wrong type in pointer addition
Just use the ArrayPortalToIterator functions. That's what they are there
for.
2016-06-22 13:47:59 -06:00
Kenneth Moreland
7ff20c9230 Fix includes for CUDA builds
The CMake CUDA build targets do not respect the
target_include_directories (yet?). Instead, add the necessary includes
to cuda_include_directories().
2016-06-22 12:53:23 -06:00
Robert Maynard
5f16d4920d Merge topic 'reduce_filter_marching_cubes_size'
65a3de9d Only generate code paths for Hexahedron input cells.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !447
2016-06-22 13:36:15 -04:00
Kenneth Moreland
53da35ecc2 Fix some warnings on Visual Studio 2016-06-21 18:03:33 -06:00
Kenneth Moreland
13ee8bc190 Fix several issues with making sure all includes are set
Make everything consistent with new builds.
2016-06-21 18:03:29 -06:00