Commit Graph

7025 Commits

Author SHA1 Message Date
Sujin Philip
f7dced892f Merge branch 'upstream-lcl' into update-vtkc-to-lcl
* upstream-lcl:
  lcl 2019-10-07 (49094fec)
2019-10-07 15:37:55 -04:00
Sujin Philip
d0c6d16123 Add update script for LCL 2019-10-07 15:37:34 -04:00
Allison Vacanti
a7cf02129c Merge topic 'fix_unused_warning'
1081be53b Fix unused argument warning.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1883
2019-10-07 14:22:20 -04:00
Allison Vacanti
1081be53bc Fix unused argument warning.
typeid doesn't use the object, just the type.
2019-10-07 13:48:45 -04:00
Kenneth Moreland
be03d1c2b5 Merge topic 'xcode-9-issues'
c0744dbb4 Fix compile error for Xcode 9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1880
2019-10-04 18:19:17 -04:00
Allison Vacanti
9172eb996c Merge topic 'default_init_fix'
62ffa73cd Workaround issue with older C++.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1881
2019-10-04 15:33:22 -04:00
Allison Vacanti
62ffa73cdd Workaround issue with older C++.
Error: https://open.cdash.org/viewBuildError.php?buildid=6143613
Defect: http://open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#253
2019-10-04 15:16:30 -04:00
Kenneth Moreland
c0744dbb49 Fix compile error for Xcode 9
The older Xcode 9 compiler has troubles with ArrayHandleDecorator that
are similar to those of earlier Microsoft and Cuda compilers.

Note that the logic behind the changed compiler check has a lot of
guesswork involved. I noticed this problem on a laptop with Xcode 9
installed. However, even though Xcode uses the clang compiler, it
notoriously does not return the actual clang version. Instead, it
returns some toolchain version that has nothing to do with it. I'm
pretty sure Xcode 9 is using clang version 4 under the covers, but
__clang_major__ reports 9. Oddly, Xcode 10 reports __clang_major__ as 8,
so that's not too much help. So instead, we check for
__apple_build_version__, which returns the Xcode version (sort of) and
that seems a reasonable comparison.

Although I have not tried it, I'm willing to bet that the older clang
outside of Xcode will also have issues. Here is where the real guesswork
takes place since I don't have handy compilers to try. Like I said, I
think the internet claims that Xcode 9 is using clang 4, so also add to
the check any compiler that reports itself clang 4 or below.
2019-10-04 11:32:07 -06:00
Dave Pugmire
9e486e075b Fix for smallStep in integrator. 2019-10-04 08:59:28 -04:00
Nickolas Davis
ff23ab8305 Merge topic 'fix-mesh-examples'
a2641282d update MeshQuality examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Hank <hank@uoregon.edu>
Merge-request: !1866
2019-10-02 11:52:12 -04:00
nadavi
a2641282d2 update MeshQuality examples 2019-10-02 09:49:46 -06:00
Robert Maynard
308552bd62 Merge topic 'improve_connectivity_worklet_perf'
973878b8b Improve the performance of the Image and Graph Connectivity algorithms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !1873
2019-10-02 11:41:57 -04:00
Kenneth Moreland
e9c5bcb7d1 Merge topic 'device-log-level'
8c5b76f76 Remove invalid device argument for unit tests
2ca37707e Update logging for enabled devices

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1877
2019-10-02 11:30:04 -04:00
Kenneth Moreland
8c5b76f761 Remove invalid device argument for unit tests
Previously, the vtkm_unit_tests CMake function added a "NONE" argument
to the test when no device was specified. However, the correct thing to
do is to add no argument. Fixed this so that strict parsing of the test
arguments works.
2019-10-02 07:12:29 -06:00
Robert Maynard
973878b8ba Improve the performance of the Image and Graph Connectivity algorithms
The collection of connectivity algorithms had a couple of inefficiencies.
By moving to using WorkId we can remove a couple of arrays of the same size
as the input domain. In addition by moving to using atomics we can remove
an bool output array with a size equivalent to the input domain and
a call to reduce.
2019-10-02 08:25:10 -04:00
Robert Maynard
46212490b1 Merge topic 'CellSetConnectivity_filter_correct_inheritance'
25fb666df CellSetConnectivity now inherits from FilterDataSet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !1870
2019-10-01 15:44:05 -04:00
Dave Pugmire
ec89b43c6c update unit tests 2019-10-01 13:56:08 -04:00
Dave Pugmire
6e9ab1ce5d Unit tests for AOS particle advection. 2019-10-01 13:33:12 -04:00
Allison Vacanti
43e2b5498d Merge topic '408_CSExplicit_Refactor'
3886b7dfb Refactor CellSetExplicit to remove NumIndices.
b2daec0e3 Stick with brigand sequences for CUDA device passes.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1874
2019-10-01 09:43:33 -04:00
Kenneth Moreland
2ca37707e0 Update logging for enabled devices
The previous implementation of `RuntimeDeviceTracker` occasionally
outputted a log at level `Info` about devices being enabled or disabled.
The problem was that the information given was inconsistent (so it would
sometimes announce one change but not announce a different corrective
change). This could cause weird confusions. For example, when you used a
`ColorTable`, it would use a `ScopedRuntimeDeviceTracker` to temporarily
force the device to `Serial`. The log will just tell you that the device
was forced to `Serial` but never tell you that the devices where
restored to include actual parallel devices.

This change helps correct these with the following changes:

* Added a new log level, `DevicesEnabled`, that is a higher level than
  `Info`. All logging from `RuntimeDeviceTracker` goes to this log
  level.
* Change the logging output of `RuntimeDeviceTracker` to output a list
  of currently enabled devices whenever a change happens. That way you
  don't have to guess what happend for each change.
* Change `ScopedRuntimeDeviceTracker` to log whenever the scope is
  entered or left.
2019-09-30 14:07:24 -06:00
Allison Vacanti
3886b7dfb8 Refactor CellSetExplicit to remove NumIndices.
See #408 for details.
2019-09-30 12:27:13 -04:00
Robert Maynard
0ca6023650 Merge topic 'mask_supported_by_invoker'
445e4d818 vtkm::cont::Invoker supports both Masks and Scatter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1876
2019-09-30 12:03:31 -04:00
Robert Maynard
25fb666df9 CellSetConnectivity now inherits from FilterDataSet
Fixes #409
2019-09-30 08:50:40 -04:00
Hank
fb4036e400 Merge topic 'relative-size-foundations'
9b46a0f02 fix cast warning
8a175e045 fix warning about cast
440c15ea9 explicitly add header; addresses nasty issue due to robot autoformat
c3fd04c49 remove trailing whitespace
3abfea053 remove unneeded comments
dade683ea Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into relative-size-foundations
dd57d2023 incorporate Steven's RSS fix
1e4e60f5a Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into relative-size-foundations
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1875
2019-09-29 16:02:47 -04:00
Hank Childs
9b46a0f026 fix cast warning 2019-09-29 12:03:15 -07:00
Hank Childs
8a175e0455 fix warning about cast 2019-09-29 11:34:39 -07:00
Robert Maynard
445e4d8186 vtkm::cont::Invoker supports both Masks and Scatter
Fixes #420
2019-09-27 17:11:18 -04:00
Allison Vacanti
b2daec0e35 Stick with brigand sequences for CUDA device passes.
The tao ones won't compile otherwise. This should be okay, since these
are all just compile time helpers on host-only functions -- they won't
generate different sized data structures etc if we mix them in the
same build.
2019-09-27 17:02:19 -04:00
Hank Childs
440c15ea97 explicitly add header; addresses nasty issue due to robot autoformat 2019-09-27 13:23:20 -07:00
Hank Childs
c3fd04c498 remove trailing whitespace 2019-09-27 12:42:10 -07:00
Hank Childs
3abfea0532 remove unneeded comments 2019-09-27 12:36:53 -07:00
Hank Childs
dade683eab Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into relative-size-foundations 2019-09-27 12:34:26 -07:00
Kenneth Moreland
3fddadb9a2 Merge topic 'mesh-quality-fixes'
476800fe4 Have MeshQuality use the superclass' SetOutputFieldName
216335ab4 Have MeshQuality inherit from FilterField instead of FilterCell

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Hank <hank@uoregon.edu>
Merge-request: !1872
2019-09-27 14:16:25 -04:00
Hank Childs
dd57d20231 incorporate Steven's RSS fix 2019-09-27 07:57:20 -07:00
Hank Childs
1e4e60f5ab Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into relative-size-foundations 2019-09-27 07:30:46 -07:00
Kenneth Moreland
476800fe48 Have MeshQuality use the superclass' SetOutputFieldName
Previously MeshQuality defined its own SetOutputName method which broke
convention as was confusing. Deleted the output name defined in
MeshQuality and instead use the one defined in the superclass.
2019-09-26 19:28:13 -06:00
Kenneth Moreland
216335ab41 Have MeshQuality inherit from FilterField instead of FilterCell
FilterCell is a depricated type and will be removed at some point. It
serves no purpose over FilterField.
2019-09-26 19:23:28 -06:00
Hank Childs
38c00e0571 incorporate Steven changes 2019-09-26 17:20:01 -07:00
Kenneth Moreland
69220e85bd Merge topic 'vtk-reader-eof-issues'
82a58c2f0 Fix error with whitespace at end of file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1867
2019-09-26 11:41:08 -04:00
Hank Childs
8a916ef546 fix mistake with volume 2019-09-25 16:52:59 -07:00
Hank Childs
9084b6dcbe infrastructure for rss 2019-09-25 16:46:39 -07:00
Kenneth Moreland
82a58c2f0a Fix error with whitespace at end of file
The VTK file reader caused an error to be thrown when reading a file
that had a METADATA section at the end of the file. The problem was that
the METADATA section had some whitespace after its last line (which is
probably typical). This caused an eof check to pass and then a
subsequent search for a token to fail.

The solution was to eat the whitespace after the METADATA section to get
the reader at the next token or in eof condition if it is at the end of
the file.
2019-09-25 16:20:20 -06:00
Brad King
9a906e4cbf Merge topic 'use-vtkc'
e08d862f9 Use Light-Weight Cell Library
e56b34fc9 Merge branch 'upstream-vtkc' into use-vtkc
e909edd61 vtkc 2019-09-24 (cdc72582)
2a6aadc69 Add update file for VTK-c

Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1852
2019-09-25 09:21:00 -04:00
Hank
3640ee86b8 Merge topic 'add-16-cell-metrics'
e106dc6bf changes from peer review
f4229c2e9 change variable half to be hhalf to prevent collision with NVIDIA global var
c75fdeef6 massage float/double cast issue
fcc169fdf finish copying over changes from failed firs git
8af25aca4 move cellmetrics to worklet
338b87d9f Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add-16-cell-metrics

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Acked-by: Abhishek Yenpure <abhishek@uoregon.edu>
Merge-request: !1865
2019-09-24 21:50:10 -04:00
Sujin Philip
e08d862f94 Use Light-Weight Cell Library 2019-09-24 21:22:10 -04:00
Sujin Philip
e56b34fc98 Merge branch 'upstream-vtkc' into use-vtkc
* upstream-vtkc:
  vtkc 2019-09-24 (cdc72582)
2019-09-24 21:21:40 -04:00
VTK-c Upstream
e909edd61d vtkc 2019-09-24 (cdc72582)
Code extracted from:

    https://gitlab.kitware.com/sujin.philip/vtk-c.git

at commit cdc72582dae24cc66b3525961e32edbc2a395341 (master).
2019-09-24 21:21:40 -04:00
Hank Childs
e106dc6bff changes from peer review 2019-09-24 18:12:52 -07:00
Hank Childs
f4229c2e9d change variable half to be hhalf to prevent collision with NVIDIA global var 2019-09-23 23:35:03 -07:00
Hank Childs
c75fdeef6a massage float/double cast issue 2019-09-23 23:26:12 -07:00