Commit Graph

1177 Commits

Author SHA1 Message Date
Abhishek Yenpure
dcbb444a74 Warning fixes for BoundingIntervalHierarchy
- Adding VTKM_CONT_EXPORT to CellLocator
- Removing whitespaces
- Fixing warnings of unused typedef
2018-06-29 14:51:50 -06:00
Abhishek Yenpure
50963290dc Moving BoundingIntervalHierarchy.cxx to device sources
Rectifying print statements in the unit test
2018-06-29 10:46:31 -07:00
ayenpure
bf224dbb7c Adding VTKM_CONT_EXPORT to BoundingIntervalHierarchy 2018-06-29 10:57:25 -06:00
ayenpure
2714da8f0e Adding changes suggested by Rob on GitLab
- Seperate BoundingIntervalHierarchy.h into
  - BoundingIntervalHierarchy.h
  - BoundingIntervalHierarchy.hxx
  - BoundingIntervalHierarchy.cxx
2018-06-29 09:09:24 -06:00
Abhishek Yenpure
72d4556f7d Adding changes for Ken's review from GitLab
- Reducing the stack allocation for CUDA for the BIH unit test
- Adding changes from Ken's review
- Suppress ptxas stack size warning for BoundingIntervalHierarchy
2018-06-27 22:40:13 -06:00
ayenpure
7a122f23b4 Fixing Problems with Locators
-Fix missing copyright statements
-Updating the PointLocator interface
-Updating the Cell Locator unit test to use less memory and finish early
2018-06-24 14:55:11 -06:00
ayenpure
f018a8a7d1 Removing unnecessary print statements
- Removing debug print statements from the Bounding Inteval Hierarchy Cell
  Locator
2018-06-23 18:49:57 -06:00
ayenpure
d8e8078099 Fixing the typos with ScanExclusiveByKey
- Fixed the typo
- Moved the test to vtkm/worklet/testing as vtkm/cont/testing does not execute with CUDA
2018-06-15 16:39:00 -07:00
ayenpure
18579394ed Moving Files for proper CellLocator/PointLocator APIs
-Changing the existing CellLocator.h to CellLocatorHelper.h,
 it's used by CellLocatorTwoLevelUniformGrid.h

-Changing unit tests and worklets that use CellLocator.h to use CellLocatorHelper.h
2018-06-04 19:51:54 -07:00
ayenpure
a0504405a2 Merge branch 'bih' of https://gitlab.kitware.com/mmathai/vtk-m into spatialsearch 2018-06-02 13:47:15 -07:00
Allison Vacanti
93506d25e2 Change function signatures to use 'using' aliases.
Also cleaned up some lingering type typedefs.
2018-05-25 17:18:41 -04:00
Kenneth Moreland
411f12cd33 Merge topic 'gradient-vecoutput-device-execution'
86f3ffa76 Updated gradient scalar output to use new execution obejct

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1208
2018-05-24 10:23:28 -04:00
Haocheng LIU
5c797169ec Use the strong typed enums for vtkm::cont::Field
Since Field association is used either when creating or working
with 'vtkm::cont::Field', it's put in the class itself.
2018-05-22 11:44:51 -04:00
Abhishek Yenpure
7291327e98 Merge topic 'fix_warnings'
3f08c444 Fixing warnings introduced by MR 1165

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1212
2018-05-18 20:02:34 -04:00
ayenpure
3f08c44436 Fixing warnings introduced by MR 1165 2018-05-18 12:25:52 -07:00
David Thompson
52a1495859 Fix cell measure when using double precision as default. 2018-05-18 14:05:06 -04:00
Matthew Letter
86f3ffa76e Updated gradient scalar output to use new execution obejct
gradient scalar output now has a prepare for execution function for creating the execution object based on the device adaptor.
2018-05-17 13:05:48 -06:00
Abhishek Yenpure
ffe7f67e52 Merge topic 'temporalparticleadvection'
7188c6ef Removing bad whitespace from TemporalGridEvaluators.h
bc405366 Fixing header guard warning
b39ee80b Fix errors missed/introduced in previous commit.
eb2ed4f2 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into temporalparticleadvection
24dd0638 Fixing merge mess for particle advection
78118a84 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into temporalparticleadvection
129e320d Replicating Rob's changes from the master
40fe133d Fix compile warnings for Temporal Advection
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !1165
2018-05-17 13:25:15 -04:00
David Thompson
1cf1ca7141 Merge topic 'cell-measure'
00c7905a Rename `vtkm::dot()` to `vtkm::Dot()`.
dd7c17f7 Compute cell measures (arc length, area, volume).

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1203
2018-05-17 11:02:34 -04:00
David Thompson
00c7905afb Rename vtkm::dot() to vtkm::Dot().
This keeps the old name around but prepares it for removal
in the next release.
2018-05-17 08:51:01 -04:00
David Thompson
dd7c17f776 Compute cell measures (arc length, area, volume).
This commit adds a worklet and a filter to compute
signed integral measures of cells.

It also begins the practic of adding a markdown
changelog entry in `doc/changelog`. See the
changelog entry for details.
2018-05-17 08:50:56 -04:00
ayenpure
7188c6ef63 Removing bad whitespace from TemporalGridEvaluators.h 2018-05-16 11:30:27 -07:00
Allison Vacanti
c3c8d0fd70 Refactor ArrayHandleCompositeVector to simplify usage and impl.
- Use tao::tuple instead of FunctionInterface to hold array/portal
  collections.
- Type signatures are simplified. Now just use:
  - ArrayHandleCompositeVector<ArrayT1, ArrayT2, ...>
  - make_ArrayHandleCompositeVector(array1, array2, ...)
  instead of relying on helper structs to determine types.
- No longer support component selection from an input array. All
  input arrays must have the same ValueType (See ArrayHandleSwizzle
  and ArrayHandleExtractComponent as the replacements for these
  usecases.
2018-05-16 11:45:12 -04:00
ayenpure
bc40536639 Fixing header guard warning 2018-05-15 17:55:30 -07:00
ayenpure
b39ee80b70 Fix errors missed/introduced in previous commit.
- Missed a ',' to seperate template argument in GridEvaluator
- Adding initialization of params to Integrators for RK4
- Fixing ExecutionBaseObject changes for Particles
2018-05-15 17:45:04 -07:00
ayenpure
eb2ed4f275 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into temporalparticleadvection 2018-05-15 11:46:26 -07:00
ayenpure
24dd063810 Fixing merge mess for particle advection
Adding Utkarsh's changes from 86bd81de to Rectilinear grid as well
 - To make rectilinear grids work with any storage type

Adding Rob's changes from 7d6fe568 to the RK4Integrator
 - Previously the RK4Integrator could compute velocity with uninitialized inputs.

Adding Rob's changes from a6bf830f to ParticleAdvection
 - Previous ParticleAdvection would dispatch some of the worklets on the default device adapter
   and not the explicitly requested device adapter

Adding Ken's change from 0753131a
 - For supporting all the previous merge conflicts with the new ExecutionObjectBase change.
2018-05-15 11:35:29 -07:00
Kenneth Moreland
0753131a04 Replace ExecutionObjectFactoryBase with ExecutionObjectBase
While making changes to how execution objects work, we had agreed to
name the base object ExecutionObjectBase instead of its original name of
ExecutionObjectFactoryBase. Somehow that change did not make it through.
2018-05-10 17:53:39 -06:00
Robert Maynard
916c0902cf Correct Wstrict-overflow issues with gcc 5 and 6 2018-05-09 08:26:45 -04:00
Robert Maynard
b7ab0f1194 ContourTreeUniform ignores strict-overflow optimization warnings.
Numerous worklets of ContourTreeUniform generate optimizations that
presume no vtkm::Id overflow. This assumption is correct, and the
related warning about this optimization can be safely ignored.
2018-05-08 17:38:35 -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
Utkarsh Ayachit
593061cfb0 UnitTestPointTransform: fix errors when using double as float type. 2018-05-08 14:52:23 -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
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
ayenpure
78118a840f Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into temporalparticleadvection 2018-05-07 11:00:52 -07:00
ayenpure
129e320d54 Replicating Rob's changes from the master
Replicating Rob's changes from the MR 'Worklets obey device adapter' #1179
for worklets to obey device adapter in particle advection.
2018-05-07 10:48:26 -07: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
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
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
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
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