Commit Graph

3737 Commits

Author SHA1 Message Date
Kenneth Moreland
0dd1e7ae69 Make Get/SetActiveCellSetIndex method names match in filter
The filter classes have an internal CellSetIndex member that tracks on
which cell set to operate on. The get accessor is called
GetActiveCellSetIndex (note the descriptive "Index" at the end of the
function name). However, the set accessor was called SetActiveCellSet
(sans "Index"). This discrepancy does not make a lot of sense.

This commit changes SetActiveCellSet to SetActiveCellSetIndex. Not only
do I like the extra descriptor (in case we later want to set cells by
name), it is also used much less than the get method so is less
disruptive.
2017-09-12 10:49:57 -06:00
Dave Pugmire
3fc3e08661 Merge topic 'streamline_returntype'
74c38356 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into streamline_returntype
e5843882 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into streamline_returntype
40098181 Remove warnings.
7bbc1417 Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype
48b3f64c Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype
b2de8045 Cleanup. Add some additional tests for streamlines.
408765c9 Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype
7e69b960 Fix merges with master.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !849
2017-09-11 22:25:22 -04:00
Dave Pugmire
74c383562c Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into streamline_returntype 2017-09-11 17:19:19 -04:00
Kenneth Moreland
5342f39fcd Merge topic 'better-components-to-offsets'
1e7b3e6e More control over device in ConvertNumComponentsToOffsets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !920
2017-09-11 11:59:57 -04:00
Dave Pugmire
e5843882d9 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into streamline_returntype 2017-09-08 14:38:11 -04:00
Kenneth Moreland
1e7b3e6e8b More control over device in ConvertNumComponentsToOffsets
Previously, ConvertNumComponentsToOffsets always used TryCompile on the
global set of runtime devices. That is still the default behavior, but
now you are able to specify your own runtime tracker. Also, there are
now versions of ConvertNumComponentsToOffsets that take a device adapter
tag.
2017-09-07 15:08:55 -06:00
Kenneth Moreland
856ed92013 Merge topic 'scatter-counting-default-constructor'
6a3ac261 Provide default constructor for ScatterCounting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !911
2017-09-05 11:23:20 -04:00
Robert Maynard
0071161459 Merge topic 'gradient_optimize_permutation'
a6841393 Gradient fast paths now works on cellset permutations.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !913
2017-09-05 09:22:07 -04:00
Matt Larsen
6e93ee6a26 Merge topic 'rendering_fixes'
50956b80 fixing triangulator and adding a fast path for 3D structured cell sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !912
2017-09-04 17:12:45 -04:00
Robert Maynard
a68413937a Gradient fast paths now works on cellset permutations. 2017-09-04 12:06:21 -04:00
Matt Larsen
50956b8074 fixing triangulator and adding a fast path for 3D structured cell sets 2017-09-04 08:17:01 -07:00
Kenneth Moreland
6a3ac2615c Provide default constructor for ScatterCounting
This allows you to defer its construction. The default constructor
will set up the scatter to have 0 inputs and 0 outputs, so using
it will likely quickly reveal an error.
2017-08-31 16:49:20 -06:00
Robert Maynard
5ec6d8fd13 Merge topic 'for-vtk'
2f2909f7 Add support for containing project to override default install locations
0dbf776b Use VTKm_BINARY_DIR relative path to find headers to install
a481671c Configure files to VTKm_BINARY_DIR-based paths
16720937 Avoid redefining CMake default variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !889
2017-08-31 11:52:05 -04:00
Robert Maynard
08e07167b9 Merge topic 'cuda_9_support'
c5232e99 Simplify the implementation of vtkm::ForEach
6069c19f Brigand.hpp now works around CUDA 9 compiler issues.
6a4e91d5 ExecutionPolicy now handles CUDA9 removal of __CUDACC_VER__

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !902
2017-08-31 11:26:28 -04:00
Kenneth Moreland
27fa1b867b Merge topic 'spell-canonical-correct'
16e4e607 Fix spelling error of canonical

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !909
2017-08-30 18:54:03 -04:00
dongliang
7557c9b731 Merge topic 'MultiBlock'
f492f7ff reviewed version 1
a0cdad52 reviewed version 1
bc3b2e2b reviewed version 1
839185a5 reviewed version 1
6f509a8b reviewed version 1
babb154a reviewed version 1
90c870f2 reviewed version 1
1d80d5b6 reviewed version 1
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !882
2017-08-30 16:18:35 -04:00
Robert Maynard
c5232e998c Simplify the implementation of vtkm::ForEach
Also by simplifying the implementation we work around a CUDA 9 issue which
when compiling the old version would cause an internal compiler error and
crash compilation.
2017-08-30 14:35:26 -04:00
Robert Maynard
6069c19f3f Brigand.hpp now works around CUDA 9 compiler issues. 2017-08-30 14:35:26 -04:00
dongliangchu
f492f7ff7c reviewed version 1 2017-08-30 12:37:15 -04:00
Kenneth Moreland
16e4e6079c Fix spelling error of canonical
It was being spelled cononical.
2017-08-30 09:23:02 -06:00
Kenneth Moreland
c59a227a61 Merge topic 'update-average-by-key'
b12a20a5 Fix issue where auto type was not resolving template parameters
3471dc27 Expand usage of AverageByKey

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !903
2017-08-30 10:58:22 -04:00
dongliangchu
a0cdad52e5 reviewed version 1 2017-08-30 10:30:29 -04:00
Matt Larsen
107b2c487c Merge topic 'wireframe-fixes'
bbf84c11 Clear framebuffer to black instead of white.
3210e502 Adds an small Z offset to the wireframe edges to solve z-fights

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !907
2017-08-30 09:34:20 -04:00
Matt Larsen
68b2573a4e Merge topic 'volume_locator_fix'
d55c9afd fixing cell indices for volume renderer cell locator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !906
2017-08-29 18:54:39 -04:00
Manish Mathai
bbf84c11d8 Clear framebuffer to black instead of white.
This change updates the framebuffer clear logic, relying on the canvas
to blend with the background instead of eagerly doing it at the start.
2017-08-29 15:03:00 -07:00
Manish Mathai
3210e50209 Adds an small Z offset to the wireframe edges to solve z-fights
This commit solved z-fighting issues with two changes:
- A small offset, proportional to distance between near and far planes, is
applied in camera space to the edges.
- The minimum screenspace offset is increased as well for the same reason.
A new test case is added for uniform grids.
Additionally, the line plotting algorithm is changed to round off the
edge endpoints to fill in empty pixels seen on uniform grids.
2017-08-29 14:55:24 -07:00
Kenneth Moreland
b12a20a599 Fix issue where auto type was not resolving template parameters
Portal reference objects automatically cast to their value, but
that does not necessarily mean that it will cast correctly to
a subclass of that type.
2017-08-29 09:34:32 -07:00
Matt Larsen
d55c9afd3e fixing cell indices for volume renderer cell locator 2017-08-29 08:54:52 -07:00
Dave Pugmire
400981815f Remove warnings. 2017-08-29 09:58:25 -04:00
Allison Vacanti
fce4ddc966 Merge topic 'vtkm-disable_assert'
9a341d66 Add VTKM_NO_ASSERT option to disable VTKM_ASSERT in Debug Mode.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !905
2017-08-29 09:46:19 -04:00
Dave Pugmire
7bbc1417d5 Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype 2017-08-29 08:44:10 -04:00
Dave Pugmire
48b3f64cf2 Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype 2017-08-29 08:35:59 -04:00
Dave Pugmire
b2de8045cb Cleanup. Add some additional tests for streamlines. 2017-08-29 08:35:29 -04:00
Dave Pugmire
408765c9ed Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype 2017-08-28 17:11:22 -04:00
Dave Pugmire
7e69b9606d Fix merges with master. 2017-08-28 16:58:44 -04:00
Dave Pugmire
1c0f721b96 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into streamline_returntype 2017-08-28 15:27:04 -04:00
Dave Pugmire
7e348db5ac Remove duplicate definitions of GetIndices 2017-08-28 15:07:11 -04:00
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
2f2909f796 Add support for containing project to override default install locations 2017-08-28 11:38:31 -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
Shawn Waldon
1672093787 Avoid redefining CMake default variables
When used as a submodule, redefining LIBRARY_OUTPUT_PATH and
EXECUTABLE_OUTPUT_PATH fails since the CMake default variables from the
containing project already exist.
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