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
2,000 Commits 9 Branches 24 Tags 38 MiB
08a33675f6
Commit Graph

2000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Maynard
801eec76b5 Merge topic 'fix-vectorization-configs' 
746d6fc7 Fix configuration of vectorization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !495
 2016-08-03 17:09:49 -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
5837864c52 Merge topic 'master' 
a9ccdf57 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m
447295e7 Switch from OSMesa to ray tracer for demo because OSMesa is not working atm.
df0e6457 Demo.cxx compiles, at least. But, the background isn't even correct.
293ba569 Demo.cxx has not been updated in a while (pre-ResultDataSet change).
e8b17eb9 OSMesa, not OSMESA.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !492
 2016-08-03 12:58:00 -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
Mark Kim
a9ccdf579a Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m 2016-08-03 09:40:25 -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
Mark Kim
447295e79b Switch from OSMesa to ray tracer for demo because OSMesa is not working atm. 2016-08-02 18:29:30 -04:00
Mark Kim
df0e64572a Demo.cxx compiles, at least. But, the background isn't even correct. 2016-08-02 16:27:55 -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
ce1eeca93b Merge topic 'copyright-check' 
4f49a840 Update VTKmCheckCopyright.cmake to ignore build files.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !486
 2016-08-02 14:27:43 -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
4f49a8407b Update VTKmCheckCopyright.cmake to ignore build files. 2016-08-02 13:50:33 -04:00
Robert Maynard
f527b8a0b2 Merge topic 'collapse-exec-cont-portals' 
2e33f883 Collapse exec and cont portals into one class.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !485
 2016-08-02 13:42:57 -04:00
T.J. Corona
8ad8eeda77 In DynamicCellSet, expose CellSet API. 
Also changes GetCellSet() to CastToBase().
 2016-08-02 13:39:25 -04:00
Mark Kim
293ba569e7 Demo.cxx has not been updated in a while (pre-ResultDataSet change). 2016-08-02 13:22:02 -04:00
Mark Kim
e8b17eb947 OSMesa, not OSMESA. 2016-08-02 13:10:32 -04:00
T.J. Corona
2e33f8830f Collapse exec and cont portals into one class. 2016-08-02 11:26:29 -04:00
Kenneth Moreland
8f406cf460 Merge branch 'fix-infinite-recursion' into 'master' 
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.

See merge request !483
 2016-07-31 18:09:41 -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
d39ac17951 Merge topic 'fix/Triangulator' 
a4012c16 Rmoving throw from worklet that prevents rendering from compiling with CUDA

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !481
 2016-07-29 17:21:42 -04:00
Robert Maynard
1efbbdc19a Merge topic 'example_dispatcher_test_works_again' 
17966256 Cleanup the multiple dynamic array handle dispatch example.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !480
 2016-07-29 11:32:31 -04: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
1796625616 Cleanup the multiple dynamic array handle dispatch example. 2016-07-29 09:48:13 -04:00
Robert Maynard
c739e02374 Merge topic 'vtkm_find_package_support_QUIET' 
063b349a Setup the examples to find vtkm components quietly.
e52f7628 VTKm config module now properly support the QUIET flag.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !479
 2016-07-28 16:35:44 -04: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
063b349a20 Setup the examples to find vtkm components quietly. 2016-07-28 10:47:43 -04:00
Robert Maynard
e52f7628a7 VTKm config module now properly support the QUIET flag. 
The QUIET flag will also be properly propagated to all modules
that VTKm finds.
 2016-07-28 10:46:59 -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
5e1b2e966d Merge topic 'install_missing_config_file' 
037ebc4a Install the VTKmConfig.cmake file.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !477
 2016-07-25 11:10:36 -04:00
Robert Maynard
037ebc4a9a Install the VTKmConfig.cmake file. 2016-07-25 10:31:08 -04:00
Robert Maynard
16cabc05b1 Merge topic 'status-on-find-package' 
f90b42ac Add status messages when using find_package(VTKm)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !471
 2016-07-25 10:13:02 -04:00
Robert Maynard
44afc5e878 Merge topic 'more_suppress_of_cuda_warnings' 
45ada6b5 Rework ArrayHandleCuda to make it stop generate warnings
4ca6ce2a nvcc doesn't have troubles with boost shared_ptr optimizations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !473
 2016-07-20 14:46:15 -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
f96991b63d Merge topic 'remove_result_unused_warnings' 
aa01784a Remove unused result warnings from StreamLineUniformGrid example.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !474
 2016-07-15 15:31:50 -04:00
Robert Maynard
aa01784a06 Remove unused result warnings from StreamLineUniformGrid example. 2016-07-15 11:40:52 -04:00
Robert Maynard
94c03a72ad Merge topic 'more_suppress_of_host_device_warnings' 
76cd2ac4 More corrections needed to suppress false positive host / device warnings.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !469
 2016-07-05 08:43:06 -04:00
Kenneth Moreland
f90b42ac84 Add status messages when using find_package(VTKm) 
When finding the VTKm package, it is important to load components that
support the devices you want to use. However, there is no indication of
what does and does not get loaded. In some circumstances, it simply says
that VTKm_FOUND is not true but not why. Add some status messages of
whether each component gets loaded or not.
 2016-06-30 15:25:26 -06:00
Robert Maynard
76cd2ac4da More corrections needed to suppress false positive host / device warnings. 2016-06-30 16:04:37 -04:00