Commit Graph

4692 Commits

Author SHA1 Message Date
Robert Maynard
ea50e82aac Move VTK-m CMake testing wrappers to the testing folder
The VTK-m testing infrastructure isn't public facing so it doesn't
need to be installed or clutter the main VTKmWrappers file.

At the same time I have refactored the code to make it clearer
to understand, and remove unused options.
2019-07-09 13:32:23 -04:00
Robert Maynard
e934e2273c vtkm_library WRAP_FOR_CUDA renamed to clarify the intent of the property
We want the option name to be clear that it might be applicable for
more than just CUDA. If VTK-m ever supported something like SYCL
it would not be clear that those sources should go in `WRAP_FOR_CUDA`.
2019-07-09 13:04:07 -04:00
Dave Pugmire
fc69b9c1bc Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into polyLinePathGeom 2019-07-03 10:47:13 -04:00
Dave Pugmire
b866b31f48 Fix cuda compile error. 2019-07-03 08:40:50 -04:00
Dave Pugmire
023e6bb625 Remove redundant code for computing w. 2019-07-02 18:53:32 -04:00
Dave Pugmire
e74a0800bd Move helper worklets from the detail namespace into the Tube class. 2019-07-02 16:49:48 -04:00
Dave Pugmire
2dad0301e3 Handle polylines with only 1 point. Add testing for linear polylines. 2019-07-02 14:34:37 -04:00
Robert Maynard
9213038aa2 Make sure all vtkm/cont .hxx files have header guards
Make it easier for consumer to only include hxx files a single
time.
2019-07-01 14:03:40 -04:00
Allison Vacanti
938a116dc2 Fix brace initialization of std::atomic for gcc 4.8. 2019-07-01 10:15:19 -04:00
Dave Pugmire
2e53de81fa Raise error when bad data are encountered. 2019-06-27 09:11:04 -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
Dave Pugmire
baf4f81753 fix compiler warning. 2019-06-26 16:42:50 -04:00
Dave Pugmire
725a222e6d Fix bug in FindValidSegment. 2019-06-26 13:52:59 -04:00
Dave Pugmire
1000ecb25b Fix cuda build issues. 2019-06-26 13:17:01 -04:00
Dave Pugmire
23c03f19ce Fix compiler warnings. 2019-06-26 10:23:13 -04:00
Dave Pugmire
9132e75ac8 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into polyLinePathGeom 2019-06-26 09:55:46 -04:00
Dave Pugmire
48d0606769 Add capping, unit tests and remove debugging info. 2019-06-26 09:51:06 -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
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
Dave Pugmire
4ff15790ed Add start/end capping and use triangles for cells. 2019-06-24 17:57:43 -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
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
Dave Pugmire
b348522d17 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into polyLinePathGeom 2019-06-21 09:46:45 -04:00
Dave Pugmire
92348e28fd Implementation for tube filter. 2019-06-21 09:45:37 -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
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
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
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
8d4611387a Simplify Timer now that RuntimeDeviceTracker handles 'any' device. 2019-06-19 10:50:44 -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