Commit Graph

3787 Commits

Author SHA1 Message Date
Manish Mathai
28c1bc65d7 Draws world annotations before scene render
This reordering of draw calls is to ensure that volume renderer does not
clobber the annotations.
2017-09-21 16:08:56 -07:00
Manish Mathai
53fb679e91 Adds explicit inline for Texture2DSampler 2017-09-20 13:55:18 -07:00
Manish Mathai
a32e46df7c Removes storage tag template parameter 2017-09-20 13:50:46 -07:00
Manish Mathai
3092577440 Remove typename keyword from explicit specializations 2017-09-19 14:31:35 -07:00
Manish Mathai
2f7988adc2 Merge branch 'master' into concrete-canvas 2017-09-19 10:01:38 -07:00
Kenneth Moreland
984e096081 Merge topic 'patch-contributing'
1ea16957 Minor fixes and changes to CONTRIBUTING

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !941
2017-09-19 12:57:46 -04:00
Kenneth Moreland
1ea16957e2 Minor fixes and changes to CONTRIBUTING
Fixed bad directory name for clone command.

Added suggestion to sign up for mailing list.

Corrected statement about the location of data files.
2017-09-19 10:22:57 -06:00
Allison Vacanti
c799f262e9 Merge topic '171-allocation_type'
00320e5d Use vtkm::UInt64 for byte sizes.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !935
2017-09-19 12:22:42 -04:00
Kenneth Moreland
2fa3a868bd Merge topic 'dynamic-threshold-call-to-worklet'
bd742fc6 Allow Threshold::Run to work on dynamic cell sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !925
2017-09-19 10:53:53 -04:00
Allison Vacanti
00320e5dc0 Use vtkm::UInt64 for byte sizes.
vtkm::Id could be just 32bits, which limits the number of values we
would be able to store for large arrays.
2017-09-19 09:21:14 -04:00
Allison Vacanti
c4c05d8b72 Merge topic 'remove_bad_assert'
c07c37ae Remove assert for incorrect assumption new TBB::RBK impl.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !938
2017-09-19 09:16:05 -04:00
Manish Mathai
4058626e51 Fixes warnings 2017-09-18 15:18:33 -07:00
Manish Mathai
7a39002522 Removes font management from WorldAnnotator and relies on Canvas 2017-09-18 14:41:28 -07:00
Robert Maynard
70f294aeec Merge topic 'renar_warnings'
28ab480a Fix warnings on renar.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !937
2017-09-18 17:28:23 -04:00
Allison Vacanti
c07c37aea2 Remove assert for incorrect assumption new TBB::RBK impl.
The assertion assumes that the RHS of the join operation has not been
yet reduced, which is not correct.
2017-09-18 16:12:07 -04:00
Allison Vacanti
28ab480a40 Fix warnings on renar. 2017-09-18 15:33:02 -04: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
Manish Mathai
6a3229779f Move the Canvas state to an internals class
This is to maintain compability with future minor releases
2017-09-17 20:40:24 -07:00
Manish Mathai
8b88a043e4 Adds text rendering and line rendering to WorldAnnotator 2017-09-17 15:10:40 -07:00
Robert Maynard
0d7b199cf1 Merge topic 'brigand_conversion_warnings'
2b4ef3f5 correct conversion warnings in brigand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !929
2017-09-17 17:43:07 -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
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
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
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