Commit Graph

8627 Commits

Author SHA1 Message Date
Gunther H. Weber
7a14ea0efa Use Float64 instead of FloatDefault in TreeCompiler 2021-02-16 20:32:39 -08:00
Oliver Ruebel
96424c8331 Fix bad ordering of args for CountLinkComponentsIn2DSlice in IsNecessary 2021-02-15 04:17:04 -08:00
Kenneth Moreland
6ddb311cd3 Merge topic 'device-free-locators'
c62e38bab Make locator exec objects not depend on device type

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nick Thompson <nathompson7@protonmail.com>
Merge-request: !2404
2021-02-09 21:16:17 -05:00
Kenneth Moreland
c62e38bab6 Make locator exec objects not depend on device type
With recent changes to `ArrayHandle`, the type for the associated array
portal is now the same across all devices. This means that almost all
exec objects no longer need to be specialized on the device types. Thus,
clean up the locator exec objects to no longer need to be templated on
device.
2021-02-09 17:20:57 -07:00
Kenneth Moreland
6232670049 Merge topic 'deprecate-executiontypes'
05fc1747e Make deprecated tags more descriptive
b92566cdd Convert `std::endl` to `'\n'`
b8b958a98 Get rid of CellSetStructured.hxx
f4bc3002b Fix compiler error with `constexpr` method
4d8f05bae Update CellSetExtrude to not specify exec types by device
3962e73b0 Fix issues with class specialization
c55d15f39 Deprecate ArrayHandle::ExecutionTypes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2401
2021-02-09 13:33:08 -05:00
Kenneth Moreland
05fc1747e0 Make deprecated tags more descriptive
Also, test to make sure that the deprecated types are still valid.
2021-02-09 09:45:41 -07:00
Kenneth Moreland
b92566cdd1 Convert std::endl to '\n'
Using `std::endl` has a side effect of flushing the stream, which can
have unintended performance consequences.
2021-02-09 08:53:46 -07:00
Nick Thompson
f4a3538a6f Merge topic 'fix_matrix'
e4241aa53 Make matrix unit tests less verbose.
bba3d29c2 Remove UB from Matrix.h, and replace by quiet NaNs.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2402
2021-02-08 21:01:18 -05:00
Kenneth Moreland
b8b958a98b Get rid of CellSetStructured.hxx
One of the MSVC builds was giving template resolution problems for one
of the methods declared non-inline for no discernable reason. It sounds
like a compiler bug. Rather than try to  work around the issue, just
move the declaration inline.

In fact, all the methods are really small (only 1 or 2 lines). Just
delete the .hxx file and simplify things.
2021-02-08 18:43:31 -07:00
Kenneth Moreland
f4bc3002bb Fix compiler error with constexpr method
The `GetMaxNumberOfNeighbours` of the `MeshStructure*` classes was
declared `constexpr`. This was causing some compiler errors.

I think the problem is actually a bug with GCC (https://gcc.gnu.org/
bugzilla/show_bug.cgi?id=66297). Whether it is a compiler bug or not,
there does not seem to be a large value to declaring this method
`constexpr`, so I just removed the keyword.
2021-02-08 17:21:53 -07:00
Kenneth Moreland
4d8f05baef Update CellSetExtrude to not specify exec types by device
Somewhere during this edit I removed a header file that didn't strictly
need to be there. This caused me to have to add

```cpp
```

in several places in the code.
2021-02-08 16:57:16 -07:00
Kenneth Moreland
3962e73b06 Fix issues with class specialization
C++ has some weird rules about specializing subclasses.
2021-02-08 14:31:45 -07:00
Nick Thompson
e4241aa530 Make matrix unit tests less verbose. 2021-02-08 16:18:13 -05:00
Nick Thompson
bba3d29c2a Remove UB from Matrix.h, and replace by quiet NaNs. 2021-02-08 15:40:23 -05:00
Kenneth Moreland
c55d15f397 Deprecate ArrayHandle::ExecutionTypes
The newer version of `ArrayHandle` no longer supports different types of
portals for different devices. Thus, the `ReadPortalType` and
`WritePortalType` are sufficient for all types of portals across all
devices.

This significantly simplifies supporting execution objects on devices,
and thus this change also includes many changes to various execution
objects to remove their dependence on the device adapter tag.
2021-02-08 12:17:37 -07:00
Vicente Bolea
5cc292080d Merge topic 'refactor-use-cpp14'
02f97325c Merge branch 'upstream-lcl' into refactor-use-cpp14
282bf6b8c lcl 2021-02-08 (6fe1a2d8)
bbe36d8c3 cmake: set c++14 as minimum c++ rev

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2331
2021-02-08 13:15:26 -05:00
Vicente Adolfo Bolea Sanchez
02f97325c4 Merge branch 'upstream-lcl' into refactor-use-cpp14
# By Lightweight Cell Library Upstream
* upstream-lcl:
  lcl 2021-02-08 (6fe1a2d8)
2021-02-08 17:13:10 +01:00
Lightweight Cell Library Upstream
282bf6b8c7 lcl 2021-02-08 (6fe1a2d8)
Code extracted from:

    https://gitlab.kitware.com/vtk/lcl.git

at commit 6fe1a2d8983bcd00fe59ee6049a32d24fdc797af (master).
2021-02-08 17:13:10 +01:00
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