Commit Graph

7536 Commits

Author SHA1 Message Date
Kenneth Moreland
9ad4ad7214 Add content to sentinel-data
It makes me irrationally nervous to check an empty file as the sentinel
data. Instead, add some text that can be compared agains. Also add some
explenation to the file to prevent naive developers from messing with
the file.
2020-04-02 13:18:57 -06:00
Robert Maynard
e9129312f5 Merge topic 'correct_contour_tree_augmented_example_compile_failures'
917919569 contour_tree_augmented example compiles when TBB is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2024
2020-04-02 15:09:11 -04:00
Ben Boeckel
65fb96dfcf Merge topic 'lfs-setup-fixups'
bea0a7e38 hooks: add hook chains for development checks and LFS
867f0a069 SetupForDevelopment: setup lfs hooks
4da3a3dc3 Merge branch 'upstream-GitSetup' into lfs-setup-fixups
7d2569485 GitSetup 2018-06-26 (1ed3dc31)
8b3fa1d61 gitsetup: get the lfs setup script
eadc9b8f3 cmake: unset launcers if testing is disabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2026
2020-04-02 14:57:16 -04:00
Vicente Bolea
b23ecc6006 Merge topic 'fix-doxygen-warnings'
64e35e6fb removed doxygen warning at ArrayHandleRandomUniformBits

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2025
2020-04-02 13:01:52 -04:00
Ben Boeckel
bea0a7e38e hooks: add hook chains for development checks and LFS 2020-04-02 12:51:43 -04:00
Ben Boeckel
867f0a069f SetupForDevelopment: setup lfs hooks 2020-04-02 12:50:43 -04:00
Ben Boeckel
4da3a3dc38 Merge branch 'upstream-GitSetup' into lfs-setup-fixups
# By GitSetup Upstream
* upstream-GitSetup:
  GitSetup 2018-06-26 (1ed3dc31)
2020-04-02 12:46:57 -04:00
GitSetup Upstream
7d2569485c GitSetup 2018-06-26 (1ed3dc31)
Code extracted from:

    https://gitlab.kitware.com/utils/gitsetup.git

at commit 1ed3dc3129df9ff28a88dac98fc770af2cdcbb2e (setup).
2020-04-02 12:46:57 -04:00
Ben Boeckel
8b3fa1d616 gitsetup: get the lfs setup script 2020-04-02 12:46:37 -04:00
Ben Boeckel
eadc9b8f31 cmake: unset launcers if testing is disabled 2020-04-02 12:45:45 -04:00
Vicente Adolfo Bolea Sanchez
64e35e6fbf removed doxygen warning at ArrayHandleRandomUniformBits 2020-04-02 11:49:24 -04:00
Robert Maynard
917919569c contour_tree_augmented example compiles when TBB is enabled
Fixes #486
2020-04-02 11:22:09 -04:00
Robert Maynard
6cda22710e Merge topic 'always_use_vtkm_option'
5061d43f5 vtkm_option should be used as it properly handles CMP0077

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2020
2020-04-01 14:56:31 -04:00
Robert Maynard
5061d43f5a vtkm_option should be used as it properly handles CMP0077
Without using vtkm_option, you will run into CMP0077 which
means "option() won't honor normal variables".
2020-04-01 08:52:07 -04:00
Robert Maynard
ac55c0e551 Merge topic 'disable_deprecation_under_nvcc'
e37eedadb CUDA doesn't like [[deprecated]] when applied to typedefs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2018
2020-04-01 08:30:27 -04:00
Robert Maynard
e37eedadb1 CUDA doesn't like [[deprecated]] when applied to typedefs
So we disable deprecation support when building with `nvcc`
2020-03-31 14:56:49 -04:00
Kenneth Moreland
e18ecf4168 Merge topic 'unused-param-warning'
2016aa01d Fix unused parameter warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2017
2020-03-31 10:59:31 -04:00
Robert Maynard
6e26bfca62 Merge topic 'convert_more_builders'
0ea77c8df gitlab-ci nightly gcc 6 and 7 builders to improve coverage
08a27bdcd gitlab-ci now has a clang-5 builder
16a295201 gitlab-ci options for docs, examples, and benchmarks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2016
2020-03-31 09:20:42 -04:00
Kenneth Moreland
2016aa01d5 Fix unused parameter warnings
One of the dashboard compilers (gcc 4.8 with cuda, I think) was giving
warnings about an unused parameter. Apparently, the compiler did not
like the parameters defined for `default` assignment operators.
2020-03-30 14:45:40 -06:00
Robert Maynard
0ea77c8df9 gitlab-ci nightly gcc 6 and 7 builders to improve coverage
This builds used to happen on renar
2020-03-30 12:49:05 -04:00
Robert Maynard
08a27bdcd8 gitlab-ci now has a clang-5 builder
This was once covered by the dejagore dashboard
2020-03-30 12:49:05 -04:00
Robert Maynard
16a295201b gitlab-ci options for docs, examples, and benchmarks 2020-03-30 12:49:05 -04:00
Robert Maynard
cd1a5baba3 Merge topic 'restrict_gitlab-ci'
cbed21696 gitlab-ci won't trigger when just pushing remote branches

Acked-by: Kitware Robot <kwrobot@kitware.com>
Rejected-by: Kenneth Moreland <kmorel@sandia.gov>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2014
2020-03-30 12:48:11 -04:00
Robert Maynard
cbed21696d gitlab-ci won't trigger when just pushing remote branches
At the same time I have added the controls to allow for master only
builders which is required for nightly ubsan/asan testing
2020-03-30 09:51:45 -04:00
James Kress
9eaaadb1bd Merge topic 'Enhance-Testing-From-File'
46d7d1865 Merge remote-tracking branch 'upstream/master' into Enhance-Testing-From-File
f8b425adb Updating data README format and name.
95ba497bb Merge remote-tracking branch 'upstream/master' into Enhance-Testing-From-File
f21f99b43 Fixing cmake case.
ad47be5a1 Adding ctest check.
c03e84527 File not added.
41f64930c Fixing file location.
9ccd91164 Fixing file location.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1986
2020-03-27 14:34:16 -04:00
James
46d7d1865a Merge remote-tracking branch 'upstream/master' into Enhance-Testing-From-File 2020-03-27 11:33:18 -04:00
Robert Maynard
b6a92c940b Merge topic 'fixed_point_write'
cad7b593d Fix warning.
7da30d254 Write data in fixed point, not scientific notation. Increase performance by removing buffer flushes.
98dbf7c1a Replace spaces by underscores in SCALAR name field.
b3d170f2d Compound datatypes for writer.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2001
2020-03-27 08:41:25 -04:00
Robert Maynard
f06a5db9af Merge topic 'add_gitlab_ci'
d7ab1a608 Improve parallelization when compiling filter tests
142d151ca Update CONTRIBUTING.md to cover gitlab piplines
5bc09b976 Add gitlab-ci infrastructure
ef7ef5fb2 Add documentation for the what/why of using Gitlab ci
36d1a2d6a Add dockerfiles to be used by VTK-m Gitlab ci
b16e4fc17 Add ECP CI support to vtk-m

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1987
2020-03-26 15:39:28 -04:00
Robert Maynard
d7ab1a6084 Improve parallelization when compiling filter tests 2020-03-26 13:40:47 -04:00
Robert Maynard
142d151caf Update CONTRIBUTING.md to cover gitlab piplines 2020-03-26 13:40:47 -04:00
Robert Maynard
5bc09b976e Add gitlab-ci infrastructure 2020-03-26 13:40:47 -04:00
Nick
cad7b593d2 Fix warning. 2020-03-26 12:12:54 -04:00
Vicente Bolea
a25f023413 Merge topic 'fix-418-gradient-throw-error'
df2dba346 throws an exception if Gradient input is scalar

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2009
2020-03-26 09:55:56 -04:00
Robert Maynard
ef7ef5fb22 Add documentation for the what/why of using Gitlab ci 2020-03-26 08:27:58 -04:00
Robert Maynard
36d1a2d6ae Add dockerfiles to be used by VTK-m Gitlab ci 2020-03-26 08:27:58 -04:00
Robert Maynard
b16e4fc17b Add ECP CI support to vtk-m
VTK-m now can be tested on ECP CI ( https://ecp.osti.gov/nmc )
resources. This is done via the `.gitlab-ci-ecp.yml` file
2020-03-26 08:27:58 -04:00
Robert Maynard
e1ccaced3e Merge topic 'add_flying_edges'
91c56d680 Update Contour tests to be aware of flying edge output
1b256281f Convert contour worklet to expect isovalues to a std::vector
c2bab6c6b Introduce FlyingEdges for 3d structured datasets
1995e5204 Correct minor issues from refactoring MarchingCells worklets
d3512879d Remove unneeded template parameters from Gradient.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2005
2020-03-25 16:53:21 -04:00
Robert Maynard
8810fc2fa6 Merge topic 'philox'
ef49a71aa Merge branch 'philox' of gitlab.kitware.com:ollielo/vtk-m into philox
563642400 remove outdated comments on type-punning
be7c18544 tried to supress warning about type punning
c795f74b2 Merge branch 'master' into philox
2b43fcb25 change function signature for work with MSVC
13e7ac362 Merge branch 'philox' of gitlab.kitware.com:ollielo/vtk-m into philox
1e2fd540d add Doxygen documentation
f2ea17917 add Doxygen documentation
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1990
2020-03-25 13:17:50 -04:00
Vicente Adolfo Bolea Sanchez
df2dba3467 throws an exception if Gradient input is scalar
Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2020-03-25 12:08:47 -04:00
Vicente Bolea
f05f2edd33 Merge topic 'fix-cuda-runtime-errors'
873f6bab0 check more types in UnitTestScatterAndMaskWithTopology

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2006
2020-03-25 12:04:11 -04:00
Kenneth Moreland
287a6f8b9b Merge topic 'fix-inappropriate-virtual-method'
c0b780543 Fix an inappropriate use of virtual methods in an execution test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2011
2020-03-25 11:28:40 -04:00
Kenneth Moreland
545e60fbe3 Merge topic 'no-streaming-arrayhandle'
4f9fa08fa Remove ArrayHandleStreaming capabilities

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2008
2020-03-25 11:26:26 -04:00
James
f8b425adbf Updating data README format and name. 2020-03-25 09:14:56 -04:00
Robert Maynard
91c56d680c Update Contour tests to be aware of flying edge output 2020-03-25 08:23:10 -04:00
Robert Maynard
1b256281f4 Convert contour worklet to expect isovalues to a std::vector
This reduces an ugly component of the Contour API
2020-03-25 08:23:10 -04:00
Robert Maynard
c2bab6c6bb Introduce FlyingEdges for 3d structured datasets 2020-03-25 08:23:10 -04:00
Vicente Adolfo Bolea Sanchez
873f6bab0c check more types in UnitTestScatterAndMaskWithTopology
Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2020-03-24 20:20:46 -04:00
Kenneth Moreland
4f9fa08fa1 Remove ArrayHandleStreaming capabilities
The `ArrayHandleStreaming` class stems from an old research project
experimenting with bringing data from an `ArrayHandle` in parts and
overlapping device transfer and execution. It works, but only in very
limited contexts. Thus, it is not actually used today. Plus, the feature
requires global indexing to be permutated throughout the worklet
dispatching classes of VTK-m for no further reason.

Because it is not really used, there are other more promising approaches
on the horizon, and it makes further scheduling improvements difficult,
we are removing this functionality.
2020-03-24 15:01:56 -06:00
Kenneth Moreland
c0b7805435 Fix an inappropriate use of virtual methods in an execution test
One of the execution tests, UnitTestScatterAndMaskWithTopology,
was defining a hierarchy of worklets that defined a virtual
operator(). It mostly still worked since the code was executed
with the final type and thus did not actually need to look up
the virtual table. However, some invalid memory access must have
been happening in CUDA since under some unpredictable circumstances
a memory protection error was happening.

This fixes the problem by removing the virtual methods.
2020-03-24 11:42:08 -06:00
Li-Ta Lo
ef49a71aa1 Merge branch 'philox' of gitlab.kitware.com:ollielo/vtk-m into philox 2020-03-24 10:25:02 -06:00