Commit Graph

7536 Commits

Author SHA1 Message Date
Robert Maynard
b033b28efd Add a windows10 vs2019 + shell builder
In a future merge request will test CUDA support on windows
2020-05-04 12:02:56 -04:00
Robert Maynard
1e5c19a285 ContourTreeUniformAugmented compiles with visual studio + cuda 2020-05-04 12:02:56 -04:00
Robert Maynard
0ee0bf7cb2 Correct vtkm/Deprecated.h to work with CUDA and VS2019 2020-05-04 12:02:56 -04:00
Vicente Adolfo Bolea Sanchez
3b55797d41 replaces Dataset fields vector to a map
This refactor aims to increase the performance of
AddField / Getfield at the expense of memory usage and
some bits of performances when only few fields are used

Moving to non-contiguous memory will impact cpu cache benefits,
however, since each of the Field has again another pointer to
its actual data, this benefits where actually just small.

Also the choice of map v.s. unordered_map is about the number of
elements, very likely few rehashing happenings from until <100

This will also reduce the memory fragmentation caused by vectors.

Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2020-05-01 14:05:03 -04:00
Vicente Bolea
048652e25b Merge topic 'fix-303-remove-opengl-rendering-classes'
48ee2e518 removed classes related to OpenGL/OSMESA/EGL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <larsen30@llnl.gov>
Merge-request: !2010
2020-05-01 13:44:33 -04:00
Robert Maynard
5d1a8e6d05 Merge topic 'ci_test_examples'
33c166790 Make sure merge request ci builds examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2069
2020-05-01 11:02:14 -04:00
Robert Maynard
33c1667904 Make sure merge request ci builds examples 2020-05-01 08:45:50 -04:00
Nick
becb289694 Merge topic 'deprecate_reader'
9a68931c0 Do not add half-baked 1.6 release notes; let Robert consolidate release notes.
01b61be46 Start release notes for 1.6
697369fc1 Remove deprecation warnings throughout the project.
d610176ab First commit demos backwards compatibility and printing of warnings.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2067
2020-05-01 07:53:21 -04:00
NAThompson
9a68931c0b Do not add half-baked 1.6 release notes; let Robert consolidate release notes. 2020-05-01 07:31:35 -04:00
Vicente Adolfo Bolea Sanchez
48ee2e5182 removed classes related to OpenGL/OSMESA/EGL 2020-04-30 18:24:01 -04:00
NAThompson
01b61be464 Start release notes for 1.6 2020-04-30 13:58:06 -04:00
Kenneth Moreland
1c703b94c4 Merge topic 'filter-specifies-own-field-types'
882dcacca Have filter specify its own field types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2064
2020-04-30 10:01:20 -04:00
NAThompson
697369fc14 Remove deprecation warnings throughout the project. 2020-04-30 08:12:04 -04:00
NAThompson
d610176aba First commit demos backwards compatibility and printing of warnings. 2020-04-30 07:37:55 -04:00
Nick
e87e0a4dae Merge topic 'reader_oversegmented'
b82051746 Test that no warnings are generated and tests pass.
20c6e6933 Deprecate writer/ directory.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2065
2020-04-29 14:47:35 -04:00
NAThompson
b82051746c Test that no warnings are generated and tests pass. 2020-04-29 11:30:18 -04:00
NAThompson
20c6e69338 Deprecate writer/ directory. 2020-04-29 11:11:02 -04:00
Robert Maynard
4b584aec23 Merge topic 'refactor_vtkm_io'
820b8c8a8 Fix comment and new line.
277a0c7f7 Deprecate EncodePNG and DecodePNG from vtkm::rendering.
51c4e6d4f Merge remote-tracking branch 'upstream/master' into refactor_vtkm_io
54e15e8f1 Export symbol as VTK_IO_EXPORT.
1a16299b8 Fix build error.
981f0ed0d First stab at building a vtkm_io library target.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2063
2020-04-29 09:16:26 -04:00
Kenneth Moreland
882dcacca4 Have filter specify its own field types
Previously, the policy specified which field types the filter should
operate on. The filter could remove some types, but it was not able to
add any types.

This is backward. Instead, the filter should specify what types its
supports and the policy may cull out some of those.
2020-04-28 10:31:44 -06:00
NAThompson
820b8c8a8a Fix comment and new line. 2020-04-28 11:24:09 -04:00
NAThompson
277a0c7f7d Deprecate EncodePNG and DecodePNG from vtkm::rendering. 2020-04-28 11:14:51 -04:00
NAThompson
51c4e6d4ff Merge remote-tracking branch 'upstream/master' into refactor_vtkm_io 2020-04-28 11:13:54 -04:00
Kenneth Moreland
f7741be0e1 Merge topic 'fix-cuda-compile-error'
a44392027 Fix compile error in UnitTestTaskStrided.cu from changes in Fetch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2062
2020-04-28 09:55:26 -04:00
Nick
54e15e8f14 Export symbol as VTK_IO_EXPORT. 2020-04-28 09:12:11 -04:00
Nick
1a16299b8c Fix build error. 2020-04-28 07:47:31 -04:00
Nick
981f0ed0d9 First stab at building a vtkm_io library target. 2020-04-28 07:13:27 -04:00
Kenneth Moreland
a44392027a Fix compile error in UnitTestTaskStrided.cu from changes in Fetch
A recent change removed the thread indices parameters from the arguments
to the `Fetch` template. Somehow, an instance of using the old template
in the CUDA task strided tests snuck through the dashboard tests.
Correct that.
2020-04-27 17:47:37 -06:00
Dave Pugmire
87470a89b7 Merge topic 'fix_euler_step_particleAdvection2'
2ecca9edf Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into fix_euler_step_particleAdvection2
d2e9b3d30 Fix for small euler step for particle advection.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2057
2020-04-27 09:41:39 -04:00
Vicente Bolea
e9c7378782 Merge topic 'refactor-relaxed-threadindicestypes'
d0396e2a4 relaxes ThreadIndicesType across multiple worklets fetchs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2032
2020-04-24 20:10:12 -04:00
Vicente Adolfo Bolea Sanchez
d0396e2a40 relaxes ThreadIndicesType across multiple worklets fetchs
This change is needed for being able to use different thread indices types
without changing Fetchs. Basically decoupling those two areas.

1. This commit removes concrete specialization instantiations of
   ThreadIndicesTypes in all of the Fetch's specializations.

2. It also moves the ThreadIndicesType template parameter from the Fetch
   struct to a template parameter in their methods Load/Store.

Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2020-04-24 17:39:31 -04:00
dpugmire
2ecca9edf1 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into fix_euler_step_particleAdvection2 2020-04-24 14:47:41 -04:00
Nickolas Davis
52749710dc Merge topic 'lodepng-fpic'
02ef5291f incorporate -fPIC flag in lodepng when buliding linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2060
2020-04-24 14:40:23 -04:00
nadavi
02ef5291f5 incorporate -fPIC flag in lodepng when buliding linux 2020-04-24 12:10:35 -06:00
Matt Larsen
319af8e25e Merge topic 'fix/scalar_rendering'
6fe468410 add normalization bypass for nodal scalars
4c0a3858b don't always normalize scalars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sudhanshu Sane <ssane@cs.uoregon.edu>
Merge-request: !2056
2020-04-23 20:35:20 -04:00
dpugmire
d2e9b3d306 Fix for small euler step for particle advection. 2020-04-23 16:14:28 -04:00
Matt Larsen
6fe4684102 add normalization bypass for nodal scalars 2020-04-23 12:56:46 -07:00
Nickolas Davis
d22b658c3a Merge topic 'lodepng-in-lib'
b380e702d only include the lodepng header when installing
c9cbd9693 fix type warnings
62fe68acd fixes to match old files
abf569288 Merge branch 'upstream-lodepng' into lodepng-in-lib
957568e36 lodepng 2020-04-16 (b51302e1)
e925d6d54 turn lodepng into a library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2034
2020-04-23 14:02:09 -04:00
Matt Larsen
4c0a3858b2 don't always normalize scalars 2020-04-23 10:31:39 -07:00
Vicente Bolea
d2ebecdb27 Merge topic 'fix-openmp-reduction-with-few-threads'
738c05ae8 fixes OMP reduction when using OMP_NUM_THREADS lt 4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2053
2020-04-23 11:52:06 -04:00
Vicente Adolfo Bolea Sanchez
738c05ae87 fixes OMP reduction when using OMP_NUM_THREADS lt 4
This fixes, which where triggered since in the new CI, one of the
docker runner set `OMP_NUM_THREADS=3`:

1. `UnitTestOpenMPDeviceAdapter`
2. `UnitTestMeshQualityFilter`

In the redution optimized implementation for _OpenMP_, it unrolls
the reduce loop in iterations of four elements. The last iteration
in the loop might overflow the loop end element (when it is not a
multiple of four).

This commit fixes this by setting the OpenMP unrolled reduce loop
end element to its previous closest multiple of four of the original end
element.

Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2020-04-22 20:14:34 -04:00
nadavi
b380e702d2 only include the lodepng header when installing 2020-04-22 15:00:19 -06:00
nadavi
c9cbd9693d fix type warnings 2020-04-22 12:29:40 -06:00
nadavi
62fe68acdd fixes to match old files 2020-04-22 12:18:43 -06:00
nadavi
abf5692887 Merge branch 'upstream-lodepng' into lodepng-in-lib
* upstream-lodepng:
  lodepng 2020-04-16 (b51302e1)
2020-04-22 12:07:52 -06:00
LodePNG Upstream
957568e368 lodepng 2020-04-16 (b51302e1)
Code extracted from:

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

at commit b51302e11851e825089172285f920a089f12e318 (for/vtk-m).
2020-04-22 12:07:52 -06:00
nadavi
e925d6d54c turn lodepng into a library 2020-04-22 12:07:32 -06:00
Kenneth Moreland
f6970314a1 Merge topic 'restore-device-tests'
94f0d2f8a Restore device tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2054
2020-04-21 15:15:34 -04:00
Kenneth Moreland
94f0d2f8a5 Restore device tests
While debugging, I commented out a section of the device adapter tests
to narrow down on some issues. Oops, I forgot to restore the test. Do
that now.
2020-04-21 11:46:40 -06:00
Vicente Bolea
d88ec52c3b Merge topic 'fix-463-better-cmd-help'
b05bd33d3 benchmarks: pass unparsed args to Google benchmark

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1978
2020-04-21 12:30:17 -04:00
Vicente Adolfo Bolea Sanchez
b05bd33d3c benchmarks: pass unparsed args to Google benchmark
- It also adds Google's benchmarch compare.py script
  - It is installed to the build directory.

- It add a wrapper script called compare-benchmarks.py which:
  - Let you run each of the benchmarks with different devices

- It adds a README.md explaining how to run the benchmarks

- BenchmarkDeviceAdapter input size range parametrized at compile time

Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2020-04-21 10:52:31 -04:00