Commit Graph

6182 Commits

Author SHA1 Message Date
Allison Vacanti
4c507de588 Merge topic 'gcc_4.8_fixes'
938a116dc Fix brace initialization of std::atomic for gcc 4.8.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1715
2019-07-01 10:38:48 -04:00
Allison Vacanti
938a116dc2 Fix brace initialization of std::atomic for gcc 4.8. 2019-07-01 10:15:19 -04:00
Mark Kim
a0c84948ad Merge topic 'advdatamodel'
b49436399 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m into advdatamodel
8dbb1c4de Merge branch 'master' of gitlab.kitware.com:m-kim/vtk-m into advdatamodel
f3f71eb14 Don't need this.
9ebcf5c61 Fix warning about attributes
699b57191 Merge branch 'master' of gitlab.kitware.com:m-kim/vtk-m into advdatamodel
a5027d74d clean up warnings.
a941f0aea pass arrayhandle to ArrayHandleExtrudeCoords
8a3528d70 consolidate some files
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1711
2019-06-28 13:45:17 -04:00
Mark Kim
b494363993 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m into advdatamodel 2019-06-26 20:50:58 -04:00
Mark Kim
8dbb1c4de3 Merge branch 'master' of gitlab.kitware.com:m-kim/vtk-m into advdatamodel 2019-06-26 19:37:47 -04:00
Mark Kim
f3f71eb141 Don't need this. 2019-06-26 19:37:35 -04:00
Robert Maynard
903c2604df Release VTK-m 1.4.0
1.4.0 is our fifth official release of VTK-m.
The major changes to VTK-m from 1.3.0 can be found in:
  docs/changelog/1.4/release-notes.md
v1.4.0
2019-06-26 12:19:53 -04:00
Robert Maynard
774d7a566e Add release notes for v1.4.0 2019-06-26 12:13:47 -04:00
Robert Maynard
0eac06f5b0 Merge topic 'diy_export_mpi_req'
bbb391226 VTKmTestInstall properly propagates compiler flags
86df1d27b Update VTKmMPI to handle CMake 3.13+
118583dea Test compilations against installed VTK-m work with CUDA enabled
8f1589c96 Correct license on FindMPI.cmake
74d713c77 Install compilation tests are enabled when examples are disabled
fb6235e0e VTK-m and DIY now properly export MPI requirements.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1712
2019-06-26 08:31:33 -04:00
Robert Maynard
bbb3912268 VTKmTestInstall properly propagates compiler flags 2019-06-25 16:04:54 -04:00
Allison Vacanti
920ef9b3b9 Merge topic 'bit_algorithms'
f370857c1 Add CountSetBits and Fill device algorithms.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1696
2019-06-25 15:42:16 -04:00
Allison Vacanti
f370857c15 Add CountSetBits and Fill device algorithms. 2019-06-25 11:30:39 -04:00
Mark Kim
9ebcf5c610 Fix warning about attributes
-Wattributes "type attributes ignored
after type is already defined"
2019-06-25 11:01:59 -04:00
Mark Kim
699b57191f Merge branch 'master' of gitlab.kitware.com:m-kim/vtk-m into advdatamodel 2019-06-25 10:36:47 -04:00
Mark Kim
a5027d74d2 clean up warnings.
In clang and vc++
2019-06-24 22:10:32 -04:00
Robert Maynard
86df1d27be Update VTKmMPI to handle CMake 3.13+ 2019-06-24 16:58:31 -04:00
Mark Kim
a941f0aea3 pass arrayhandle to ArrayHandleExtrudeCoords
which passes directly to storage to avoid a copy.
2019-06-24 15:15:20 -04:00
Robert Maynard
118583dea5 Test compilations against installed VTK-m work with CUDA enabled 2019-06-24 14:48:01 -04:00
Robert Maynard
8f1589c96f Correct license on FindMPI.cmake 2019-06-24 14:48:01 -04:00
Robert Maynard
74d713c774 Install compilation tests are enabled when examples are disabled
Previously VTK-m only activated the install/compilation tests when
examples had been enabled. This decreased the amount of coverage
on dashboards.
2019-06-24 14:48:01 -04:00
Robert Maynard
fb6235e0e9 VTK-m and DIY now properly export MPI requirements.
Previously an installed version of VTK-m wasn't relocatable as
it had system MPI paths. Additionally the installed vtkm_diy target
would depend on MPI but not `find_package(MPI)`
2019-06-24 14:48:01 -04:00
Mark Kim
8a3528d700 consolidate some files
ArrayPortalExtrude and ArrayPortalExtrudePlane
merged into StorageExtrude.h
2019-06-22 00:48:12 -04:00
Mark Kim
c47ee35fd1 better c++ encapsulation. 2019-06-21 23:01:03 -04:00
Mark Kim
9aa1a3f378 Need to specialize DeduceCellSet
on 2D CellSetStructured.
2019-06-21 21:48:26 -04:00
Mark Kim
b9448131d5 Fix visual studio error. 2019-06-21 20:51:44 -04:00
Mark Kim
fc479aa02c fix warnings 2019-06-21 14:39:23 -04:00
Mark Kim
876727d81f tbb testing needs vtkm_worklet
as library
2019-06-21 14:37:22 -04:00
Mark Kim
771c7cb7b3 fix warnings 2019-06-21 12:11:36 -04:00
Mark Kim
978fc2b9c2 Copyright notices. 2019-06-21 11:35:46 -04:00
Robert Maynard
83bc8d7596 Merge topic 'dont_launch_zero_size_cuda_tasks'
1ea386222 cuda copy functions don't launch on length zero arrays

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1708
2019-06-21 08:57:49 -04:00
Robert Maynard
bd53152eb9 Merge topic 'document_lodepng_thirdparty'
c97ff042e Document the adding of lodepng to thirdparty

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1709
2019-06-21 08:31:58 -04:00
Mark Kim
cffd3873fc Merge branch 'advdatamodel' 2019-06-20 22:20:44 -04:00
Mark Kim
6e1d3a84f0 First Extrude commit.
how did any of this work?

match other CellSet file layouts.

???

compile in CUDA.

unit tests.

also only serial.

make error message accurate

Well, this compiles and works now.

Did it ever?

use CellShapeTagGeneric

UnitTest matches previous changes.

whoops

Fix linking problems.

Need the same interface

as other ThreadIndices.

add filter test

okay, let's try duplicating CellSetStructure.

okay

inching...

change to wedge in CellSetListTag

Means changing these to support it.

switch back to wedge from generic

compiles and runs

remove ExtrudedType

need vtkm_worklet

vtkm_worklet needs to be included

fix segment count for wedge specialization

need to actually save the index

for the other constructor.

specialize on Explicit

clean up warning

angled brackets not quotes.

formatting
2019-06-20 22:17:24 -04:00
Robert Maynard
c97ff042e6 Document the adding of lodepng to thirdparty 2019-06-20 17:03:28 -04:00
Robert Maynard
1ea386222e cuda copy functions don't launch on length zero arrays 2019-06-20 16:54:23 -04:00
Robert Maynard
5e5e1638ac Merge branch 'add_lodepng_thirdparty' into 'master'
Add lodepng thirdparty

See merge request vtk/vtk-m!1704
2019-06-20 15:49:31 -04:00
Robert Maynard
68cb906ae3 Merge topic 'correct_ubsan_undefined_behavior'
512d0431e Cell and Point locators have correct export visibility
c7f827581 Correct signed to unsigned warning conversion found by clang-8
c28797845 Gradient's ComputeDivergence is now properly initialized

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1705
2019-06-19 14:41:58 -04:00
Robert Maynard
33d4f6958f Merge branch 'upstream-lodepng' into add_lodepng_thirdparty
* upstream-lodepng:
  lodepng 2019-06-16 (430268ba)
2019-06-19 14:40:00 -04:00
LodePNG Upstream
a2a90a8bf8 lodepng 2019-06-16 (430268ba)
Code extracted from:

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

at commit 430268baa882a707c36b356402b94ab14dc08b69 (for/vtk-m).
2019-06-19 14:40:00 -04:00
Robert Maynard
23aeff054e vtkm_rendering now uses vtkm/thirdparty/lodepng
Previously it used a version of the decode routines from lodepng
inside the decode functionality.
2019-06-19 14:39:46 -04:00
Robert Maynard
8153246381 Add lodepng as a vtk-m thirdparty library. 2019-06-19 14:39:46 -04:00
Robert Maynard
5e534205d3 Merge topic 'simplify_timer_logic'
8d4611387 Simplify Timer now that RuntimeDeviceTracker handles 'any' device.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Haocheng LIU <haocheng.liu@kitware.com>
Merge-request: !1707
2019-06-19 12:54:46 -04:00
Robert Maynard
8d4611387a Simplify Timer now that RuntimeDeviceTracker handles 'any' device. 2019-06-19 10:50:44 -04:00
Robert Maynard
75cb4d1a64 Merge topic 'correct_linking_when_logging_enabled'
171fdffd0 Make sure vtkm_cont links to vtkm_loguru when logging enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1706
2019-06-19 10:41:54 -04:00
Robert Maynard
171fdffd0e Make sure vtkm_cont links to vtkm_loguru when logging enabled 2019-06-19 09:52:43 -04:00
Robert Maynard
512d0431ec Cell and Point locators have correct export visibility
UBSAN found that these execution object had mixed visibility
causing undefined behavior when casting across DSO's.
2019-06-19 08:36:19 -04:00
Robert Maynard
c7f8275818 Correct signed to unsigned warning conversion found by clang-8 2019-06-19 08:36:19 -04:00
Robert Maynard
c287978455 Gradient's ComputeDivergence is now properly initialized
UBSAN detected that the value wasn't properly initialized causing
reading from it to be undefined behavior.
2019-06-19 08:36:19 -04:00
Robert Maynard
e8f3b1233d Merge topic 'correct_undefined_behavior_in_TaskTiling'
3c85f7f40 Correct undefined behavior from missing export on ErrorMessageBuffer
e298e05bc Test will now fail if programs such as UBSAN output "runtime error"
feb66f970 Make VTK-m use consistent symbol visibility for benchmarks
b43d61533 Make VTK-m use consistent symbol visibility for tests.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1699
2019-06-19 08:32:51 -04:00
Robert Maynard
6734ddcec2 Merge topic 'log_cuda_version_worklet_are_launched_with'
8aaf922aa Introduce a log level that details kernel launch parameters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1672
2019-06-19 08:32:27 -04:00