Commit Graph

4662 Commits

Author SHA1 Message Date
Robert Maynard
2a75dd50ee Merge topic 'morton_codes_maybe-uninitialized_warnings'
62c7b745 VTK-m MortonCodes on GCC 7 was generating maybe-uninitialized warnings.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !1189
2018-05-08 16:34:15 -04:00
Robert Maynard
bb279506a1 Merge topic 'cuda_75_signed_warnings'
364b366a Correct signed/unsigned cast warnings from DeviceAdapterAlgorithmThrust

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1193
2018-05-08 16:33:35 -04:00
Robert Maynard
62c7b745df VTK-m MortonCodes on GCC 7 was generating maybe-uninitialized warnings.
The id4 while always valid is constructed using a lookup table and the
compiler can't see if that will always be a valid vec 4.
2018-05-08 15:45:38 -04:00
Robert Maynard
cd85892670 Merge topic 'connectivity_maybe_uninitialized'
b26a428d DataSetBuilderUniform won't trigger false positive uninitialized warning.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1186
2018-05-08 15:38:37 -04:00
Robert Maynard
0a26f3749e Merge topic 'image_connectivity_warnings'
21b80a5d UnitTestImageConnectivity now uses size_t to index to std::vector
44382300 Make sure all tests use the .cxx extension.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !1190
2018-05-08 15:37:24 -04:00
Robert Maynard
364b366ab3 Correct signed/unsigned cast warnings from DeviceAdapterAlgorithmThrust
Found with CUDA 7.5
2018-05-08 15:29:11 -04:00
Utkarsh Ayachit
e7c3b2f849 Merge topic 'fixing-warnings'
593061cf UnitTestPointTransform: fix errors when using `double` as float type.
20e7cd41 Demo.cxx: fix type conversion warning
bd43f4b1 UnitTestCellDerivative: fix type conversion warning.
7f58019e cleanup doxygen warnings
16444517 CellDerivative: fix type conversion warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1188
2018-05-08 15:02:44 -04:00
Utkarsh Ayachit
593061cfb0 UnitTestPointTransform: fix errors when using double as float type. 2018-05-08 14:52:23 -04:00
Utkarsh Ayachit
20e7cd4189 Demo.cxx: fix type conversion warning 2018-05-08 14:52:23 -04:00
Utkarsh Ayachit
bd43f4b1fd UnitTestCellDerivative: fix type conversion warning. 2018-05-08 14:52:22 -04:00
Utkarsh Ayachit
7f58019eb6 cleanup doxygen warnings 2018-05-08 14:52:22 -04:00
Utkarsh Ayachit
1644451715 CellDerivative: fix type conversion warnings 2018-05-08 14:52:22 -04:00
Robert Maynard
1969da4478 Merge topic 'correct_conversion_warning_from_streamline_filter'
d0fc332c Correct conversion warnings in the streamline filter.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1187
2018-05-08 14:49:11 -04:00
Robert Maynard
b26a428d36 DataSetBuilderUniform won't trigger false positive uninitialized warning.
The logic inside DataSetBuilderUniform has some tricky logic but for all
cases the dimensions are correct. We just initialize the variable to make
the compiler stop warning.
2018-05-08 13:57:50 -04:00
Robert Maynard
21b80a5dcd UnitTestImageConnectivity now uses size_t to index to std::vector 2018-05-08 13:52:54 -04:00
Robert Maynard
443823007c Make sure all tests use the .cxx extension. 2018-05-08 13:52:32 -04:00
Robert Maynard
d0fc332cc0 Correct conversion warnings in the streamline filter.
The strealine filter was incorrectly converting all inputs to
vtkm::FloatDefault which can cause a warning when FloatDefault is double
2018-05-08 13:25:49 -04:00
Li-Ta Lo
269b940fe6 Merge topic 'connected_component'
d3dbdd59 remove using namespace, specify fully qualified names
ae5e3be8 Merge branch 'connected_component' of gitlab.kitware.com:ollielo/vtk-m into connected_component
f655e8f1 add overload of Run() for ArrayHandle
6f853971 Add vtkm::worklet::connectivity namespace
ce27f5fc Change signature of ImageConnectivity::Run()
648b0dec add installation of header files in CMakeLists.txt
d94f2cae Add ImageConnectivity worklet
ca0e9d20 Change signature of ImageConnectivity::Run()
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1154
2018-05-08 11:08:54 -04:00
Dave Pugmire
4fec7e6919 Merge topic 'point_translate'
6dd82d69 Create a new worklet for point transformations. Also provide a unitest.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1177
2018-05-08 08:32:57 -04:00
Sujin Philip
f213cd1fcb Merge topic 'fix-cmakefiles'
80789a85 Export vtkm::cuda and vtkm::tbb targets as GLOBAL
3be5ee8a Fix usage of vtkm_compile_as_cuda in examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1183
2018-05-04 17:29:00 -04:00
Robert Maynard
ed7487d150 Merge topic 'worklets_obey_device_adapter'
626a49cc Worklet Dispatcher calls now consistently specify a device adapter
a6bf830f ParticleAdvection run method now obeys the passed in device adapter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1179
2018-05-04 17:25:33 -04:00
Robert Maynard
dcbd5b9e81 Merge topic 'correct_gcc_7_warnings'
737ea7e1 Suppress maybe-uninitialized warnings for gcc 4+
7ac4ae15 Marching Cubes test doesn't abuse fall through case statements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1182
2018-05-04 17:25:10 -04:00
Sujin Philip
80789a85da Export vtkm::cuda and vtkm::tbb targets as GLOBAL 2018-05-04 16:14:53 -04:00
Robert Maynard
bfdf1bc420 Merge topic 'vtkm_find_gl_useable_when_rendering_disabled'
fb0da7f2 Allow vtkm_find_gl CMake function to be used no matter vtk-m settings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1181
2018-05-04 16:09:23 -04:00
Robert Maynard
737ea7e156 Suppress maybe-uninitialized warnings for gcc 4+
The maybe uninitialized warnings condition logic wasn't correct the
first time, and needed to be extended for gcc4+. This locally has
resolved the problems the first try didn't solve.
2018-05-04 15:28:44 -04:00
Sujin Philip
3be5ee8a7c Fix usage of vtkm_compile_as_cuda in examples
Incorrect usage in histogram and redistribute_points examples.
Only source files (.cxx) should be specified.
2018-05-04 15:26:13 -04:00
Robert Maynard
7ac4ae1507 Marching Cubes test doesn't abuse fall through case statements 2018-05-04 15:19:11 -04:00
Robert Maynard
626a49cc0b Worklet Dispatcher calls now consistently specify a device adapter
Some worklets Run() method accidentally used the default device adapter
which should be avoided. Instead they should use a passed in device
adapter so that we support multiple device adapters in the same
binary/executable.
2018-05-04 15:12:49 -04:00
Robert Maynard
a6bf830f5f ParticleAdvection run method now obeys the passed in device adapter
Previous ParticleAdvection would dispatch some of the worklets
on the default device adapter and not the explicitly requested
device adapter
2018-05-04 15:12:49 -04:00
Robert Maynard
fb0da7f2de Allow vtkm_find_gl CMake function to be used no matter vtk-m settings
Previously vtkm_find_gl was only usable when rendering was enabled.
This is problematic as examples would use vtkm_find_gl even if
they didn't use vtkm rendering library.
2018-05-04 15:01:06 -04:00
Robert Maynard
c9deb99e14 Merge topic 'exec-obj-device-search-execution'
d32f8213 Removed template for device from execution object
fce5fea3 Changed how TriangulateTables.h was creating ExecutionObjects
5d1e8ccc corrected logical error in texture2d and cleaned up particles.h
7eb35564 Created an execution object for Texture2D
7cb2421e moved a function out of the execution environment
35085442 cleaning up compilation warings in particles.h
b016d5ee fixed the compiler errors for particle and particle advection worklet
b693d8be removed particle abstraction
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1094
2018-05-04 08:19:44 -04:00
Matthew Letter
d32f8213e4 Removed template for device from execution object
the execution object is no longer passed when making execution object instead it is pass in the transport tag to create the final execution object
2018-05-03 14:59:54 -06:00
Matthew Letter
fce5fea31f Changed how TriangulateTables.h was creating ExecutionObjects
abstracted out execution objects for both tetrahedralize and triangulate and removed the device template requirement from the execution object factory for both classes
2018-05-03 14:59:54 -06:00
Matthew Letter
5d1e8cccb4 corrected logical error in texture2d and cleaned up particles.h
cleaned up a logic error texture2d and cleaned how the constructor for execution object was being called. Also, went and cleaned up how the execution object was being created for particle to align it with the same method for creating the execution object.
2018-05-03 14:45:22 -06:00
Matthew Letter
7eb3556491 Created an execution object for Texture2D
abstracted out the execution object from the execution object factory and removed the device template from the factory.
2018-05-03 14:45:22 -06:00
Matthew Letter
7cb2421edf moved a function out of the execution environment
The factory should not eb being called from the execution environment.
2018-05-03 14:45:22 -06:00
Matthew Letter
35085442b4 cleaning up compilation warings in particles.h 2018-05-03 14:45:22 -06:00
Matthew Letter
b016d5eeaa fixed the compiler errors for particle and particle advection worklet
there was an error involving const and prepareforinput between the particle's const prepareforexecution function and array handle prepareforinput.
2018-05-03 14:45:22 -06:00
Matthew Letter
b693d8bed5 removed particle abstraction
removed the abstraction of particle and stateparticle so they are not inheriting each other
2018-05-03 14:45:22 -06:00
Matthew Letter
d3fde1f870 creating a execution object facotry for particles
abstracted out particles into an execution object and a factory that populates said execution object based on its state. removed the facotries dependance on a device adaptor.
2018-05-03 14:45:22 -06:00
Matthew Letter
0ea68f6c41 removed execution object base from code base
since we no longer use execution object base in the code base it is being removed
2018-05-03 14:45:22 -06:00
Matthew Letter
af250acbfc added PrepareForExecution to compile code base
added prepare for execution function to all the execution object factories that did not have it implemented to compile the code base
2018-05-03 14:45:22 -06:00
Matthew Letter
cc7035ae9e Added new line to file to fit with kitware robot suggestion 2018-05-03 14:45:22 -06:00
Matthew Letter
8f622839b6 added PrepareForExecution() to UnitTestDispatcherBase.cxx
added PrepareForExecution() to UnitTestDispatcherBase.cxx to start resolving all the missing implementations of the new execution object architecture.
2018-05-03 14:45:22 -06:00
Kenneth Moreland
9127029fbb Determine ExecObject type directly from PrepareForExecution
Rather than require all ExecutionObjectFactoryBase classes to declare a
templated ExecObjectType type, get the type of the execution object
directly from the result of the PrepareForExecution method.
2018-05-03 14:45:22 -06:00
Matthew Letter
7c3342c1d8 updated cell locator two level uiniform grid to call LookupStructure
before it was wall prepareforexecution(device) creating an execution object but invoke calls this function now through the transport tag so we just need to give it the factory object not the execution object
2018-05-03 14:45:22 -06:00
Matthew Letter
c024147e6d Updating execution object creation
Updating execution object creation to use a factory for creating the execution object  to be passed to the invoke method.
2018-05-03 14:45:22 -06:00
Matthew Letter
8fb4fc6760 updating basic transport example to use new execution object creation
updating the transport execution object test to use the factory to create an execution object based on the templated device and chaged the trasport tag to call the prepareForExectuion(Device) method to create the execution object.
2018-05-03 14:45:22 -06:00
Matthew Letter
7e5a55881b changes typechecks for execution objects
In order to make the change from the current way execution obejcts are utilized to the new proposed executionObjectFactory process type checks now has to look for the new execution object factory class to check against.
2018-05-03 14:45:21 -06:00
Robert Maynard
9ac466edf7 Merge topic 'maybe_uninitialized_warnings'
36ae705e Suppress maybe-uninitialized warnings from VecTraitsTests
5bc9ecef Add a vtkm::Vec<T,N> fast path for CopyInto a vec of the same type

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1176
2018-05-03 11:58:29 -04:00