Commit Graph

2969 Commits

Author SHA1 Message Date
Li-Ta Lo
1eaaf342ef Merge branch 'master' into kdtree_docs 2017-09-18 13:19:55 -06:00
Li-Ta Lo
1d4b43b540 Add documentation
Add doxygen documentations for public interface of KD-Tree construction and search.
Also fixed several const-correctness issues.
2017-09-18 13:16:37 -06:00
Allison Vacanti
6c7c4ddec0 Merge topic '173_tbb_reducebykey'
d174c0fe Add TBB specialization for ReduceByKey.
c9c7149c Fix typo in ReduceByKey docstring.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !928
2017-09-18 13:48:56 -04:00
Allison Vacanti
d174c0fe3b Add TBB specialization for ReduceByKey.
TBB's ReduceByKey was using the generic DeviceAdapterGeneral
implementation and was about 50x slower than the serial implementation,
which is very efficient.

This patch improves TBB's RBK implementation significantly, though it still
does not scale well. On a quad core processor, this implementation performs
comparably or slightly worse than the highly efficient serial algorithm.
More than 4 cores may be needed to see sufficient parallel speedup that
would overcome the TBB overhead, and grain size does not seem to affect the
performance significantly.
2017-09-15 14:25:16 -04:00
Robert Maynard
2b4ef3f5c7 correct conversion warnings in brigand 2017-09-15 11:11:58 -04:00
Abhishek Yenpure
7ce3d72dd1 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into fix_advection_error 2017-09-14 14:50:27 -04:00
Abhishek Yenpure
44254f07bf Allocating arrays for worklet execution
In case where the number of steps taken by each particle is explicitly
provided, code to initialize the arrays for steps and statuses for the
particles was missing.
2017-09-14 14:08:34 -04:00
Abhishek Yenpure
1f3f10c0b6 Moving memory allocations/initializations to a single location 2017-09-14 11:16:29 -04:00
Li-Ta Lo
de5f9d1c97 Merge topic 'NDHistogram'
bc1096d8 Update new interface to NDHistogram, NDEntropy worklet and filter
317cff0d Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into NDHistogram
fd30187d Add 'N-dimensional histogram, histogram marginalization and entropy calculation worklets and filters'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !847
2017-09-14 10:42:30 -04:00
Patricia Fasel
2052f40719 Merge topic 'cosmo-tools'
e9f9a3d8 remove setting of DeveiceAdapter from cosmotools worklet
cdf84ccb Add sample input
6ca2683f Remove the data file for examples
f3766449 Cosmology halo finder

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !919
2017-09-13 15:30:38 -04:00
Li-Ta Lo
e9f9a3d89f remove setting of DeveiceAdapter from cosmotools worklet 2017-09-12 13:47:11 -06:00
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
74c383562c Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into streamline_returntype 2017-09-11 17:19:19 -04:00
Allison Vacanti
c9c7149ca3 Fix typo in ReduceByKey docstring. 2017-09-11 15:59:08 -04:00
Yenpure
cfb7e7b418 Particle advection changing method inputs 2017-09-10 21:36:08 -04:00
Yenpure
51ae5a0cb6 Additional changes for proper particle advection 2017-09-08 15:50:55 -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
Yenpure
fca79d21ba Error fixes for particle advection filter 2017-09-08 13:20:43 -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
Patricia Kroll Fasel - 090207
6ca2683fca Remove the data file for examples
must find out how this should be done. clang-format on all the worklets.
2017-09-06 11:44:44 -06:00
Patricia Kroll Fasel - 090207
f3766449f2 Cosmology halo finder
Running friend of friends algorithm and then NxN most bound particle
after to find halo center. Cosmology center finder running NxN MBP
algorithm followed by a estimator reducing the problem to MxN MBP
to speed up run.
2017-09-06 11:43:40 -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
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
caseywang777
bc1096d884 Update new interface to NDHistogram, NDEntropy worklet and filter 2017-09-02 19:18:01 -04:00
caseywang777
317cff0dd8 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into NDHistogram 2017-09-02 19:13:04 -04:00
caseywang777
fd30187d53 Add 'N-dimensional histogram, histogram marginalization and entropy calculation worklets and filters' 2017-09-02 18:35:21 -04: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
Dave Pugmire
b2de8045cb Cleanup. Add some additional tests for streamlines. 2017-08-29 08:35:29 -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