Commit Graph

6122 Commits

Author SHA1 Message Date
Robert Maynard
feb66f9703 Make VTK-m use consistent symbol visibility for benchmarks 2019-06-18 13:53:32 -04:00
Robert Maynard
b43d615334 Make VTK-m use consistent symbol visibility for tests. 2019-06-17 15:19:17 -04:00
Allison Vacanti
990b0241a3 Merge topic 'update_loguru'
1002c038e Merge branch 'upstream-loguru' into update_loguru
0624ac777 loguru 2019-03-21 (862ed46e)
331c2d569 Update to latest loguru for MSVC fixes.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1687
2019-06-13 13:10:05 -04:00
Robert Maynard
354b0843e8 Merge topic 'split_sharp_edge_assertion_issue_373'
a9e6a919d Correct a subtle difference in the SplitSharp multiple pass algorithm
0f61808da SplitSharpEdges worklet does more algorithm execution on the device.
20fa341a2 SplitSharpEdgesFilter test now checks against a structured dataset
99865f47d Update Wavelet worklet to support a runtime device adapter id

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1693
2019-06-13 10:54:40 -04:00
Robert Maynard
a9e6a919d5 Correct a subtle difference in the SplitSharp multiple pass algorithm
Fixes #373
The SplitSharp algorithm has two passes that have the same algorithm,
but does different work with the final computed state. The issue was
that in the original implementation the two algorithms differed slightly.
This refactors the code to have a single implementation of the algorithm,
to avoid this form of issue going forward.
2019-06-12 18:05:06 -04:00
Kenneth Moreland
c9ab3b626d Merge topic 'reader-use-logging'
fbbc18590 Use logging to output status of VTKDataSetReaderBase

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1689
2019-06-12 16:06:35 -04:00
Kenneth Moreland
2641f2fdd2 Merge topic 'test-equal-recursive-types'
2e0f4dd37 Fix floating point error in test
b766d9a92 Improve support of testing recursive types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1691
2019-06-12 12:44:52 -04:00
Kenneth Moreland
fbbc185901 Use logging to output status of VTKDataSetReaderBase
The original implementation predates the logging and so just outputted
error and warning messages to stderr. Changed these to the more
appropriate logging mechanism.
2019-06-12 09:40:54 -06:00
Allison Vacanti
2227178f3e Merge topic 'fix_type_name'
9e02635ea Fix type name in debug message.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1694
2019-06-12 10:10:33 -04:00
Allison Vacanti
1002c038e7 Merge branch 'upstream-loguru' into update_loguru
* upstream-loguru:
  loguru 2019-03-21 (862ed46e)
2019-06-12 10:08:02 -04:00
Loguru Upstream
0624ac7772 loguru 2019-03-21 (862ed46e)
Code extracted from:

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

at commit 862ed46e48cd58a9c82a076cfd99a9f14cc6e622 (for/vtk-m).
2019-06-12 10:08:01 -04:00
Allison Vacanti
331c2d5690 Update to latest loguru for MSVC fixes. 2019-06-12 10:07:51 -04:00
Allison Vacanti
9e02635ea9 Fix type name in debug message. 2019-06-12 09:56:25 -04:00
Robert Maynard
0f61808da9 SplitSharpEdges worklet does more algorithm execution on the device.
The construction of the point id mapping can be done on the device,
and not the host.
2019-06-12 09:22:24 -04:00
Robert Maynard
20fa341a2b SplitSharpEdgesFilter test now checks against a structured dataset 2019-06-12 09:22:24 -04:00
Robert Maynard
99865f47d1 Update Wavelet worklet to support a runtime device adapter id 2019-06-12 09:22:24 -04:00
Robert Maynard
b7dc1ddccc Merge topic 'remove_unused_private_field'
e7b08ffd2 Remove unused private field.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1692
2019-06-12 09:12:41 -04:00
Kenneth Moreland
2e0f4dd376 Fix floating point error in test
The UnitTestCudaArrayHandleFancy was failing because it was
was calling TestValue in a worklet and comparing that to
a value that was generated by calling TestValue on the host.
Because these were called on different architecture, it is
possible that they will not be bit-wise exact. Add a little
bit of tolerance to the check to avoid false failures for
this reason.
2019-06-11 15:57:12 -06:00
Nick Thompson
e7b08ffd2c Remove unused private field. 2019-06-11 17:47:43 -04:00
Kenneth Moreland
b766d9a92a Improve support of testing recursive types
Base templated types like Vec, Matrix, and Pair can now be recursively
nested and used in testing methods like test_equal and TryTypes.
2019-06-11 09:51:44 -06:00
Kenneth Moreland
ba25ba2781 Merge topic 'has-vec-traits'
053d5a059 Add HasVecTraits

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1690
2019-06-11 10:13:20 -04:00
Kenneth Moreland
1aa971a0a3 Merge topic 'bounds-matrix-vtkm-namespace'
a3783ef51 Move Bounds and Matrix operators to vtkm namespace

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1688
2019-06-11 09:50:31 -04:00
Kenneth Moreland
dfe2dacb31 Merge topic 'msvc-cuda-fixes'
e3cc3eecb Merge branch 'upstream-taotuple' into msvc-cuda-fixes
2fa0dc034 taotuple 2019-06-05 (990962ae)
f11702ae9 Fix for rogue definition of PASCAL macro
03ea0bab0 Use __pragma on MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1686
2019-06-11 09:50:01 -04:00
Kenneth Moreland
053d5a0591 Add HasVecTraits
HasVecTraits<T> is a template that will resolve to std::true_type if
VecTraits<T> is properly defined and std::false_type otherwise. This is
helpful when defining classes and methods that use VecTraits but you
still want them to compile if VecTraits does not exist.
2019-06-06 15:28:47 -06:00
Kenneth Moreland
a3783ef514 Move Bounds and Matrix operators to vtkm namespace
This helps with ADL lookup.
2019-06-06 12:48:30 -06:00
Kenneth Moreland
e3cc3eecb4 Merge branch 'upstream-taotuple' into msvc-cuda-fixes
* upstream-taotuple:
  taotuple 2019-06-05 (990962ae)
2019-06-05 12:02:44 -06:00
TaoCpp Tuple Upstream
2fa0dc0342 taotuple 2019-06-05 (990962ae)
Code extracted from:

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

at commit 990962ae6278efcd7f04ab1b40643a5da4395cf3 (for/vtk-m).
2019-06-05 12:02:43 -06:00
Kenneth Moreland
f11702ae92 Fix for rogue definition of PASCAL macro 2019-06-05 10:09:49 -06:00
Kenneth Moreland
03ea0bab0a Use __pragma on MSVC
All C++11 compilers support _Pragma to insert pragmas inline into code
and within macros. All compilers, that is, except for visual studio
because Microsoft has to be contrarian and make life miserable for all
programmers. Instead, you have to use __pragma with visual studio.
2019-06-05 10:04:56 -06:00
Robert Maynard
0bf3c7ffcb Merge topic 'github_pr_template'
ea404030c Provide github templates that redirect users to gitlab.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1685
2019-06-03 15:26:37 -04:00
Robert Maynard
22417b16f7 Merge topic 'remove_unneeded_methods_from_warp_filters'
b80a3789f Remove unneeded methods from warpscalar and warpvector filters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1684
2019-06-03 15:19:42 -04:00
Robert Maynard
ea404030cd Provide github templates that redirect users to gitlab.
Now that VTK-m is mirrored to github, we should provide templates
for users that redirects them to the primary repository.
2019-06-03 14:55:46 -04:00
Robert Maynard
b80a3789f0 Remove unneeded methods from warpscalar and warpvector filters 2019-06-03 13:53:31 -04:00
Dave Pugmire
d4fffe3f2b Merge topic 'add_polyLine'
401b12bd6 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add_polyLine
fea18190f Specialized cases for cell-edge functions on polylines.
d310ec3aa return type is void. Call vertex/line methods, then just return.
d6898b805 Fix cell deriv for polylines and remove print statements.
9157004ac Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add_polyLine
d6e2e9588 Remove debugging print statements.
b9d109ab3 Fix for CellEdgeFace test. Case is identical to polygon.
d7e793861 Fix compiler warnings. Comment out std::cout usage for testing with cuda.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1677
2019-05-31 16:53:07 -04:00
Robert Maynard
7b343fbc1d Merge topic 'update_to_support_thrust_1.9.6_release'
6775685c7 Update ThrustPatches to be aware of issues fixed in thrust 1.9.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1683
2019-05-31 16:06:53 -04:00
Robert Maynard
6775685c72 Update ThrustPatches to be aware of issues fixed in thrust 1.9.6 2019-05-31 10:08:47 -04:00
Matt Larsen
ae3687cb8f Merge topic 'ExtractStructured'
42a3602ed Had missed a few unused variables when fixing rebase issues.
63a4e696c vim retabed and removed trailing whitespaces form Unit Test
e0000f35f Should be working now
63165904c Merged with the pull (reword)
5cc1de297 Clearing out unused variables
c7bd79e78 Extract Structured with Offset
56598ebfa Maybe closer
5feadd166 Pushing for Abhishek (Don't merge)
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1644
2019-05-30 20:23:08 -04:00
Steven Walton
42a3602ed6 Had missed a few unused variables when fixing rebase issues. 2019-05-30 15:09:02 -07:00
Steven Walton
63a4e696cb vim retabed and removed trailing whitespaces form Unit Test 2019-05-30 12:52:29 -07:00
Steven Walton
e0000f35f5 Should be working now
Did a bad rebase to fix old commit message. Propagated merge conflicts
through so things got really confusing. Code looks to be back to normal
now though.
2019-05-30 12:48:20 -07:00
Steven Walton
63165904c2 Merged with the pull (reword) 2019-05-30 11:14:21 -07:00
Steven Walton
5cc1de2973 Clearing out unused variables 2019-05-30 11:13:46 -07:00
Steven Walton
c7bd79e789 Extract Structured with Offset
Added code for giving ExtractStructured an offset value. Unit tests
three different 3D cases and a 3D case.
2019-05-30 11:13:29 -07:00
Steven Walton
56598ebfa5 Maybe closer 2019-05-30 11:13:17 -07:00
Steven Walton
5feadd1661 Pushing for Abhishek (Don't merge) 2019-05-30 11:13:05 -07:00
Steven Walton
cf61a645ea Getting there with ES 2019-05-30 11:12:47 -07:00
Steven Walton
358d3cf683 Maybe right? 2019-05-30 11:12:26 -07:00
Steven Walton
779b60e9fd Merged and forgot to pull from do reformat 2019-05-30 11:11:08 -07:00
Robert Maynard
ae6999e534 Merge topic 'cmake_dont_presume_cuda_compiler_is_always_nvcc'
2a7ef3011 CMake: Don't presume the cuda compilers is always NVCC.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1682
2019-05-29 14:58:08 -04:00
Dave Pugmire
401b12bd6f Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add_polyLine 2019-05-29 12:59:14 -04:00