Commit Graph

7935 Commits

Author SHA1 Message Date
Sujin Philip
934f085e09 Build diy as a library
Support both mpi and nompi versions simultaneously.
2020-06-08 15:57:51 -05:00
Diy Upstream
7687aabf85 diy 2020-06-05 (b62915aa)
Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit b62915aa4c44ee345b534e6f85c4c9535a211018 (for/vtk-m-20200608-master).
2020-06-08 15:55:58 -05:00
Sujin Philip
f0a37ac6aa Merge branch 'upstream-diy' into diy-mpi-nompi
* upstream-diy:
  diy 2020-06-05 (b62915aa)
2020-06-08 15:55:58 -05:00
Sujin Philip
6ca2b9f877 Point to new version of Diy 2020-06-08 15:55:38 -05:00
Matt Larsen
4cb94e7fc1 Merge topic 'respect_max_distance'
ce3a64b41 fix comparison
ab6bb14d3 Merge branch 'respect_max_distance' of gitlab.kitware.com:mclarsen/vtk-m into respect_max_distance
a6ed41027 use bounds based epsilon for tiny meshes
59775c4eb respect ray max distance

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sudhanshu Sane <ssane@cs.uoregon.edu>
Merge-request: !2129
2020-06-08 15:43:52 -04:00
Li-Ta Lo
099edee959 Merge branch 'stats_by_key' of gitlab.kitware.com:ollielo/vtk-m into stats_by_key 2020-06-08 10:29:01 -06:00
Li-Ta Lo
c9da2a9c06 add unit test on the property of variance 2020-06-08 10:22:24 -06:00
Li-Ta Lo
b9b4583a76 add unit test on the property of variance 2020-06-08 10:03:27 -06:00
Li-Ta Lo
63232e0eed add reference to the algorithm and a unit test on normal RN 2020-06-08 09:20:25 -06:00
Robert Maynard
aeb94c0dd8 Merge topic 'correct_flying_edge_cellid'
748f8f8c3 Correct flying edge cell-id mapping

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <larsen30@llnl.gov>
Merge-request: !2124
2020-06-08 10:36:20 -04:00
Robert Maynard
748f8f8c30 Correct flying edge cell-id mapping 2020-06-08 10:01:04 -04:00
Matt Larsen
ce3a64b412 fix comparison 2020-06-06 18:00:42 -07:00
Matt Larsen
ab6bb14d31 Merge branch 'respect_max_distance' of gitlab.kitware.com:mclarsen/vtk-m into respect_max_distance 2020-06-06 17:59:41 -07:00
Matt Larsen
a6ed41027e use bounds based epsilon for tiny meshes 2020-06-06 17:56:25 -07:00
Matt Larsen
59775c4eba respect ray max distance 2020-06-06 15:39:25 -07:00
Li-Ta Lo
807a0a9dea add newline 2020-06-05 16:18:19 -06:00
Li-Ta Lo
991e7eac2a United We Stand
Implemented a one-pass, Divide and Conqur algorithm to calculate various statistical
moments. Only one call to Reduce is needed.
2020-06-05 16:09:10 -06:00
NAThompson
0dccfb7d74 Rough semicolon. 2020-06-05 15:28:51 -04:00
NAThompson
db8f3c9fc9 Remove Initialize() boilerplate. 2020-06-05 13:38:18 -04:00
Kenneth Moreland
b57a24e8f3 Merge topic 'probe-sets-invalid-value'
7be44c847 Enable setting invalid value in probe filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !2122
2020-06-05 10:08:24 -04:00
Nick Thompson
f8ba7422bf Merge topic 'cxx17_compile'
3265460e6 Fix C++17 build.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2121
2020-06-03 17:38:10 -04:00
Kenneth Moreland
7be44c847f Enable setting invalid value in probe filter
Initially, the probe filter would simply not set a value if a sample was
outside the input `DataSet`. This is not great as the memory could be
left uninitalized and lead to unpredictable results. The testing
compared these invalid results to 0, which seemed to work but is
probably unstable.

This was partially fixed by a previous change that consolidated to
mapping of cell data with a general routine that permuted data. However,
the fix did not extend to point data in the input, and it was not
possible to specify a particular invalid value.

This change specifically updates the probe filter so that invalid values
are set to a user-specified value.
2020-06-03 15:29:37 -06:00
NAThompson
3265460e66 Fix C++17 build. 2020-06-03 14:14:32 -04:00
Li-Ta Lo
c0dee74028 make it explicit that we are using 64-bit unsigned integer in bit op 2020-06-03 11:43:14 -06:00
Kenneth Moreland
c1c8e54940 Merge topic 'non-tested-fixes'
7ded85f01 Remove reference to Canvas in ImageReaderBase
7fa2c9f76 Update doxygen comments in Tuple.h.in

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2119
2020-06-03 13:28:23 -04:00
Li-Ta Lo
34f3505885 Added changelog 2020-06-03 10:15:00 -06:00
Kenneth Moreland
7ded85f012 Remove reference to Canvas in ImageReaderBase
It is no longer necessary for the image reader to access a Canvas, and
this does not work anyway if rendering is turned off.
2020-06-03 09:25:19 -06:00
Kenneth Moreland
7fa2c9f769 Update doxygen comments in Tuple.h.in
The `Tuple.h` file was updated with some comments that were not updated
in `Tuple.h.in`. This caused the pyexpander script to fail with
mismatched files.
2020-06-03 09:22:48 -06:00
Robert Maynard
14338a559c Merge topic 'gitlab_ci_doxygen'
930c3d2fb reproduce_ci_env better detects which stage a job is for
71d9d4311 Doxygen is now generated by gitlab and done on each master merge
a652f7fe1 Update vtk-m doxygen to generate less warnings
97a2408fc Correct warnings for using TBB 2020 deprecated functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2117
2020-06-03 10:01:07 -04:00
Robert Maynard
930c3d2fb0 reproduce_ci_env better detects which stage a job is for
Previously stages like `doxygen` wouldn't be detected by
reproduce_ci_env as they didn't start with `build:` or `test:`.
Now we properly look for the `stage` key.
2020-06-03 09:55:21 -04:00
Robert Maynard
71d9d4311e Doxygen is now generated by gitlab and done on each master merge 2020-06-03 09:55:21 -04:00
Kenneth Moreland
7c7b95e5b1 Merge topic 'structured-gradient-fix'
8239eb467 Fix an issue with structured (non-uniform) gradients

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2118
2020-06-03 09:51:16 -04:00
Kenneth Moreland
fe527ae26e Merge topic 'image-reader-structure'
1949cad40 Add get/set filename methods for image reader/writer
e8c5ee5e6 Remove pixel type selection from PNG reader
6c97054b7 Update image writes to style and library
1e91b32ac Update image readers to style and library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nickolas Davis <nadavi@sandia.gov>
Merge-request: !2109
2020-06-02 19:50:26 -04:00
Kenneth Moreland
8239eb467f Fix an issue with structured (non-uniform) gradients
This fixes a bug introduced in commit
93d87e06fd7a0ef479a324e5cd2453c1c7ece0ee

Part of the commit moved fromusing a `BoundaryState` object to keeping
boundary flags in a `vtkm::Vec<bool,3>`. However, the meaning of the
flag got inverted. The `BoundaryState::IsRadiusIn?Boundary` methods
returned true if the current location was inside the bounds (i.e. _not_
on the boundary), but the new flags are true if the current location is
on the boundary (the inverse).

The updating of the code for the `StructuredPointGradient::Jacobian`
method got the flag somewhat wrong and scaled the wrong case.
2020-06-02 17:44:06 -06:00
Li-Ta Lo
e9f584a91f ArrayHandleRandomUniformReal
Add an ArrayHandle for generating random Float64 in the range of [0, 1).
2020-06-02 11:58:57 -06:00
Abhishek Yenpure
8260be6fc6 Merge topic 'euler_integrator_fix'
e9fd545b0 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m into euler_integrator_fix
23126bbec Integrator status fix for consistant behavior
3e18f105e Fixing Integrator Status Behavior
ff112e424 Integrator status behavior check
343f2d577 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m into euler_integrator_fix
82cfba27c Rectify testing code
8ddecbb43 Fixing test issues
6274b1657 Updating Euler Integrator to work

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2023
2020-06-01 17:20:16 -04:00
Robert Maynard
a652f7fe1e Update vtk-m doxygen to generate less warnings 2020-06-01 16:58:32 -04:00
Robert Maynard
97a2408fc4 Correct warnings for using TBB 2020 deprecated functions 2020-06-01 16:58:32 -04:00
Robert Maynard
dbe73db742 Merge topic 'update_ci'
f7846f901 Add openmpi library path to LD_LIBRARY_PATH
e7ca8be0b Update docker images to use cmake 3.17.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !2114
2020-06-01 15:49:51 -04:00
Robert Maynard
f7846f9013 Add openmpi library path to LD_LIBRARY_PATH 2020-06-01 15:17:22 -04:00
Kenneth Moreland
1949cad400 Add get/set filename methods for image reader/writer 2020-06-01 10:33:20 -06:00
Kenneth Moreland
e8c5ee5e69 Remove pixel type selection from PNG reader
Selecting the pixel type just means that lodepng casts it to that type
for it then to be cast to the type VTK-m uses. Since VTK-m always uses
the same type, there is little value for changing the intermediate cast.
2020-06-01 10:00:37 -06:00
Kenneth Moreland
6c97054b7f Update image writes to style and library
Updated the image writer classes to better follow VTK-m naming
convention (i.e. use `ImageWriterPNG` instead of `PNGWriter`). The
structure of the image writer class now also better matches the
interface for the VTK writer.

Also put the implementation of the image writers into the `vtkm_io`
library so that it only has to be compiled once.
2020-06-01 10:00:36 -06:00
Kenneth Moreland
1e91b32ace Update image readers to style and library
Updated the image reader classes to better follow VTK-m naming
convention (i.e. use `ImageReaderPNG` instead of `PNGReader`).
The structure of the image reader class now also better matches
the interface for the VTK reader.

Also put the implementation of the image readers into the `vtkm_io`
library so that it only has to be compiled once.
2020-06-01 10:00:18 -06:00
Robert Maynard
e7ca8be0b9 Update docker images to use cmake 3.17.3
The 3.17.3 release fixes a regression in ctest where NOT_RUN
tests didn't get reported to ctest or cdash
2020-06-01 11:51:39 -04:00
Robert Maynard
0f7a509cdb Merge topic 'update_cmake_logic_to_assume_312'
565d5a3a2 Remove CMake workarounds for version < 3.12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2110
2020-06-01 08:41:24 -04:00
Robert Maynard
565d5a3a2e Remove CMake workarounds for version < 3.12 2020-05-29 17:15:06 -04:00
Kenneth Moreland
da6fc5e378 Merge topic 'add/hyperstructstats'
3273f1c48 Update to AddPointField of dataset
eef30c232 Merge branch 'master' into add/hyperstructstats
1014dbf04 Fix BOV reader support in ContourTreeApp
e908826c1 Temporary disabled BOV reader in ContourTreeApp pending #517
8a27ff510 Merge branch 'master' into add/hyperstructstats
43e470de7 Fix g++ conversion warning in ContourTreeApp
a9a4736c3 Add BOV reader support and fix TBB settings in contour tree app
38da8dc43 Fix TBB check bug in ContourTreeApp
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2002
2020-05-28 13:25:08 -04:00
Robert Maynard
d7af19ea8f Merge topic 'deprecated_bov_reader_still_constructible'
0f867c05f vtkm::io::reader::BOVDataSet fix 'constructor delegates to itself'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2107
2020-05-28 13:10:53 -04:00
Oliver Ruebel
3273f1c484 Update to AddPointField of dataset 2020-05-28 09:33:42 -07:00