Commit Graph

5864 Commits

Author SHA1 Message Date
Li-Ta Lo
cbd04b4bed minor change based on code review feedback 2019-03-20 11:58:22 -06:00
Robert Maynard
6cdf6cb672 Less aggressive defaults for VTK-m compared to summit.
Since we don't have per system checks currently built into
vtk-m we can't use the tuned values for Summit, as they
don't run on all our hardware.
2019-03-20 09:30:34 -07:00
Robert Maynard
3879479185 Improve VTK-m cuda scheduling based on Summit scaling study
When benchmarking the VTK-m algorithms on Summit I discovered
that our scheduling choices aren't optimal for the hardware.

This is a short term fix where we select good numbers for
Summit, and in the future make the defaults controllable
by the calling programming and/or environment variables.

Performance numbers can be found at:
  https://gitlab.kitware.com/snippets/755
2019-03-20 09:30:34 -07:00
Dave Pugmire
17a7decc67 Replace use of Float32 with FloatDefault 2019-03-20 09:32:38 -04:00
ayenpure
2daf189560 Updating copyright for Unit Test 2019-03-19 17:19:41 -07:00
ayenpure
eca618e106 Fixing typos 2019-03-19 17:16:39 -07:00
ayenpure
be80dcc1ab Adding changes for temporal advection, and adding test 2019-03-19 17:11:36 -07:00
Sujin Philip
8868fb989b Improve CellSet API
Add useful virtual functions to the vtkm::cont::CellSet base class.
2019-03-19 16:12:48 -04:00
Sujin Philip
b44d1b2d6b Merge topic 'fix-variant-warnings'
cb76f4c79 Fix VariantArrayHandle override warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1588
2019-03-19 11:34:37 -04:00
Sujin Philip
40814576b6 Merge topic 'improve-point-locator'
178da6c0d Make PointLocatorUniformGrid default constructible

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1587
2019-03-19 10:43:13 -04:00
Sujin Philip
cb76f4c791 Fix VariantArrayHandle override warnings
Add override consistently to all overriden functions.
2019-03-19 08:28:08 -04:00
Dave Pugmire
5bff3a0b45 Merge topic 'removeGhostStructured'
0e236d4d0 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into removeGhostStructured
0c3a9864e temp remove the std::numeric_limits
5308fec43 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into removeGhostStructured
228599685 Add test for non-structured case.
a425d89ff fix compiler warning.
f6b41808b Structured preserving ghost removal.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1560
2019-03-19 08:26:07 -04:00
Dave Pugmire
0e236d4d07 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into removeGhostStructured 2019-03-19 07:53:10 -04:00
Sujin Philip
178da6c0dc Make PointLocatorUniformGrid default constructible
plus some style changes to match VTK-m style.
2019-03-18 16:34:49 -04:00
Dave Pugmire
0c3a9864e2 temp remove the std::numeric_limits 2019-03-18 16:05:48 -04:00
Sujin Philip
1d4c8f35b5 Merge topic 'fix-VariantArrayHandle'
546a1d14a VariantArrayHandle should report run time NumberOfComponents

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1586
2019-03-18 12:35:54 -04:00
Dave Pugmire
5308fec434 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into removeGhostStructured 2019-03-18 11:25:52 -04:00
Li-Ta Lo
d3caf6dfbd add a newline at the end of file 2019-03-17 22:49:29 -06:00
Li-Ta Lo
02cfb0dc49 add unit tests for CellSetConnective filter 2019-03-17 22:45:44 -06:00
Li-Ta Lo
045da86e49 add unit test for image connectivity filter 2019-03-17 21:24:24 -06:00
Kenneth Moreland
163b694b9d Merge topic 'fix-timer-test'
92b4e054a Fix issues with timer test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1584
2019-03-17 11:58:28 -04:00
Dave Pugmire
07273c88f2 Merge topic 'gridEval'
3868a5b30 Remove the commented out stack code.
e7066ad94 compiler errors.
de7d9cc27 fix compile errors, remove cudastack hacks.
9b9742f43 Merge branch 'no-recurse-bih' of https://gitlab.kitware.com/kmorel/vtk-m into gridEval
ab9d0fad2 Remove warning exceptions for BoundingIntervalHierarchy recursive calls
8127093a2 Add CellLocator to name of BoundingIntervalHierarchy
c008df90c Non-recursive method to find cells in BoundingIntervalHierarchyExec
c463bbec9 Add parent index to BIH tree
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1536
2019-03-16 22:14:10 -04:00
Kenneth Moreland
19c981d387 Merge topic 'uint8-conversion-warnings'
68d5d2695 Fix warnings about conversion to int8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1583
2019-03-15 19:06:28 -04:00
Matt Larsen
cbe9b261ed Merge topic 'fix/rendering_ctable_sampling'
82e230093 forcing serial sample again
b509081a9 Just disable CUDA for ctable sampling
cc20f8019 forcing color table sampling to be serial inside rendering lib

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1580
2019-03-15 18:31:14 -04:00
Sujin Philip
ceca8ab105 Merge topic 'improve-field-api'
d4e1c1825 Update existing code to use the new functions
7b072b159 Add useful Get functions to Fields and Coordinates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1578
2019-03-15 17:51:49 -04:00
Sujin Philip
546a1d14a2 VariantArrayHandle should report run time NumberOfComponents
Query and report number of components at runtime so that it can work with
arrays of types with runtime varying number of components
Eg. ArrayHandleGroupVecVariable.
2019-03-15 16:47:32 -04:00
Dave Pugmire
3868a5b304 Remove the commented out stack code. 2019-03-15 15:14:09 -04:00
Dave Pugmire
e7066ad94b compiler errors. 2019-03-15 14:46:25 -04:00
Kenneth Moreland
92b4e054af Fix issues with timer test
The timer test would blindly wait for an expected interval each time.
However, in a busy system that might wait more than expected, this extra
wait time can accumulate. Fix the issue by monitoring how much time has
actually elapsed and only wait to the next expected point. Also add a
check to make sure that we have not waited too long (and adjust the
error message to hopefully make it more clear that the system waited
more than expected).
2019-03-15 11:50:17 -06:00
Dave Pugmire
de7d9cc27b fix compile errors, remove cudastack hacks. 2019-03-15 13:40:48 -04:00
Sujin Philip
d4e1c18254 Update existing code to use the new functions 2019-03-15 13:28:55 -04:00
Sujin Philip
7b072b1593 Add useful Get functions to Fields and Coordinates
Avoid having to call 'GetData()' to query 'NumberOfValues'/'NumberOfPoints'.
2019-03-15 13:28:55 -04:00
mclarsen
82e2300934 forcing serial sample again 2019-03-15 10:08:43 -07:00
Dave Pugmire
9b9742f436 Merge branch 'no-recurse-bih' of https://gitlab.kitware.com/kmorel/vtk-m into gridEval 2019-03-15 13:05:39 -04:00
Kenneth Moreland
68d5d26951 Fix warnings about conversion to int8
Now that UInt8 has become part of the list of default types compiled,
there have been numerous warnings that have popped up about converting
ints to unsigned char. The reason for these is when you do arithmetic
(+, -, *, or /) on a char or short, it is automatically upconverted to a
32-bit integer. When you then try to set that back to a smaller integer,
you get a conversion warning.

This change gets around this problem by explicitly telling the compiler
we expect this type with static_cast. We have also talked about
disabling conversion warnings, but this has not happened on all
dashboards, and it is not that hard to work around the warning.
2019-03-15 10:38:15 -06:00
Robert Maynard
2d09dd4fac Merge topic 'remove_uneeded_text_from_BenchmarkFilters_output'
46fed414e Remove unneeded text from the BenchmarkFilters output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1579
2019-03-15 07:52:51 -04:00
Li-Ta Lo
a6d2fe5616 add newline at the end of file 2019-03-14 17:35:10 -06:00
Kenneth Moreland
ab9d0fad25 Remove warning exceptions for BoundingIntervalHierarchy recursive calls
Now that we no longer use a recursive algorithm to find cells in a BIH
structure, the exception should no longer be necessary.
2019-03-14 16:16:57 -06:00
Li-Ta Lo
df5420d192 Merge branch 'master' into connected_component 2019-03-14 16:16:21 -06:00
Kenneth Moreland
8127093a2f Add CellLocator to name of BoundingIntervalHierarchy
This will help identify the nature of this object as well as find cell
locator implementations.
2019-03-14 16:13:59 -06:00
Kenneth Moreland
c008df90cc Non-recursive method to find cells in BoundingIntervalHierarchyExec
CUDA devices have problems with recursive algorithms that have no well-
defined depth because the stack on a CUDA device tends to be pretty
short. Fix the problem for BoundingIntervalHierarchyExec by changing to
a state-machine based algorithm that follows the hierarchy up and down.
2019-03-14 15:52:55 -06:00
Kenneth Moreland
c463bbec93 Add parent index to BIH tree
This will help us traverse back up the tree without a call stack (which
is causing issues on CUDA).
2019-03-14 15:52:47 -06:00
mclarsen
b509081a9d Just disable CUDA for ctable sampling 2019-03-14 13:57:17 -07:00
Robert Maynard
46fed414e8 Remove unneeded text from the BenchmarkFilters output
This makes it easier to read as it has less horizontal text for
each line.
2019-03-14 16:30:39 -04:00
mclarsen
cc20f80196 forcing color table sampling to be serial inside rendering lib 2019-03-14 13:28:13 -07:00
Sujin Philip
8ca2cc9fc4 Merge topic 'fix-ArrayHandleGroupVecVariable'
24fc4ec94 Fix ArrayHandleGroupVecVariable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1577
2019-03-14 15:53:28 -04:00
Sujin Philip
24fc4ec944 Fix ArrayHandleGroupVecVariable
Take the const portal for the offsets array for all casses.
2019-03-14 13:54:25 -04:00
Dave Pugmire
6edda87c3a Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into gridEval 2019-03-14 13:40:33 -04:00
Robert Maynard
6b462cc99f Merge topic 'benchmark_filter_dont_time_dataset_destruction'
2321116e8 Filter Benchmarks don't time destruction of results

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1575
2019-03-14 13:33:38 -04:00
Dave Pugmire
533f2e5eb3 Cleanup. 2019-03-14 09:39:56 -04:00