Commit Graph

4018 Commits

Author SHA1 Message Date
Kenneth Moreland
28d597d175 Re add example to bottom of README 2017-10-26 13:02:18 -06:00
Robert Maynard
040e280eb4 Merge topic 'singular_matrix_failure'
ba1c1b8e Work around more compiler optimization bugs with UnitTestMatrix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !986
2017-10-26 13:49:38 -04:00
Robert Maynard
ba1c1b8ebf Work around more compiler optimization bugs with UnitTestMatrix 2017-10-26 13:25:58 -04:00
Kenneth Moreland
31497ddf80 Merge topic 'update-coding-conventions'
0e3b06d3 Update coding conventions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !983
2017-10-26 13:14:24 -04:00
Kenneth Moreland
0e3b06d301 Update coding conventions
Reformat to look correct in 100 column display.

Update the copyright.

Remove and update some outdated specifications.

Remove description of formatting guidelines. There are done
automatically now.
2017-10-26 10:37:08 -06:00
Kenneth Moreland
d2caf44538 Update README and CONTRIBUTING
Removed some things from README that are better referenced in the
User's Guide. Updated some text. Reformatted things.
2017-10-26 10:30:45 -06:00
Matt Larsen
aeeb954fd0 correcting typo 2017-10-26 08:38:21 -07:00
Matt Larsen
46f58dffc6 fixing various warnings 2017-10-26 08:36:27 -07:00
Matt Larsen
14b7789fd6 fixing ambiguous min max call 2017-10-26 08:32:06 -07:00
Matt Larsen
450033110c Merge remote-tracking branch 'upstream/master' into support_2D_and_1D_plots 2017-10-26 08:10:50 -07:00
Matt Larsen
7325508093 removing debug statements 2017-10-26 08:01:00 -07:00
Matt Larsen
035814a4a7 adding 2d ortho support to ray tracing and updating WireFramer to support 2d lines and 1D line plots 2017-10-26 07:58:02 -07:00
Robert Maynard
fb894f56c4 ParticleAdvection GridEvaluators now work when vtkm::FloatDefault is double 2017-10-26 10:19:54 -04:00
Sujin Philip
1b24cf8d2c Merge topic 'fix-cell-locator'
5ada2812 Some fixes for CellLocatorTwoLevelUniformGrid

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !979
2017-10-25 11:45:28 -04:00
Li-Ta Lo
3acd7c37a1 Merge topic 'pointlocator'
ed3a64a5 Coding style improvment
7fa800b7 Update TestingPointLocatorUniformGrid.h
f1974cab Update TestingPointLocatorUniformGrid.h
508882fa PointLocatorUniformGrid

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !973
2017-10-25 10:42:07 -04:00
Kenneth Moreland
37d0100828 Merge topic 'correct-simple-unique'
7a2ef646 Correct the implementation of DeviceAdapterAlgorithmGeneral::Unique

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !982
2017-10-25 10:30:10 -04:00
Kenneth Moreland
b3fcc82d27 Merge topic 'scan-exclusive-by-key-type-mismatch'
e50ec6b6 Fix type error in ScanExclusiveByKey

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !981
2017-10-25 10:29:43 -04:00
Kenneth Moreland
f577591d9a Merge topic 'scan-exclusive-doc'
038e12e0 Document ScanExclusive algorithm

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !980
2017-10-25 10:29:16 -04:00
Kenneth Moreland
7a2ef6464a Correct the implementation of DeviceAdapterAlgorithmGeneral::Unique
The implementation of the simplified version of
DeviceAdapterAlgorithmGeneral::Unique had two errors.

First, the implementation is such that it calls the more complex version
of Unique (which specifies a binary predicate to establish equality).
However, it was not calling the Unique method in the DerivedAlgorithm
like it should have been. Instead, it was calling its own Unique
algorithm, which might not be as efficient as the specialized Unique for
the device.

Second, it was using std::equal_to as its binary predicate. Using
functors from std can be dangerous because they are not marked with
VTKM_EXEC, so have the potential to not work in the execution
environment. Instead, use the readily available vtkm::Equal binary
predicate.
2017-10-24 16:57:18 -06:00
Li-Ta Lo
ed3a64a512 Coding style improvment
Capitalize the first character of data members. Rename Run() to FindNearestPoint().
2017-10-24 18:26:01 -04:00
Kenneth Moreland
e50ec6b667 Fix type error in ScanExclusiveByKey
The implementation of ScanExclusiveByKey in
DeviceAdapterAlgorithmGeneral by shifting values in the input values
array and then calling ScanInclusiveByKey. However, the temporary
shifted values array was created using the key type instead of the
values type. This caused a compile error when the keys and values had
different types.
2017-10-24 16:12:30 -06:00
Allison Vacanti
ef6a3b8288 Merge topic 'cuda_hint_fixes'
5a99dd76 Only use cuda hints for CUDA 8.0+.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !978
2017-10-24 17:14:20 -04:00
Sujin Philip
5ada281293 Some fixes for CellLocatorTwoLevelUniformGrid
1. Fix incorrect computation of grid dimensions.
2. Add checks for empty bounding box of bins.
3. Workaround issues caused by floating point precision.
2017-10-24 16:30:45 -04:00
Kenneth Moreland
038e12e09f Document ScanExclusive algorithm
The documentation for one of the versions of ScanExclusive was
missing in doxygen.
2017-10-24 14:29:57 -06:00
Allison Vacanti
3e4778b07c Merge topic 'paraview_fixes'
e9633e1d Move some MSVC warning disablers to Configure.h
7fd7336a Don't version include directory under build tree.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !975
2017-10-24 13:35:07 -04:00
Allison Vacanti
5a99dd761b Only use cuda hints for CUDA 8.0+. 2017-10-24 11:55:07 -04:00
Kenneth Moreland
b5b56cd891 Merge topic 'update-gitsetup'
54b543c9 Merge branch 'upstream-GitSetup'
c93fc348 GitSetup 2017-10-23 (34f17af6)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !977
2017-10-23 18:21:07 -04:00
Kenneth Moreland
54b543c92e Merge branch 'upstream-GitSetup'
* upstream-GitSetup:
  GitSetup 2017-10-23 (34f17af6)
2017-10-23 15:35:29 -06:00
GitSetup Upstream
c93fc348e7 GitSetup 2017-10-23 (34f17af6)
Code extracted from:

    https://gitlab.kitware.com/utils/gitsetup.git

at commit 34f17af62ee67b907eee9504fc743637d2936507 (setup).
2017-10-23 15:35:29 -06:00
Allison Vacanti
e9633e1dea Move some MSVC warning disablers to Configure.h
These useless warnings are popping up in VTK/ParaView builds that use
VTKm. Moving them to a header so other projects will get them.
2017-10-23 15:16:49 -04:00
Allison Vacanti
7fd7336a5d Don't version include directory under build tree.
This is causing issues when building ParaView with VTK-m and VTK
kits enabled.
2017-10-23 15:16:49 -04:00
Allison Vacanti
ab10ff3bf2 Merge topic 'warning_fix'
40441e78 Fix some additional warnings.
a90afa5a Clean up warnings introduced by recent benchmark modifications.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !976
2017-10-23 13:29:01 -04:00
Allison Vacanti
40441e78e6 Fix some additional warnings. 2017-10-23 11:48:19 -04:00
Allison Vacanti
a90afa5abf Clean up warnings introduced by recent benchmark modifications. 2017-10-20 16:23:36 -04:00
Kenneth Moreland
31a518beac Merge topic 'version-tarball-in-git'
c6d23cad Fix VTK-m version for tarball in another git repository

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !974
2017-10-19 16:37:41 -04:00
Li-Ta Lo
7fa800b7f3 Update TestingPointLocatorUniformGrid.h 2017-10-19 16:04:55 -04:00
Li-Ta Lo
f1974cab5a Update TestingPointLocatorUniformGrid.h
Add a empty new line at the end of file.
2017-10-19 16:00:06 -04:00
Li-Ta Lo
508882fa21 PointLocatorUniformGrid
Provide an accelerated neareast neighbor search of points in the
dataset using a one layer uniform grid.
2017-10-19 11:44:36 -06:00
Kenneth Moreland
c6d23cadf0 Fix VTK-m version for tarball in another git repository
A ParaView user noted that the determine version script (which is
essentially the same for ParaView and VTK-m) incorrectly used the
results of git describe when the source actually came from a tarball
distribution that was placed in another git archive. (The SHA was
incorrectly taken from the enclosing git project.) See the ParaView bug
for more details on the report:

https://gitlab.kitware.com/paraview/paraview/issues/17761

This fix simply checks to make sure the the source directory has the
.git subdirectory expected in all git projects.
2017-10-19 11:41:30 -06:00
Allison Vacanti
546b2144b8 Merge topic 'copy_speed_benchmarks'
4cd79193 Ensure that Pair and Vec are trivial classes.
d465d030 Add benchmark to print copy speeds.
b582b079 Modify Benchmarker to expose samples and reduce iterations.
d0fa70de Reduce overhead and fix bugs in device adapter benchmarks.
05419719 Add more options to the device adapter algorithm benchmark.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !972
2017-10-18 15:42:50 -04:00
Allison Vacanti
4cd791932b Ensure that Pair and Vec are trivial classes.
For std::copy to optimize a copy to memcpy, the valuetype must be both
trivially constructable and trivially copyable.

The new copy benchmarks highlighted an issue that std::copy'ing pairs
and vecs were not optimized to memcpy. For a 256 MiB buffer on my
laptop w/ GCC, the serial copy speeds were:

UInt8:                 10.10 GiB/s
Vec<UInt8, 2>           3.12 GiB/s
Pair<UInt32, Float32>   6.92 GiB/s

After this patch, the optimization occurs and a bitwise copy occurs:

UInt8:                 10.12 GiB/s
Vec<UInt8, 2>           9.66 GiB/s
Pair<UInt32, Float32>   9.88 GiB/s

Check were also added to the Vec and Pair unit tests to ensure that
this classes continue to be trivial.

The ArrayHandleSwizzle test was refactored a bit to eliminate a new
'possibly uninitialized memory' warning introduced with the default
Vec ctors.
2017-10-18 14:58:35 -04:00
Allison Vacanti
d465d03047 Add benchmark to print copy speeds. 2017-10-18 10:53:30 -04:00
Allison Vacanti
b582b07983 Modify Benchmarker to expose samples and reduce iterations. 2017-10-18 10:42:50 -04:00
Allison Vacanti
d0fa70deb5 Reduce overhead and fix bugs in device adapter benchmarks. 2017-10-18 10:14:09 -04:00
Allison Vacanti
05419719d5 Add more options to the device adapter algorithm benchmark. 2017-10-17 16:21:17 -04:00
Sujin Philip
502787b1a0 Merge topic 'workaround-intel'
d6ce8000 Workaround an Intel compiler bug

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !970
2017-10-16 15:19:09 -04:00
Sujin Philip
d6ce8000f4 Workaround an Intel compiler bug
Fixes a linker error about not finding 'LinearBVH::ConstructOnDevice'
2017-10-16 12:17:04 -04:00
Sujin Philip
800bcf3124 Merge topic 'fix-intel-link-bug'
ecb99acb Workaround intel compiler bug

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !969
2017-10-12 16:46:33 -04:00
Sujin Philip
ecb99acb5e Workaround intel compiler bug
Fixes issue #179
2017-10-12 13:32:39 -04:00
Allison Vacanti
ae8d2f1ffa Merge topic 'serial_copy'
7b66dece Add equality operators that handle different handle types.
1653f20e Add missing typedef to portal.
6c2f22b5 Overcome narrowing warning on MSVC.
1018d981 Check for overlap in CopySubRange.
374321e0 Use std::copy in TBB copy routines.
825f351d Use std::copy in serial Copy implementation.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !967
2017-10-12 09:14:50 -04:00