Commit Graph

3395 Commits

Author SHA1 Message Date
Thomas J. Otahal
aeed7a07af Cell variables for External Faces
The External Faces filter and worklet now pass cell variables
through to the output data.
2017-07-31 08:06:33 -06:00
Thomas J. Otahal
ad13e9b412 Merge branch 'master' into external-faces-production 2017-07-19 13:54:36 -06:00
Thomas J. Otahal
ab25c160ed External Faces Uniform and Rectilear grids
Added new Run method to External Faces worklet to support
uniform and rectilinear grids, taking advantage of the grids
regular strucuture to speed-up computation.

Changed External Faces filter to call the proper Run method
in the External Faces worklet based on cell set type.

Added tests for uniform and rectilinear grids to External Faces
filter unit test.
2017-07-19 13:35:31 -06:00
Matt Larsen
ed4c7bc106 Merge topic 'remove_open_mp'
8d6f60b3 Removing references to VTKM_DEVICE_ADAPTER_OPENMP since it does not exist and will fail to compile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !844
2017-07-19 10:37:59 -04:00
mclarsen
8d6f60b38d Removing references to VTKM_DEVICE_ADAPTER_OPENMP since it does not exist and will fail to compile 2017-07-18 14:19:54 -07:00
David Lonie
dd0b81aea8 Merge topic 'ArrayTransferBenchmark'
760c5856 Add BenchmarkArrayTransfer.
379c3a0f Use current device when allocating managed memory.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !837
2017-07-13 16:44:14 -04:00
David C. Lonie
760c5856f0 Add BenchmarkArrayTransfer.
This will let us measure performance while tuning CUDA managed memory
hints.
2017-07-13 15:17:02 -04:00
David C. Lonie
379c3a0fad Use current device when allocating managed memory. 2017-07-13 12:55:22 -04:00
David Lonie
a2238f673b Merge topic 'fix-type-warning'
6a6e55b5 Fix warning on gcc 7.1.1.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !833
2017-07-13 10:04:45 -04:00
Abhishek
58a08287bb Merge topic 'PICS'
8e500a17 Moving PortalType templetization to Step method of Integrators
33150365 Validate the data format for the UniformGridEvaluate.
69c1f946 Merge branch 'PICS' of gitlab.kitware.com:dpugmire/vtk-m into PICS
b87e8881 Merge branch 'PICS' of gitlab.kitware.com:dpugmire/vtk-m into PICS
5a652f41 Fix for MSVC compile isses
50dbd634 Remove unneeded template from grid eval glasses.
6f1e9b40 Fix compile warning.
32a0be8b Fix compile warnings/errors from CDash.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !828
2017-07-13 09:41:33 -04:00
David Lonie
0f1ce4760f Merge topic 'basic-array-leak-fix'
49d57c0d Fix memory leak in ArrayHandleBasicImpl.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !835
2017-07-12 17:12:40 -04:00
David C. Lonie
6a6e55b534 Fix warning on gcc 7.1.1.
Implicit cast from size_t to int was triggering a couple thousand
warnings on the new GCC.
2017-07-12 15:35:12 -04:00
Yenpure
8e500a172a Moving PortalType templetization to Step method of Integrators
Changes suggested by Rob.
2017-07-12 15:31:16 -04:00
Dave Pugmire
33150365eb Validate the data format for the UniformGridEvaluate. 2017-07-12 12:02:04 -05:00
Dave Pugmire
69c1f946c5 Merge branch 'PICS' of gitlab.kitware.com:dpugmire/vtk-m into PICS 2017-07-12 12:01:49 -05:00
Dave Pugmire
b87e888139 Merge branch 'PICS' of gitlab.kitware.com:dpugmire/vtk-m into PICS 2017-07-12 10:43:21 -05:00
Yenpure
5a652f41bc Fix for MSVC compile isses
MSVC does not allow typename for non templated types while
compiling with c++98 std. (clang/gcc allow it)
Don't know about which standards Kitware uses to test builds, but
this should fix it.
Also removing unused parameter from the particle advection example.
2017-07-12 10:52:39 -04:00
Dave Pugmire
50dbd6347a Remove unneeded template from grid eval glasses. 2017-07-12 08:38:32 -05:00
Robert Maynard
3a71c58e4f Merge topic 'doxygen_tweaks'
98f8c2e0 Doxygen now excludes the thrust policy namespace.
cb4cae86 Cleanup the aligned allocator doxygen.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !834
2017-07-12 08:54:31 -04:00
Dave Pugmire
6f1e9b40a3 Fix compile warning. 2017-07-12 00:39:40 -05:00
Dave Pugmire
32a0be8bc7 Fix compile warnings/errors from CDash. 2017-07-11 23:33:29 -05:00
Dave Pugmire
4f7ccdefbf Remove the rectilinear examples. 2017-07-11 21:27:53 -05:00
Dave Pugmire
4574f36dec Cleanup of particle advection worklets
Created ParticleAdvection.h for worklets that match the worklet pattern.
Slight reorganization of existing code to match this pattern.
Added a unittest particle advection.
2017-07-11 21:22:28 -05:00
David C. Lonie
49d57c0d9e Fix memory leak in ArrayHandleBasicImpl.
The execution resources were not being freed when the shared storage
object was destroyed.
2017-07-11 15:48:34 -04:00
Li-Ta Lo
5bf0bfe11a Merge topic 'kdtree'
37ded1cf Resolve code review issues, 1. cudaDeviceSetLimit issue, 2. Namespace issue
bf11195d Resolve the code review issues
75c794f6 Add 3D kd tree reconstruction and nearest neighbor searh

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !797
2017-07-11 11:40:39 -04:00
Li-Ta Lo
36d585825a Merge topic 'scanbykey'
65910f13 put return value back to ScanInclusivePortal
da1c8993 Merge branch 'scanbykey' of gitlab.kitware.com:ollielo/vtk-m into scanbykey
16b61d86 Make ScanInclusiveByKey and ScanInclusiveByKey void functions.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !829
2017-07-11 10:58:45 -04:00
Robert Maynard
98f8c2e0fe Doxygen now excludes the thrust policy namespace. 2017-07-11 08:48:49 -04:00
Robert Maynard
cb4cae8685 Cleanup the aligned allocator doxygen. 2017-07-11 08:48:36 -04:00
Dave Pugmire
77c152abc2 Move some python files used for the paper. 2017-07-10 14:32:07 -05:00
Dave Pugmire
929b10fa72 MR cleanup.
Move some python testing files for the paper into the paper repo. (removing from VTK-m repo)
Removed a #define that is no longer needed.
2017-07-10 14:30:38 -05:00
Li-Ta Lo
65910f139c put return value back to ScanInclusivePortal 2017-07-10 12:11:51 -06:00
caseywang777
37ded1cf69 Resolve code review issues, 1. cudaDeviceSetLimit issue, 2. Namespace issue 2017-07-10 10:52:47 -06:00
Matt Larsen
c9ce558497 Merge topic 'fix_for_rt_lib'
adced368 Adding private targert link library to fix undefined symbols in ubuntu

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !830
2017-07-10 10:36:19 -04:00
Matt Larsen
adced36814 Adding private targert link library to fix undefined symbols in ubuntu 2017-07-10 07:34:51 -07:00
Matt Larsen
ab76f8161e Merge topic 'no_opengl_rendering_fix'
013ff1ba On a system that has no opengl or mesa and with rendering enabled (such as docker container), vtkm fails to configure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !832
2017-07-10 10:26:55 -04:00
Matt Larsen
013ff1ba45 On a system that has no opengl or mesa and with rendering enabled (such as docker container), vtkm fails to configure
when adding target_include_directories for the rendering library. I believe this happens because cmake determines that the variable VTKm_OPENGL_INCLUDE_DIRECTORIES is dependent on OPENGL_INCLUDE_DIRS( which is NOTFOUND). This causes cmake to raise an error even when VTKm_OPENGL_INCLUDE_DIRECTORIES is set to "".
2017-07-10 07:24:50 -07:00
Matt Larsen
30d4577a9c Merge topic 'rendering_header_cleanup'
e783487f Adding ArrayHandleCast header
a2b3f803 Cleaning up rendering headers and moving structured volume renderer into cxx file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !831
2017-07-08 18:42:20 -04:00
Matt Larsen
e783487f98 Adding ArrayHandleCast header 2017-07-08 14:03:33 -07:00
Matt Larsen
a2b3f80356 Cleaning up rendering headers and moving structured volume renderer into cxx file 2017-07-08 13:48:38 -07:00
Dave Pugmire
b86ca21b6d Cleanup for merge.
Renamed filter classes to worklet.
Removed some dead code.
2017-07-08 15:54:44 -04:00
Li-Ta Lo
da1c89932e Merge branch 'scanbykey' of gitlab.kitware.com:ollielo/vtk-m into scanbykey 2017-07-07 15:21:35 -06:00
Li-Ta Lo
16b61d8697 Make ScanInclusiveByKey and ScanInclusiveByKey void functions.
These two algorithms does not return meaningful return values. Generic interface and
implementation are both void. Remove erronous return type and statement for CUDA backend.
2017-07-07 15:11:42 -06:00
David Lonie
8c4a7f74fb Merge topic '163-VecUniformPointCoordinates-refactor'
fb2d36be Refactor VecRectilinearPointCoordinates.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !824
2017-07-07 15:23:27 -04:00
Dave Pugmire
6d51769ef7 Merge branch 'PICS' of gitlab.kitware.com:dpugmire/vtk-m into PICS 2017-07-07 15:21:01 -04:00
Dave Pugmire
d0bedec95a Remove duplicate include file. 2017-07-07 15:19:16 -04:00
ayenpure
f209d670be Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into PICS 2017-07-07 15:01:24 -04:00
ayenpure
02116fadc9 Updating build files.
Updating build files to properly build the particle advection filter.
2017-07-07 14:17:41 -04:00
ayenpure
0495b2f224 Updated BOV reader and removed unnecessary files.
Removed the PICS.h file which was the initial file for the particle advection
filter. Updated the BOV reader for compile warning fixes and formatting issues.
2017-07-07 14:05:56 -04:00
David C. Lonie
fb2d36be1e Refactor VecRectilinearPointCoordinates.
See #163.
2017-07-07 13:49:35 -04:00
ayenpure
f5c59a01e8 Updates for particle advection files.
- removing tabs, and trailing whitespaces.
- removing compile warnings for clang and gcc.
2017-07-07 13:46:45 -04:00