Commit Graph

3922 Commits

Author SHA1 Message Date
Abhishek Yenpure
994a1744ce Merge topic 'fix_particle_advection_example'
d30c795c Fix particle advection error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !930
2017-09-15 14:18:26 -04:00
Abhishek Yenpure
d30c795c08 Fix particle advection error 2017-09-15 13:07:39 -04:00
Robert Maynard
2b4ef3f5c7 correct conversion warnings in brigand 2017-09-15 11:11:58 -04:00
Abhishek Yenpure
8db5c1988c Merge topic 'fix_advection_error'
7ce3d72d Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into fix_advection_error
44254f07 Allocating arrays for worklet execution
1f3f10c0 Moving memory allocations/initializations to a single location
cfb7e7b4 Particle advection changing method inputs
51ae5a0c Additional changes for proper particle advection
fca79d21 Error fixes for particle advection filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !922
2017-09-14 22:52:12 -04:00
Patricia Fasel
4f9b66c880 Merge topic 'cosmo-fix'
57165916 Cosmology fix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !927
2017-09-14 15:18:35 -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
Manish Mathai
3e5878394e Extract canvas's line rendering to LineRenderer
This allows for the line rendering to be shared for other use cases like
`WorldAnnotator`
2017-09-14 09:40:23 -07:00
Patricia Kroll Fasel - 090207
57165916d1 Cosmology fix
Add the setting of the default device adapter in examples code
2017-09-14 10:08:13 -06: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
Kenneth Moreland
bd742fc6d4 Allow Threshold::Run to work on dynamic cell sets
Added an overloaded version of vtkm::worklet::Threshold::Run that takes
a dynamic cell set instead of a concrete cell set type. This is
implemented by basically moving the CastAndCall from the Threshold
filter to the worklet class. This allows other filters (that might have
similar operations with different predicates) to use the same code. (It
also happens to grately simplify an example for the User's Guide I am
working on.)

Once cell sets use virtual methods, we should be able to collapse code
like this quite a bit anyway.
2017-09-13 15:58:25 -06:00
Manish Mathai
3051d88de0 Adds text rendering to Canvas. 2017-09-13 13:42:11 -07: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
Kenneth Moreland
5c6ed6941b Merge topic 'filter-consistent-method-names'
0dd1e7ae Make Get/SetActiveCellSetIndex method names match in filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !923
2017-09-12 15:53:34 -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
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
Dave Pugmire
afeecfcfd6 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2017-09-11 17:18:30 -04:00
Allison Vacanti
c9c7149ca3 Fix typo in ReduceByKey docstring. 2017-09-11 15:59:08 -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
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
Dave Pugmire
a8398321d7 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2017-09-08 14:30:39 -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
Li-Ta Lo
cdf84ccb44 Add sample input
Add sample input data for example/cosmotools
2017-09-06 14:05:15 -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
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
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
Manish Mathai
e9c4e0056c Implements Canvas::AddColorBar 2017-08-31 15:12:08 -07:00
Manish Mathai
3440f74c45 Removes warnings about unsed parameters 2017-08-31 10:50:28 -07:00
Manish Mathai
7f18d17d24 Converts Canvas to a concrete implementation.
This commit converts `Canvas` from an abstract class to a concrete
class by converting the pure virtual methods to empty/default
implementations. It provides an implementation for `Canvas::AddLine`
using Bresenham's line drawing algorithm.
2017-08-31 10:40:30 -07: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