Commit Graph

6223 Commits

Author SHA1 Message Date
Robert Maynard
46a1df6c18 DecodePNG uses the namespaced lodepng from thirdparty/ 2019-07-17 14:21:33 -04:00
Robert Maynard
26e50065ab Merge branch 'upstream-lodepng' into namespace_lodepng
* upstream-lodepng:
  lodepng 2019-07-17 (82328a33)
2019-07-17 14:21:13 -04:00
LodePNG Upstream
43e0185b2d lodepng 2019-07-17 (82328a33)
Code extracted from:

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

at commit 82328a339c20149365089c6b969be00a9166780b (for/vtk-m).
2019-07-17 14:21:13 -04:00
Robert Maynard
c80c1d09c0 Merge topic 'refactor_vtkm_buildsystem_to_provide_better_consumer_experience'
28484fc6a Update examples and benchmarks to use new VTK-m CMake helper function
ea50e82aa Move VTK-m CMake testing wrappers to the testing folder
0b7dd7c38 Add CMake vtkm_add_target_information() to make using vtk-m easier
e934e2273 vtkm_library WRAP_FOR_CUDA renamed to clarify the intent of the property
a2e6660fd Remove unused vtkm_compile_as_cuda CMake function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <larsen30@llnl.gov>
Merge-request: !1718
2019-07-16 08:46:22 -04:00
Li-Ta Lo
2c6061d37f Merge topic 'locate-points-on-boundary'
461f87dbc Fix issues with PointLocatorUniformGrid not finding all points
e473cb4bb Fix PointLocatorUniformGrid for points on boundary

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !1720
2019-07-11 10:48:49 -04:00
Robert Maynard
7fa94e53e2 Merge topic 'proper_vectorization_flags'
4a5ef8c6a VTKmCPUVectorization GCC native supports ppc64le
68a9167ab VTKmCPUVectorization now uses -march=<cpu_arch>
d0d678049 Correctly enable vectorization of avx512 when using gcc.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1719
2019-07-11 08:08:12 -04:00
Kenneth Moreland
461f87dbc8 Fix issues with PointLocatorUniformGrid not finding all points
There was a known issue where PointLocatorUniformGrid would quickly quit
once it found a point. Instead, look at one more level of bins just in
case there is a closer one near the boundary. (Still not guaranteed, but
likely.)

Also, fix a typo that caused some bins in the y and z direction to not
be searched.
2019-07-10 09:52:49 -06:00
Kenneth Moreland
e473cb4bbc Fix PointLocatorUniformGrid for points on boundary
When creating the search structures in PointLocatorUniformGrid, a point
outside the boundary would be given an invalid bin id. These points
could never be found. Generally, this is not a big deal for points
outside of the boundary, but it could be a problem for points on the
boundary. A point on the boundary could be taken as outside the
boundary. Since the boundary is chosen from limits of the points, some
will almost always be on the boundary.

Fix this problem by clamping all points to the nearest valid bin. This
could cause a problem if the user has selected a boundary excluding a
lot of points. All those points could be grouped to the same edge bins,
but that is probably not a great idea anyway.
2019-07-10 08:35:45 -06:00
Robert Maynard
28484fc6aa Update examples and benchmarks to use new VTK-m CMake helper function 2019-07-09 13:32:23 -04:00
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
0b7dd7c38e Add CMake vtkm_add_target_information() to make using vtk-m easier
The function allows consumers to modify an existing target to allow
for correct compilation with VTK-m.
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
Robert Maynard
a2e6660fdd Remove unused vtkm_compile_as_cuda CMake function 2019-07-09 13:04:07 -04:00
Robert Maynard
b25599cb2e Merge topic 'error_on_cuda_with_shared_libs'
65f169b31 VTK-m now will now error when mixing CUDA and shared builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1717
2019-07-09 13:03:28 -04:00
Robert Maynard
65f169b311 VTK-m now will now error when mixing CUDA and shared builds 2019-07-09 11:48:22 -04:00
Robert Maynard
4a5ef8c6ad VTKmCPUVectorization GCC native supports ppc64le
The PowerPC front end uses mcpu instead of march.
2019-07-09 11:45:54 -04:00
Robert Maynard
68a9167ab2 VTKmCPUVectorization now uses -march=<cpu_arch>
The cpu architectures mode to -march is a better approach as it
maps to a more complete side of optimization flags. This makes
it easier going forward for VTK-m to support new CPU ISA's.
2019-07-09 11:36:46 -04:00
Robert Maynard
d0d6780490 Correctly enable vectorization of avx512 when using gcc.
The previous logic would incorrectly capture all GCC versions
as only have avx and avx2.
2019-07-09 09:35:00 -04:00
Dave Pugmire
5a80d7042e Merge topic 'polyLinePathGeom'
fc69b9c1b Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into polyLinePathGeom
b866b31f4 Fix cuda compile error.
023e6bb62 Remove redundant code for computing w.
e74a0800b Move helper worklets from the detail namespace into the Tube class.
fc0e1b703 Merge branch 'polyLinePathGeom' of gitlab.kitware.com:dpugmire/vtk-m into polyLinePathGeom
2dad0301e Handle polylines with only 1 point. Add testing for linear polylines.
ca34f7319 Merge branch 'polyLineExample' into 'polyLinePathGeom'
d8faed848 Polyline examples: More intelligible comments.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1710
2019-07-03 12:48:01 -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
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
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
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