Commit Graph

5157 Commits

Author SHA1 Message Date
Robert Maynard
197a971e96 Merge topic 'UnitTestBoundingIntervalHierarchy_works_again'
35145fedb Re-enable UnitTestBoundingIntervalHierarchy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1382
2018-08-28 23:34:10 -04:00
Robert Maynard
7c9c7cbdb5 Merge topic 'rendering_color_table_issue'
61c2cac35 MapperGL uses new ColorTable PrepareForExecution.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1388
2018-08-28 19:58:02 -04:00
Robert Maynard
61c2cac35c MapperGL uses new ColorTable PrepareForExecution. 2018-08-28 16:29:31 -07:00
Allison Vacanti
1fdf937f08 Merge topic 'move_changelog'
0f3f23627 Move changelog to proper directory.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1386
2018-08-28 17:59:25 -04:00
Allison Vacanti
0f3f23627b Move changelog to proper directory. 2018-08-28 14:57:01 -07:00
Robert Maynard
35145fedb4 Re-enable UnitTestBoundingIntervalHierarchy 2018-08-28 13:45:02 -04:00
Robert Maynard
18fdc009a3 Merge topic 'upgrade_algorithms_to_support_runtime_device'
59c8bd28a vtkm::cont::Algorithm now can be told which device to run on at runtime

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1365
2018-08-28 13:34:55 -04:00
Allison Vacanti
cf15654112 Merge topic '287_benchmark_exception_handling'
2fd454065 Catch exceptions and continue during benchmarking.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1379
2018-08-28 11:50:49 -04:00
Allison Vacanti
5a26f66bba Merge topic 'hide_devid_constructor'
024a75821 Make DeviceAdapterId constructor protected.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1380
2018-08-28 11:41:46 -04:00
Robert Maynard
d57095bd6b Merge topic 'remove_posthoc_example'
9f5d57f8a Remove the posthocinterpolation example as it didn't showcase vtkm
7231f7e55 Use vtkm::Math functions in ABCField.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1377
2018-08-27 23:11:16 -04:00
Matt Larsen
bc58f04eba Merge topic 'fix/connectivity_tracer'
bed31eb80 turning off debug prints

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1381
2018-08-27 13:48:42 -04:00
mclarsen
bed31eb80f turning off debug prints 2018-08-26 20:06:14 -07:00
Allison Vacanti
024a75821d Make DeviceAdapterId constructor protected.
This forces users to use a defined tag, since they shouldn't need
to create their own.
2018-08-24 16:38:08 -04:00
Allison Vacanti
e9d8ff4371 Merge topic 'filter_benchmarks'
4e290fe13 Add filter benchmarks.
6b08f4e6c Handle NaNs gracefully in benchmark compare script.
7ca3b60fe Print bytes size in array handle summaries.
16deb120d Add std::string constructor to VTKDataSetReader.
5fba556fd Prevent namespace ambiguity in VectorMagnitude filter.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1319
2018-08-24 16:34:19 -04:00
Allison Vacanti
4e290fe135 Add filter benchmarks. 2018-08-24 13:49:46 -04:00
Allison Vacanti
2fd454065f Catch exceptions and continue during benchmarking. 2018-08-24 13:14:13 -04:00
Robert Maynard
9f5d57f8ab Remove the posthocinterpolation example as it didn't showcase vtkm 2018-08-24 08:28:56 -04:00
Robert Maynard
7231f7e557 Use vtkm::Math functions in ABCField. 2018-08-24 08:28:12 -04:00
Allison Vacanti
6b08f4e6c4 Handle NaNs gracefully in benchmark compare script. 2018-08-23 16:40:25 -04:00
Allison Vacanti
7ca3b60fe2 Print bytes size in array handle summaries. 2018-08-23 16:40:25 -04:00
Allison Vacanti
16deb120da Add std::string constructor to VTKDataSetReader. 2018-08-23 11:50:55 -04:00
Allison Vacanti
5fba556fde Prevent namespace ambiguity in VectorMagnitude filter. 2018-08-23 11:50:55 -04:00
Allison Vacanti
9d59b462b8 Merge topic '268_cellset_connectivity_cache'
669ccb913 Refactor CellSetExplicit to store connectivity in a shared_ptr.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1373
2018-08-23 11:49:58 -04:00
Allison Vacanti
669ccb9130 Refactor CellSetExplicit to store connectivity in a shared_ptr.
This addresses issue #268 by ensuring that the CellToPoint validity
flag survives FunctionInterface's value copies.
2018-08-23 11:13:13 -04:00
Allison Vacanti
f447b9c8be Merge topic '266_cellset_prepinput_preserve_device'
2b169eeb3 Use requested device in CellSetExplicit::PrepareForInput.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1374
2018-08-23 11:08:59 -04:00
Matt Larsen
351304f18f Merge topic 'fix/rt_resize'
93175fecd fixing ray resize with composite vector

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1375
2018-08-23 00:26:00 -04:00
mclarsen
93175fecdc fixing ray resize with composite vector 2018-08-22 19:59:42 -07:00
Allison Vacanti
2b169eeb3b Use requested device in CellSetExplicit::PrepareForInput.
The BuildConnectivity method was falling back to the global
runtime device tracker instead of using the templated device.
2018-08-22 16:07:48 -04:00
Allison Vacanti
0d141cc924 Merge topic '284-wavelet_extents'
b50dc297b Fix off-by-one error in WaveletGen extents.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1372
2018-08-22 09:02:51 -04:00
Robert Maynard
095d65e6c6 Merge topic 'cleanup_root_cmakelists'
41d492e84 The root CMakeLists.txt variable existence logic is all in the same spot

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1370
2018-08-22 08:26:48 -04:00
Allison Vacanti
b50dc297b1 Fix off-by-one error in WaveletGen extents.
Dimensions now match VTK's vtkRTAnalyticSource.
2018-08-21 14:21:42 -04:00
Allison Vacanti
1436c1b6df Merge topic '285_singletype_rconn_opt'
ec4cf2da3 Specialize the CellToPoint computation for CSSingleType.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1371
2018-08-21 13:50:49 -04:00
Allison Vacanti
ec4cf2da3f Specialize the CellToPoint computation for CSSingleType.
It's much cheaper to compute the cell id from a connectivity
index when all cells are the same size.
2018-08-21 12:36:15 -04:00
Robert Maynard
41d492e84f The root CMakeLists.txt variable existence logic is all in the same spot 2018-08-21 12:01:22 -04:00
Robert Maynard
c9b2a843b5 Merge topic 'document_more_of_vtkm_style'
084b4d760 Document some of the VTK-m coding style such as single line loops

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1366
2018-08-20 16:49:01 -04:00
Haocheng LIU
d4b12d0b49 Merge topic 'update-vec-initializer-list-with-constexpr'
f9f011944 Update vec-initializer-lists changelog to cover constexpr change

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1363
2018-08-20 13:25:08 -04:00
Haocheng LIU
c57c076690 Merge topic 'improve-out-of-bound-executionsignature-message'
60363fff0 Provide a better error message when ExecutionSig != ControlSig

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1367
2018-08-20 12:34:39 -04:00
haocheng liu
60363fff07 Provide a better error message when ExecutionSig != ControlSig
By facilitating brigand library, we can throw a meaningful compile time
error if the placeholder in execution signature exceeds the bound in
control signature.
2018-08-20 09:33:04 -04:00
Haocheng LIU
7d22132253 Merge topic 'allow-disabling/enabling-cuda-managed-memory'
e34301eca Allow disabling/enabling of CUDA managed memory via an env variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1359
2018-08-17 13:14:02 -04:00
Haocheng LIU
e34301eca8 Allow disabling/enabling of CUDA managed memory via an env variable
By setting the environment variable "VTKM_MANAGEDMEMO_DISABLED" to be 1,
users are able to disable CUDA managed memory even though the hardware is
capable of doing so.
2018-08-17 11:10:15 -04:00
Sujin Philip
515b1332a7 Merge topic 'cuda-deferred-free-changelog'
16250d29b Add changelog for cuda deferred free functionality

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1369
2018-08-17 10:24:22 -04:00
Sujin Philip
16250d29b8 Add changelog for cuda deferred free functionality 2018-08-17 10:22:57 -04:00
Robert Maynard
59c8bd28aa vtkm::cont::Algorithm now can be told which device to run on at runtime 2018-08-16 16:08:34 -04:00
Sujin Philip
6c074b8803 Merge topic 'cuda-deferred-free'
1212081de Support deferred freeing for CUDA memory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1368
2018-08-16 13:49:02 -04:00
Sujin Philip
1212081de1 Support deferred freeing for CUDA memory
Calls to 'cudaFree' block execution on all cuda devices. Reduce the number of
times this happens by having a deferred free mechanism that frees a pool
of pointers together when a threshold is reached.

Especially helpful during virtual object transfers that requires a few small
allocations and frees.
2018-08-16 12:05:36 -04:00
Robert Maynard
2a75916dd3 Merge topic 'remove_duplicate_data_in_multi_backend'
6990b605b The multi backend example now doesn't share data between blocks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1344
2018-08-15 15:09:14 -04:00
Robert Maynard
084b4d760e Document some of the VTK-m coding style such as single line loops
The auto code formatting doesn't capture the entire VTK-m style
and developers should know the style before they open a merge request
and get a billion warnings.
2018-08-15 13:39:47 -04:00
Haocheng LIU
f9f0119447 Update vec-initializer-lists changelog to cover constexpr change
The changelog is updated to replace initializer list changes with
variadic constructors and constexpr changes.

On OSX and Linux:
| Type |Constructed with| Compile time  | Run Time
|-----|---|---|---|
|scalar(1~4)    | ()  | Yes  |   |
|scalar(1~4)    | {}  | Yes  |   |
|scalar(>4)    | () | Yes |  |
|scalar(>4)    |  {} |  |  Yes |
|nested type(1~4)     |  () |  Yes |   |
|nested type(1~4)     |  {} |  Yes |   |
|nested type(>4)     | ()  | ERROR  |  ERROR|
|nested type(>4)     |  {} |   | Yes |
Only on windows with a compiler older than Visual Studio 2017
version 15.0 is vec with size>4 constructed at compile time.
2018-08-15 09:30:35 -04:00
Kenneth Moreland
6de7bdacaf Merge topic 'lagrangian_filter'
52549c85d Warning fixes to UnitTestLagrangianFilter.cxx
a99da2dff Added a Unit test for Lagrangian filter
3364d1c4e Lagrangian filter, example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1351
2018-08-14 17:49:45 -04:00
Robert Maynard
34966212c7 Merge topic 'make_brigand_cuda_future_capable'
e3ef8ed52 Make BRIGAND_COMP_CUDA_9PLUS capture all future versions of cuda

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1364
2018-08-14 15:34:09 -04:00