Commit Graph

6253 Commits

Author SHA1 Message Date
Robert Maynard
8d3310fe55 Merge topic 'namespace_lodepng'
46a1df6c1 DecodePNG uses the namespaced lodepng from thirdparty/
26e50065a Merge branch 'upstream-lodepng' into namespace_lodepng
43e0185b2 lodepng 2019-07-17 (82328a33)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <larsen30@llnl.gov>
Merge-request: !1728
2019-07-17 16:07:15 -04:00
Kenneth Moreland
79909ecf12 Merge topic 'add_mesh_quality'
b622c7962 Fixed index out of bounds error for the cell counts array
4d61066e9 Removed all modifications in the internal device adapter algorithm header files.
06ac9f721 Revised version of the original mesh quality merge request
e54001367 Added few lines of code missing from cuda device adapter header
3dd34d251 Added custom CopyIf function
417dbcea7 Removed all modifications in the internal device adapter algorithm header files.
50cb805ce Fixed cuda device adapter alg
8c070caa0 Added few lines of code missing from cuda device adapter header
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1714
2019-07-17 15:42:22 -04:00
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
b4662c5718 Merge topic 'find_mpi_is_required'
772e36ba0 When VTKm_ENABLE_MPI is enabled finding MPI is always required

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1727
2019-07-17 14:02:56 -04:00
Robert Maynard
0777025f2c Merge topic 'require_cmake_313_for_cuda'
6de7d07d2 VTK-m requires CMake 3.13 to compile CUDA

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1725
2019-07-17 11:23:27 -04:00
Allison Vacanti
c2772ad857 Merge topic 'unroll_omp_reduce'
41894a97b Unroll reduction loops for non-integral types on OpenMP.
e30cb0872 Fix OpenMP for gcc-9 backwards incompatibility.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1724
2019-07-17 09:50:41 -04:00
Hank
6b65f1e2dd Merge topic 'open_nonexistent_file'
2fc7cb02a remove unused variable
5064854a0 Add error message with bad file open

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1722
2019-07-16 17:42:34 -04:00
Robert Maynard
6de7d07d28 VTK-m requires CMake 3.13 to compile CUDA
This is to resolve issues related to FindThreads and CUDA
compilation.
2019-07-16 16:39:50 -04:00
Allison Vacanti
41894a97b3 Unroll reduction loops for non-integral types on OpenMP. 2019-07-16 14:47:41 -04:00
Allison Vacanti
e30cb08725 Fix OpenMP for gcc-9 backwards incompatibility.
For details, see

https://www.gnu.org/software/gcc/gcc-9/porting_to.html
2019-07-16 14:47:31 -04:00
Robert Maynard
772e36ba0c When VTKm_ENABLE_MPI is enabled finding MPI is always required
Previously we had logic where find_package(MPI) wasn't required
2019-07-16 14:33:26 -04:00
Hank Childs
2fc7cb02a3 remove unused variable 2019-07-16 10:58:40 -07: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
Hank Childs
5064854a0d Add error message with bad file open 2019-07-12 18:19:48 -07: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
Brent Lessley
b622c79625 Fixed index out of bounds error for the cell counts array 2019-07-04 15:34:26 -07:00
Brent Lessley
4d61066e9c Removed all modifications in the internal device adapter algorithm header files. 2019-07-03 11:12:19 -07: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
Brent Lessley
06ac9f7219 Revised version of the original mesh quality merge request 2019-07-02 22:35:54 -07:00
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