Commit Graph

8609 Commits

Author SHA1 Message Date
Vicente Adolfo Bolea Sanchez
bbe36d8c33 cmake: set c++14 as minimum c++ rev
Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2021-02-08 17:13:05 +01:00
Dave Pugmire
037bd24e7f Merge topic 'parallel_pathline2'
fcd0986c5 Merge branch 'parallel_pathline2' of https://gitlab.kitware.com/dpugmire/vtk-m into parallel_pathline2
ed7358ed2 Kick the dashboard.
6367e4680 Bug fix when pathline rank has 0 ds.
6608a38ee Debugging the dashboard
b4768f06b Bug fix. Must copy particles.
4773b51ca Debug test fail...
982b693ab Forgot to add hxx file.
aa713b565 Support for dist-memory pathlines.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2399
2021-02-05 21:56:41 -05:00
dpugmire
fcd0986c5b Merge branch 'parallel_pathline2' of https://gitlab.kitware.com/dpugmire/vtk-m into parallel_pathline2 2021-02-05 16:35:01 -05:00
dpugmire
ed7358ed23 Kick the dashboard. 2021-02-05 16:32:42 -05:00
dpugmire
6367e46804 Bug fix when pathline rank has 0 ds. 2021-02-05 15:57:18 -05:00
dpugmire
6608a38eef Debugging the dashboard 2021-02-05 14:08:46 -05:00
Brad King
1491e7624e Merge topic 'ci-nonconcurrent'
85a7e6ffe gitlab-ci: Use a stable path between build and test jobs on Windows
c612b86dd gitlab-ci: Refactor vcvars settings on Windows jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2400
2021-02-05 12:32:12 -05:00
dpugmire
b4768f06bd Bug fix. Must copy particles. 2021-02-05 12:17:27 -05:00
dpugmire
4773b51ca3 Debug test fail... 2021-02-05 12:04:24 -05:00
dpugmire
982b693abb Forgot to add hxx file. 2021-02-05 11:32:38 -05:00
Brad King
85a7e6ffe0 gitlab-ci: Use a stable path between build and test jobs on Windows
CTest expects the test suite to be executed from a build tree located
at its original path.  Set `GIT_CLONE_PATH` to use a fixed location.
2021-02-05 10:37:03 -05:00
Brad King
c612b86ddc gitlab-ci: Refactor vcvars settings on Windows jobs
Move references closer to where the variables are needed.
2021-02-05 10:36:51 -05:00
dpugmire
aa713b565f Support for dist-memory pathlines. 2021-02-05 09:40:50 -05:00
Brad King
45bc3e6631 Merge topic 'ci-msvc-version'
4d5e829c5 gitlab-ci: Add 'concurrent' tag to Windows jobs
469d57b41 gitlab-ci: Use a specific MSVC version on Windows
2861513ab gitlab-ci: Clarify role of vtkm tag on Windows jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2398
2021-02-05 09:23:47 -05:00
Brad King
4d5e829c55 gitlab-ci: Add 'concurrent' tag to Windows jobs
Our shell jobs on Windows use the default `GIT_CLONE_PATH`,
which contains `CI_CONCURRENT_ID`.  Therefore the jobs can use
a concurrent runner.
2021-02-05 09:10:35 -05:00
Kenneth Moreland
5b9eb1ceb0 Merge topic 'deprecate-atomicarrayexec-device'
71a5bd3b9 Fix compile error with MSVC
7df5c3935 Remove device template argument from AtomicArrayExecutionObject

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nick Thompson <nathompson7@protonmail.com>
Merge-request: !2397
2021-02-04 18:07:13 -05:00
Brad King
469d57b415 gitlab-ci: Use a specific MSVC version on Windows
Teach jobs to load the environment for a specific MSVC version, and tag
them accordingly.  This allows runners to have multiple versions of MSVC
installed without requiring us to compile on the newer ones right away.

The runners provide the VS 2019 location in a `VS160COMNTOOLS`
environment variable.  Use it to avoid requiring a specific VS edition.

Issue: #595
2021-02-04 13:50:42 -05:00
Brad King
2861513abf gitlab-ci: Clarify role of vtkm tag on Windows jobs 2021-02-04 12:50:08 -05:00
Kenneth Moreland
71a5bd3b95 Fix compile error with MSVC
Some (but not all) versions of visual studio seem to have a bug that
causes a syntax error when using the deprecated attribute in a templated
constructor.
2021-02-04 08:47:28 -07:00
Kenneth Moreland
7df5c39358 Remove device template argument from AtomicArrayExecutionObject
The actual code for AtomicArrayExecutionObject does not need to be
specialized by the device. The functionality is implemented by calling
the vtkm::Atomic* methods, which are properly implemented on each
device.
2021-02-04 08:47:28 -07:00
Kenneth Moreland
0b277b1ec8 Merge topic 'copy-unknownarrayhandle'
99e613d37 Avoid conversion warnings in `RecombineVec` copy
4c524de62 Fix inverted `ArrayCopy` arguments
fa4da95eb Add changelog for copying UnknownArrayHandle
1faed3712 Remove the use of ResetTypes for ArrayCopy
ad7033684 Change ArrayCopy of UnknownArrayHandle to limit types
916a01d7b Add general `ArrayCopy` between `UnknownArrayHandle`s
26ea2ab42 Break circular dependency of ArrayCopy.h and UnknownArrayHandle.h
990cc9ece Test copying UnknownArrayHandle

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !2396
2021-02-04 10:21:26 -05:00
Kenneth Moreland
99e613d377 Avoid conversion warnings in RecombineVec copy
Unfortunately, there is no way to specify when copying `RecombineVec`s
whether we wish to allow precision loss in conversions. Because
sometimes we need them, disable the warnings.
2021-02-03 10:06:12 -07:00
Kenneth Moreland
4c524de625 Fix inverted ArrayCopy arguments
Also fix condition where a `UnknownArrayHandle` destination does not
have an underlying `ArrayHandle` set yet.
2021-02-02 17:34:12 -07:00
Kenneth Moreland
fa4da95eb2 Add changelog for copying UnknownArrayHandle 2021-02-02 17:34:12 -07:00
Kenneth Moreland
1faed3712e Remove the use of ResetTypes for ArrayCopy
It used to be the case where you needed to call `ResetTypes` on a
`VariantArrayHandle` before using `ArrayCopy` to limit the types it gets
compiled for. However, there is now a general form for
`UnknownArrayHandle`, so `ResetTypes` no longer does anything useful in
this case. Remove the use of that.
2021-02-02 17:34:08 -07:00
Kenneth Moreland
ad7033684f Change ArrayCopy of UnknownArrayHandle to limit types
Rather than copy every type to every other type, only copy for the same
base type or copy to/from FloatDefault. This should reduce the amount of
code generated by a lot.

This reduces the size of the .o for ArrayCopy.cxx on my mac from
21MB to 7.7MB.
2021-02-02 17:33:08 -07:00
Kenneth Moreland
916a01d7b9 Add general ArrayCopy between UnknownArrayHandles
Add an overload of `ArrayCopy` that takes `UnknownArrayHandle`s and
copies them for (almost) any `ArrayHandle` type.

The code uses `CastAndCallWithExtractedArray` to reduce the total number
of copy conditions to about 100, which are all precompiled into the
library. On a debug build on my mac, this creates a .o file of 21MB.
That's not great, but not terrible. Hopefully, this can be used to
consolidate copy implementations elsewhere.
2021-02-02 17:33:08 -07:00
Kenneth Moreland
26ea2ab420 Break circular dependency of ArrayCopy.h and UnknownArrayHandle.h
The circular dependency came from UnknownArrayHandle.h needing
VTKmDefaultTypes.h, which needed all the cell set types. Some of those
cell sets used ArrayCopy in templated functions. Changed those functions
to directly deep copy the ArrayHandle.
2021-02-02 17:33:08 -07:00
Kenneth Moreland
990cc9ecea Test copying UnknownArrayHandle 2021-02-02 17:33:08 -07:00
Gunther Weber
eb5e522893 Merge topic 'contourtree_debug'
7ed0cd156 Fix deprecation warning
c9af28756 Fix ValueType error in pre-split data read
cea117323 Reverse error check in ContourTreeMaker
5005b5d44 Updated ContourTreeMesh::DebugPrint / ContourTreeMaker::DebugPrintt to use per-call build guards

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2394
2021-02-02 18:16:49 -05:00
Gunther H. Weber
7ed0cd1562 Fix deprecation warning 2021-02-02 13:46:14 -08:00
Oliver Ruebel
c9af28756c Fix ValueType error in pre-split data read 2021-02-02 13:46:01 -08:00
Oliver Ruebel
cea1173233 Reverse error check in ContourTreeMaker 2021-02-02 13:46:01 -08:00
Oliver Ruebel
5005b5d44a Updated ContourTreeMesh::DebugPrint / ContourTreeMaker::DebugPrintt to use per-call build guards 2021-02-02 13:44:50 -08:00
Gunther Weber
8ebd889732 Merge topic 'add-contour-tree-unit-tests'
c59d8b25b Use test_equal_ArrayHandles instead of custom functions ArraysEqual
06ab386a0 Added test for combinining contour tree meshes
3d5adf335 Re-enabled tests with external files (and added required files to Git LFS)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2344
2021-02-01 16:55:29 -05:00
Kenneth Moreland
76634d167e Merge topic 'deprecate-arrayhandle-shrink'
34412ff29 Deprecate ArrayHandle::Shrink
eb90a6080 Update documentation for Storage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2392
2021-02-01 16:07:22 -05:00
Kenneth Moreland
6cf86d30e4 Merge topic 'new-instance-float'
880d26d60 Add test for UnknownArrayHandle::NewInstanceFloatBasic
d51fdaddf Add UnknownArrayHandle::NewInstanceFloatBasic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !2395
2021-02-01 15:58:29 -05:00
Kenneth Moreland
880d26d60a Add test for UnknownArrayHandle::NewInstanceFloatBasic 2021-02-01 10:24:13 -07:00
Kenneth Moreland
d51fdaddf8 Add UnknownArrayHandle::NewInstanceFloatBasic
This provides the ability to convert an array handle of an unknown value
type to an array handle that has `vtkm::FloatDefault` as its base
component type. Thus subsequently lets you pull the components as
`vtkm::FloatDefault` without having to worry about type conflicts.
2021-02-01 09:34:08 -07:00
Kenneth Moreland
34412ff298 Deprecate ArrayHandle::Shrink
This method has been subsumed by Allocate with vtkm::CopyFlag::On.
2021-02-01 08:07:40 -07:00
Gunther H. Weber
c59d8b25b1 Use test_equal_ArrayHandles instead of custom functions ArraysEqual 2021-01-29 11:33:25 -08:00
Gunther H. Weber
06ab386a03 Added test for combinining contour tree meshes 2021-01-29 09:45:13 -08:00
Gunther H. Weber
3d5adf335d Re-enabled tests with external files (and added required files to Git LFS) 2021-01-29 09:45:13 -08:00
Gunther Weber
4b93ce8fda Merge topic 'fix-typos'
239adf598 Fix typos in functor names for contour tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2393
2021-01-29 11:53:45 -05:00
Gunther H. Weber
239adf5980 Fix typos in functor names for contour tree 2021-01-28 14:29:45 -08:00
Kenneth Moreland
eb90a6080c Update documentation for Storage 2021-01-28 14:37:10 -07:00
Gunther Weber
7011cb8794 Merge topic 're-add-mc-tests'
5d8a67eff Re-enable marching cubes unit tests for disitrbuted contour tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2391
2021-01-28 16:27:52 -05:00
Gunther H. Weber
5d8a67eff1 Re-enable marching cubes unit tests for disitrbuted contour tree 2021-01-28 11:51:42 -08:00
Gunther Weber
32a25a4b05 Merge topic 'test-contour-tree-augmented-mc'
0183db685 Split array access into separate lines and add VTKM_ASSERT
0a33737ea Re-enable unit tests for ContourTreeUniformAugmentedFilter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2390
2021-01-28 11:43:59 -05:00
Gunther H. Weber
0183db6854 Split array access into separate lines and add VTKM_ASSERT 2021-01-27 19:31:56 -08:00