Commit Graph

2969 Commits

Author SHA1 Message Date
Dave Pugmire
863c403f98 Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype 2017-08-28 14:50:46 -04:00
Dave Pugmire
6714124b0c remove whitespace. 2017-08-28 14:44:56 -04:00
Dave Pugmire
c398654df9 Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype 2017-08-28 14:43:04 -04:00
Dave Pugmire
611c5c43e5 Remove dead code. Remove compiler warnings. 2017-08-28 14:31:50 -04:00
Shawn Waldon
0dbf776b76 Use VTKm_BINARY_DIR relative path to find headers to install 2017-08-28 11:38:31 -04:00
Shawn Waldon
a481671c5b Configure files to VTKm_BINARY_DIR-based paths 2017-08-28 11:38:31 -04:00
Allison Vacanti
9a341d6607 Add VTKM_NO_ASSERT option to disable VTKM_ASSERT in Debug Mode.
This was requested by ParaView for performance reasons.
2017-08-28 08:53:09 -04:00
dongliangchu
bc3b2e2bb5 reviewed version 1 2017-08-25 09:21:39 -04:00
Allison Vacanti
196aecd98f Merge topic 'interop_tryexecute'
4c29dc6b Ensure array's device is valid before interop.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !892
2017-08-25 09:17:30 -04:00
Kenneth Moreland
3471dc27fe Expand usage of AverageByKey
The AverageByKey.h header file had a single function that used the
device adapter algorithm ReduceByKey method to do a simple averaging of
a field. I added a second method that can do an average when given a
vtkm::worklet::Keys object. I expect this to be a common use case as we
implement transforming fields from input to output in many algorithms.
2017-08-24 17:20:21 -06:00
Kenneth Moreland
8312fe54ab Merge topic 'cononical-face-edge-ids'
1d5a4d47 Update ExternalFaces worklet to use hashes
fc7b90ac Add hash function
b1e6c1e3 Add method for getting a cononical edge id
8e72dc73 Add method for getting a cononical face id

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !900
2017-08-24 19:00:21 -04:00
Sujin Philip
160c5f53c5 Merge topic 'result_is_valid'
e1219f76 Re-add IsValid to Result.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !901
2017-08-24 17:02:58 -04:00
dongliangchu
839185a527 reviewed version 1 2017-08-24 16:48:50 -04:00
dongliangchu
6f509a8b4a reviewed version 1 2017-08-24 16:46:35 -04:00
dongliangchu
babb154a37 reviewed version 1 2017-08-24 16:32:06 -04:00
Matt Larsen
93aa64109f Merge topic 'line_rendering'
8e0a0308 Handles the case when the passed canvas has rendered data.
b727377f Refactoring
44357d51 Apply external faces filter on cellset before wireframing
7e95269c Refactoring wireframing code
5738e895 Wireframe rendering
657b0b94 Applies `clang-format` and minor refactoring
af2acc57 Implements a simple line renderer using Xialin Wu's algorithm

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !895
2017-08-24 15:49:14 -04:00
Allison Vacanti
4c29dc6bc0 Ensure array's device is valid before interop. 2017-08-24 15:02:46 -04:00
Allison Vacanti
e1219f7667 Re-add IsValid to Result.
This method more clearly communicates "execution was successful" than
"IsDataSetValid". Changed some infrastructure code's use of these methods
to fix a bug in VTK.
2017-08-24 14:25:45 -04:00
Kenneth Moreland
1d5a4d470d Update ExternalFaces worklet to use hashes
Our experiments have shown using hashes and then resolving collisions to
be faster than trying to sort by Ids.
2017-08-24 12:11:45 -06:00
Robert Maynard
2e7d9e3c85 Merge topic 'introduce_neighborhood_worklet_type'
99f60c27 Add GameOfLife example to show off WorkletPointNeighborhood3x3x3.
ce803832 Adds WorkletPointNeighborhood and DispatcherPointNeighborhood types.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !864
2017-08-24 13:49:24 -04:00
Robert Maynard
6a4e91d5d1 ExecutionPolicy now handles CUDA9 removal of __CUDACC_VER__ 2017-08-24 12:59:16 -04:00
Kenneth Moreland
fc7b90aca6 Add hash function
Based on the FNV-1a algorithm. Creates 32-bit hashes.
2017-08-24 10:02:18 -06:00
dongliangchu
90c870f2f5 reviewed version 1 2017-08-24 10:50:14 -04:00
Manish Mathai
8e0a0308f0 Handles the case when the passed canvas has rendered data.
This change adds a option via `SetIsOverlay` which causes the
`MapperWireframer` to use the existing depth buffer instead of
generating a new one.
This change refactors the line color blending to
retain the alpha value separately instead of pre-multiplying it.
2017-08-23 14:51:05 -07:00
Robert Maynard
ce80383238 Adds WorkletPointNeighborhood and DispatcherPointNeighborhood types.
VTK-m is now able to run algorithms on structured points that require the
local point neighbors in a highly efficient manner.
2017-08-23 16:42:00 -04:00
Sujin Philip
3a3665ee5e Fix missing DeviceAdapter in dispatchers 2017-08-22 13:00:28 -04:00
Robert Maynard
0cbc3db016 Merge topic 'stolen_arrays_can_still_be_used_as_input'
c385b21a StorageBasic is now treated like users memory after being stolen.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !891
2017-08-22 09:09:58 -04:00
Manish Mathai
b727377fd5 Refactoring 2017-08-21 18:21:44 -07:00
Manish Mathai
44357d5113 Apply external faces filter on cellset before wireframing 2017-08-21 18:21:44 -07:00
Manish Mathai
7e95269ce0 Refactoring wireframing code 2017-08-21 18:21:44 -07:00
Manish Mathai
5738e895ce Wireframe rendering 2017-08-21 18:21:37 -07:00
dongliangchu
1d80d5b69c reviewed version 1 2017-08-21 13:11:04 -04:00
dongliangchu
ff4ce72d4e reviewed version 1 2017-08-20 15:02:52 -04:00
dongliangchu
eb4320ab17 reviewed version 1 2017-08-20 14:00:11 -04:00
Matt Larsen
5782152485 Merge topic 'x_ray_add_emmission'
5429f120 fixed energy error and fix for ray camera
ac784330 Merge remote-tracking branch 'upstream/master' into x_ray_add_emmission
521e445b emission now functioning
52959d91 testing emission
5fc80517 initial version on absorption and emission integration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !893
2017-08-20 00:09:13 -04:00
Matt Larsen
5429f1200e fixed energy error and fix for ray camera 2017-08-19 17:19:03 -07:00
dongliangchu
fffc0282a5 reviewed version 1 2017-08-18 19:20:15 -04:00
dongliangchu
424b37ec97 reviewed version 1 2017-08-18 16:28:33 -04:00
Sujin Philip
a1abc4c211 Merge topic 'refactor-kdtree'
2141435a Refactor KDTree3D worklet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !890
2017-08-18 11:41:01 -04:00
Robert Maynard
c385b21acd StorageBasic is now treated like users memory after being stolen.
Previously once an ArrayHandle was stolen it was placed in an invalid state
where it could not used again by VTK-m. Now instead after being stolen it
is placed into a state where it is identical to memory allocated outside
of VTK-m and passed in.
2017-08-18 08:24:49 -04:00
Kenneth Moreland
b1e6c1e34b Add method for getting a cononical edge id
The cononical edge id is stored in a vtkm::Id2.
2017-08-17 16:07:41 -06:00
Kenneth Moreland
8e72dc738a Add method for getting a cononical face id
The cononical face id is stored in a vtkm::Id3 (independent of the
actual number of points in the face).
2017-08-17 15:48:47 -06:00
Robert Maynard
b9e69217ae Merge topic 'typedef_to_using_round_4'
f6863594 Convert VTK-m over to use 'using' instead of 'typedef'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !885
2017-08-17 16:38:49 -04:00
Sujin Philip
2141435a19 Refactor KDTree3D worklet 2017-08-17 15:25:08 -04:00
Sujin Philip
72a6cf4a21 Change cuda calls to use the per-thread stream. 2017-08-17 11:03:02 -04:00
Robert Maynard
f68635941e Convert VTK-m over to use 'using' instead of 'typedef' 2017-08-17 10:47:25 -04:00
Robert Maynard
0c435d39f4 Merge topic 'remove_lines_with_only_semicolon'
a487017f Remove lines that only contain a semi-colon.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !886
2017-08-17 09:34:15 -04:00
Robert Maynard
a487017fd1 Remove lines that only contain a semi-colon. 2017-08-16 14:31:17 -04:00
Robert Maynard
89f439999a Reduce the amount of typedef statements in DeviceAdapters
By using the auto keyword and decltype we can reduce the number of
complex typedefs that exist when writing device adapter algorithms.
The goal being that it is easier for developers to see the actual
algorithms being implemented, by reducing the amount of template
'noise'.
2017-08-16 14:23:21 -04:00
Robert Maynard
e095831199 ArrayHandleReverse now supports shrink/allocate under all conditions.
Previously ArrayHandleReverse would only work if it was provided an explicit
users array to map too. But this doesn't need to be so, if a user wants to
start by constructing an ArrayHandleReverse we should allow that.

The side effect of this, is that some very tricky code in the DeviceAdapters
can be removed, that explicitly was added to allow output to ArrayHandleReverse
2017-08-16 14:20:05 -04:00
Manish Mathai
657b0b9432 Applies clang-format and minor refactoring 2017-08-16 11:02:42 -07:00
Manish Mathai
af2acc5736 Implements a simple line renderer using Xialin Wu's algorithm
The algorithm is parallelized using a custom Mapper and Canvas class.
It is parallelized over the expected pixels that will be colored,
blending with any previous color value. This does not use the depth buffer
and hence will naively overrwite all pixels while drawing a line segment.
2017-08-16 11:02:42 -07:00
Robert Maynard
a185cd297b Refactor vtkm::interop::TransferToOpenGL for implicit ArrayHandles.
Previously TransferToOpenGL would rely on every array handle implementing
the CopyInto method for transferring to work properly. This was problematic
as most Implicit arrays don't implement CopyInto.

Now we use the Devices built in Copy infrastructure to facilitate moving
data from an implicit array to concrete memory which we can be passed
to OpenGL. As an additional optimization, the temporary memory for this
interop is cached in the bufferstate.
2017-08-15 17:04:10 -04:00
Matt Larsen
ac78433085 Merge remote-tracking branch 'upstream/master' into x_ray_add_emmission 2017-08-15 07:27:17 -07:00
Sujin Philip
dfb38f9349 Merge topic 'cellsetexplicit-gpu-impl'
c07fb14b Build CellSetExplicit.cxx for devices

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !883
2017-08-14 14:02:00 -04:00
Allison Vacanti
23755bd635 Merge topic '150-interop_device_refactor'
fcee1cd5 Deduce device adapter tag in interop::TransferToOpenGL.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !880
2017-08-14 12:19:06 -04:00
Sujin Philip
c07fb14bf1 Build CellSetExplicit.cxx for devices 2017-08-14 10:19:34 -04:00
Allison Vacanti
fcee1cd5e9 Deduce device adapter tag in interop::TransferToOpenGL. 2017-08-14 09:36:39 -04:00
Matt Larsen
7ca8d1bd3a Merge topic 'mapper_fixes'
df185a67 removing background colors from tracers. Background color is now the responsiblitiy of the canvas.
28b1e6b1 initializing ray color buffer to 0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !881
2017-08-12 22:29:12 -04:00
Matt Larsen
df185a67aa removing background colors from tracers. Background color is now the responsiblitiy of the canvas. 2017-08-12 17:22:47 -07:00
Matt Larsen
28b1e6b13b initializing ray color buffer to 0 2017-08-12 15:42:26 -07:00
dongliangchu
833df44202 merging unittest for multiblock filters 2017-08-12 10:42:40 -04:00
dongliangchu
5194b3cd39 merging unittest for multiblock filters 2017-08-12 08:40:39 -04:00
Sujin Philip
9deea72f72 Merge topic 'update-buildconnectivity'
4e1b026c Streamline CellSetExplicit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !878
2017-08-11 17:29:35 -04:00
Yenpure
533380e705 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into pics_unittests 2017-08-11 16:01:06 -04:00
Sujin Philip
4e1b026c8a Streamline CellSetExplicit
1) Don't require a DeviceAdapter for the BuildConnectivity function (#131)
2) Explicitly instantiate default CellSetExplicit and CellSetSingleType
2017-08-11 10:14:40 -04:00
Allison Vacanti
565896cc49 Combine ResultField + ResultDataSet into Result. 2017-08-11 08:25:42 -04:00
Robert Maynard
1f451d538b Merge topic 'vtkm_assert_dont_generate_unused_warnings_in_relwithdebinfo'
33afb076 VTKM_ASSERT when disabled will still 'use' the input variables.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !876
2017-08-11 08:23:17 -04:00
Robert Maynard
3a8a64dfa3 Merge topic 'vtkm_cont_internal_now_uses_using'
ac90e2dc vtkm::cont::internal now prefers 'using' over 'typedef'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !875
2017-08-11 08:23:06 -04:00
ayenpure
2c662457f0 Fix particle advection compile warnings 2017-08-10 22:19:50 -04:00
ayenpure
84f9ec47ee Fix particle advection build warning
-adding code to resolve build warnings for gcc 5+
-change the return object of steps in unit test
2017-08-10 21:32:42 -04:00
ayenpure
82067fc8f3 fix for particle advection build issue 2017-08-10 20:34:05 -04:00
dongliangchu
dcc544f827 refactoring unittest for multiblock filters 2017-08-10 16:45:06 -04:00
Dave Pugmire
02bab1a6b7 Fix merge issue. 2017-08-10 16:34:39 -04:00
Dave Pugmire
e5a814d952 Merge branch 'pics_unittests' of gitlab.kitware.com:dpugmire/vtk-m into pics_unittests 2017-08-10 16:28:48 -04:00
dongliangchu
16bb073780 refactoring unittest for multiblock filters 2017-08-10 16:18:36 -04:00
Dave Pugmire
b23564a526 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into pics_unittests 2017-08-10 16:18:18 -04:00
dongliangchu
389bda7ec2 refactoring unittest for multiblock filters 2017-08-10 16:08:10 -04:00
dongliangchu
3bff60d3c6 refactoring unittest for multiblock filters 2017-08-10 16:05:37 -04:00
dongliangchu
72db00ed19 refactoring unittest for multiblock filters 2017-08-10 15:50:27 -04:00
Robert Maynard
33afb076c8 VTKM_ASSERT when disabled will still 'use' the input variables.
This is important as VTKM_ASSERT was the only usage of some variables, so in
release mode we would have declared but not used warnings.
2017-08-10 15:37:35 -04:00
Robert Maynard
ac90e2dc73 vtkm::cont::internal now prefers 'using' over 'typedef' 2017-08-10 15:26:05 -04:00
Allison Vacanti
326757b571 Remove ArrayHandleCuda.
!861 (b0dba9a1) adds this functionality to basic ArrayHandles.
2017-08-10 15:21:52 -04:00
Abhishek Yenpure
e4116edab8 particle advection tests for rectilinear grid
-added tests for rectilinear grid
-fixing rectilinear grid evaluator for GPUs
2017-08-10 15:14:42 -04:00
James Kress
23a56dd771 Merge topic 'Create-YAxis-Log-Scaling'
f3e455eb Adding 2D, 3D annotations, fixing GL color mapper.
7c0b15a5 Adding ability to have y-axis log scaling in 1D.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !863
2017-08-10 13:48:41 -04:00
Abhishek Yenpure
a3b4ad8b1a particle advection test fixes
-fixes for testing particle advection on the GPU.
-minor fixes for GPU
2017-08-10 13:39:47 -04:00
James
f3e455ebf6 Adding 2D, 3D annotations, fixing GL color mapper. 2017-08-10 09:26:16 -04:00
Thomas Otahal
89b2700298 Merge topic 'external-faces-production'
75517554 Move check for cell variables to it gets executed.
147247e8 Code formatting changes and compiler warning fixes.
a3fd135b Fix errors and warnings on Mac and Windows
347af497 Poly Data for External Faces
aeed7a07 Cell variables for External Faces
ad13e9b4 Merge branch 'master' into external-faces-production
ab25c160 External Faces Uniform and Rectilear grids

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !860
2017-08-09 16:00:01 -04:00
Kenneth Moreland
b4bf0534e1 Merge topic 'glfw-sign-conversion-warning'
2e875d4d Fix signed/unsigned conversion warnings in GLFW test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !868
2017-08-09 11:17:58 -04:00
Robert Maynard
87e1df76ea Merge topic 'print_summary_handle_uint8'
531205c8 Printing of ArrayHanlde<vtkm::Vec< UInt/Int8 >> now works as intended.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !866
2017-08-09 08:34:47 -04:00
ayenpure
bc259e1523 Particle advection grid evaluators testing fix 2017-08-08 23:03:08 -04:00
Kenneth Moreland
2e875d4dfa Fix signed/unsigned conversion warnings in GLFW test 2017-08-08 16:14:55 -06:00
Robert Maynard
531205c82c Printing of ArrayHanlde<vtkm::Vec< UInt/Int8 >> now works as intended.
Now when printing ArrayHandles that contain vec's of UInt8/Int8 you see
the integer representation instead of the ascii representation.
2017-08-08 16:38:20 -04:00
Robert Maynard
08d4b3cf36 Merge topic 'clang_tidy'
b85cdd90 Convert VTK-m over to use 'using' instead of 'typedef'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !836
2017-08-08 16:26:10 -04:00
Yenpure
9714ea36fa Particle advection test fix
-Added a worklet to execute evaluator test on device
-Fixing various compile issues
2017-08-08 16:19:02 -04:00
Robert Maynard
a143e2e8f5 Merge topic 'correct_visit_index'
07cd0f05 All scatters VisitIndex now are zero based.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !865
2017-08-08 11:17:01 -04:00
Robert Maynard
07cd0f0516 All scatters VisitIndex now are zero based.
Fixes #166
2017-08-08 09:38:04 -04:00
Sujin Philip
38700ffae3 Merge topic 'fix-cellsets'
4db096bf Update CellToPoint worklets
6ce8218d Implement CellToPoint for CellSetPermutation
46aa7451 Fix CellSetExplicit CellToPoint

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !848
2017-08-07 14:20:10 -04:00
Robert Maynard
b85cdd9080 Convert VTK-m over to use 'using' instead of 'typedef' 2017-08-07 14:05:43 -04:00
James
7c0b15a555 Adding ability to have y-axis log scaling in 1D. 2017-08-07 10:45:03 -04:00