Commit Graph

6267 Commits

Author SHA1 Message Date
Brent Lessley
e540013679 Added few lines of code missing from cuda device adapter header 2019-07-02 22:35:54 -07:00
Brent Lessley
3dd34d251e Added custom CopyIf function 2019-07-02 22:35:54 -07:00
Brent Lessley
417dbcea7f Removed all modifications in the internal device adapter algorithm header files. 2019-07-02 22:35:54 -07:00
Brent Lessley
50cb805ceb Fixed cuda device adapter alg 2019-07-02 22:35:47 -07:00
Brent Lessley
8c070caa01 Added few lines of code missing from cuda device adapter header 2019-07-02 22:33:48 -07:00
Brent Lessley
e0f0e4d673 Added custom CopyIf function 2019-07-02 22:33:23 -07: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
Robert Maynard
41f0d4b7d1 Merge topic 'header_guards_for_all_cont_hxx_files'
9213038aa Make sure all vtkm/cont .hxx files have header guards

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1716
2019-07-02 16:11:05 -04:00
Dave Pugmire
fc0e1b703d Merge branch 'polyLinePathGeom' of gitlab.kitware.com:dpugmire/vtk-m into polyLinePathGeom 2019-07-02 14:35:40 -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
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
Dave Pugmire
ca34f73194 Merge branch 'polyLineExample' into 'polyLinePathGeom'
Tubes: Add example.

See merge request dpugmire/vtk-m!1
2019-06-27 16:40:41 -04:00
NAThompson
d8faed8480 Polyline examples: More intelligible comments. 2019-06-27 16:31:20 -04:00
NAThompson
cbd2dd60a7 Tubes: Add example. 2019-06-27 16:25:27 -04:00
Dave Pugmire
2e53de81fa Raise error when bad data are encountered. 2019-06-27 09:11:04 -04:00
Brent Lessley
d370674d2b Removed all modifications in the internal device adapter algorithm header files. 2019-06-27 01:35:00 -07:00
Brent Lessley
10da5e13e5 Merge remote-tracking branch 'vtkm/master' 2019-06-26 21:58:55 -07: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
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
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
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
Brent Lessley
7001563eda Resolved merge conflict with remote master 2019-06-25 23:18:13 -07: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
Dave Pugmire
4ff15790ed Add start/end capping and use triangles for cells. 2019-06-24 17:57:43 -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