Commit Graph

7415 Commits

Author SHA1 Message Date
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
Robert Maynard
098c50b382 Merge topic 'encode_png'
1d4ebaec9 Image was upside down; flip it over, demo usage.
4e76c00a4 Fix linker error and multiply defined symbols.
eb36a07ab Use logging framework [CI SKIP]
104e7bd9c Halting first steps towards encoding .pngs.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2048
2020-04-21 08:05:03 -04:00
Robert Maynard
18a8e91ecd Merge topic 'add_asan_to_ci'
1bf808c47 Add OpenMP to our asan dashboard
07f37c814 Add lsan suppression file
b3924ef30 Add an asan to our gitlab ci suite

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Acked-by: Nick <nathompson7@protonmail.com>
Merge-request: !2051
2020-04-20 16:17:27 -04:00
Robert Maynard
1bf808c479 Add OpenMP to our asan dashboard 2020-04-20 15:22:34 -04:00
Robert Maynard
07f37c814b Add lsan suppression file 2020-04-20 14:16:52 -04:00
Robert Maynard
b3924ef302 Add an asan to our gitlab ci suite 2020-04-20 11:26:26 -04:00
Robert Maynard
e28b80649e Merge topic 'add_another_openmp_ci_builder'
d7eaf1be8 make ubuntu1804_gcc6 run for each merge request and not just nightly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2050
2020-04-17 11:05:12 -04:00
Vicente Bolea
a0e7838b87 Merge topic 'refactor-meshquality-use-errorcodes'
026fd14ba CellMetrics return vtkm::ErrorCode instead of raising errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2041
2020-04-17 10:43:48 -04:00
Ben Boeckel
51e9d10fa6 Merge topic 'findtbb-gcc48'
e890a9802 FindTBB: synchronize with VTK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2049
2020-04-17 10:40:30 -04:00
Robert Maynard
d7eaf1be84 make ubuntu1804_gcc6 run for each merge request and not just nightly 2020-04-17 10:02:20 -04:00
Ben Boeckel
e890a98023 FindTBB: synchronize with VTK 2020-04-17 08:30:02 -04:00
Nick
1d4ebaec9f Image was upside down; flip it over, demo usage. 2020-04-17 07:56:03 -04:00
Nick
4e76c00a42 Fix linker error and multiply defined symbols. 2020-04-17 07:32:01 -04:00
Nick
eb36a07ab7 Use logging framework [CI SKIP] 2020-04-17 06:53:32 -04:00
Nick
104e7bd9c2 Halting first steps towards encoding .pngs. 2020-04-17 06:22:30 -04:00
Kenneth Moreland
415c11ee18 Merge topic 'reduce-fancy-output'
6dc0b394a Fix reduce-by-key with a fancy output array

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2047
2020-04-16 20:25:41 -04:00
Vicente Adolfo Bolea Sanchez
026fd14ba6 CellMetrics return vtkm::ErrorCode instead of raising errors
- MeshQuality now throws ErrorCode messages

Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2020-04-16 17:27:42 -04:00
Robert Maynard
1d807a08eb Merge topic 'reduce_openmp_num_threads_on_ci'
314a30ff1 Restrict the OpenMP threads # gitlab-ci tests uses

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2046
2020-04-16 16:49:04 -04:00
Kenneth Moreland
6dc0b394a9 Fix reduce-by-key with a fancy output array
If you gave ReduceByKey a fancy output array that decorated another
array, you could get a runtime error for using an invalid array (if the
device adapter used the generic algorithm). The problem was that
ReduceByKey creates a temporary array, and that array was given the same
storage as the output array. That might not be valid for fancy arrays,
so instead use the default storage for the temporary array.
2020-04-16 14:19:44 -06:00
Kenneth Moreland
ae0fc3885b Merge topic 'scan-fancy-output'
52f157e42 Fix scan-by-key with a fancy output array

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2045
2020-04-16 16:15:13 -04:00
Robert Maynard
314a30ff19 Restrict the OpenMP threads # gitlab-ci tests uses
A single gitlab-runner can run multiple test stages
concurrently on the same hardware. When we have 3
jobs asking for 100% of the cpu's we get a 300%
reduction in performance caused by task switching
2020-04-16 15:45:59 -04:00
Robert Maynard
2aa4928f7a Merge topic 'correct_ubuntu1604_gcc48_test_failures'
5c16b3be2 ubuntu1604 builders now use the correct c && c++ compilers
3c80b35b8 ubuntu1604 test step needs to know where MPI install location is
889cb33dd gitlab-ci test jobs better handle false positive failures
b2823d79a ubuntu1604 gcc48 builder install test now pass
93cbea2d7 Update README with update CMake and compiler tested versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2042
2020-04-16 14:58:47 -04:00