Commit Graph

5375 Commits

Author SHA1 Message Date
ayenpure
977d0cdb20 Removing redundant code line 2018-12-19 20:02:08 +05:30
ayenpure
33a04c34c3 Fixing variable name according to standard 2018-12-19 10:51:16 +05:30
ayenpure
2b4801239e Moving ClipTables
moving ClipTables from vtkm/worklet/internal to vtkm/worklet/clip
2018-12-18 09:57:00 +05:30
ayenpure
d1d495d435 Fixing warnings 2018-12-08 14:41:59 +05:30
ayenpure
e340cdf88c Fixing warnings 2018-12-08 14:17:28 +05:30
ayenpure
d0cf80bddd Updating tests for the new Clip tables 2018-12-08 11:57:34 +05:30
ayenpure
831914f318 Fising warnings 2018-12-08 08:14:05 +05:30
ayenpure
1ca02af988 Removing whitespaces 2018-12-07 23:33:08 +05:30
ayenpure
f72299c948 Resolving warnings from last iteration 2018-12-07 23:28:31 +05:30
ayenpure
cab80e8e3f Adding Clip files 2018-12-07 20:39:21 +05:30
Kenneth Moreland
1766f213ea Merge topic 'dynamic-neighborhood-size'
82536092c Rename boundary classes
e008aff27 Change neighborhood parameter from layer to radius
7f627380b Fix Marching Cubes regression test
01a9e8541 Change WorkletPointNeighborhood to specify neighborhood at runtime

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1457
2018-12-04 16:02:46 -05:00
Sujin Philip
4169ff7dc2 Merge topic 'implement-extents-v2'
6d81bc8b0 Implement extents support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1472
2018-12-04 09:40:32 -05:00
Sujin Philip
6d81bc8b06 Implement extents support
Adds a variable `GlobalPointIndexStart` to `CellSetStructured`.
Adding this to the cell-set, instead of the coordinate system, enables this
feature for different types of datasets like uniform grid, rectilinear, etc.,
with this one change.
The extents can be computed using `GlobalPointIndexStart` and `PointDimensions`.
2018-12-03 15:56:45 -05:00
Kenneth Moreland
82536092cc Rename boundary classes
Did a bit of renaming of the support classes used for
WorkletPointNeighborhood. First, the OnBoundary tag is changed to
Boundary to match other tags and reflect some changes in the resulting
methods. Also moved the BoundaryState and Neighborhood classes from
vtkm::exec::arg to vtkm::exec to be more accessible. Finally, the
Neighborhood class name was changed to FieldNeighborhood to be more
specific on what role this class plays with neighborhood.
2018-12-03 12:45:23 -07:00
Kenneth Moreland
e008aff27b Change neighborhood parameter from layer to radius
It was determined that the word "radius" more clearly described how the
size of the neighborhood is determined.
2018-12-03 12:45:23 -07:00
Kenneth Moreland
7f627380b6 Fix Marching Cubes regression test
Turns out there was a bug in the way Marching Cubes computed gradients
on a structured grid. A recent change to Boundary also had a similar bug
that ended in the same behavior. The recent changes to BoundaryState
fixed the problem, but caused the Marching Cubes test to fail because it
was comparing against bad gradient values.

This change fixes the array of gradient values. I'm pretty sure these
are correct since I generated them with ParaView (using a completely
separate implementation).
2018-12-03 12:45:23 -07:00
Kenneth Moreland
01a9e85416 Change WorkletPointNeighborhood to specify neighborhood at runtime
Previously, WorkletPointNeighborhood had a template argument to select
the size of the neighborhood. This change removes that template
argument. Instead, the vtkm::exec::arg::BoundaryState methods now take
in a size parameter when determining when it overlaps the boundary.

If in the future we want to add the ability to select the neighborhood
size at compile-time (for performance reasons), I suggest adding this
template argument to the OnBoundary tag for ExecutionSignature.
2018-12-03 12:45:23 -07:00
Matt Larsen
bc13764228 Merge topic 'fix/ray_start'
361c5695b adjusing ray start

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1471
2018-12-02 22:46:43 -05:00
larsen30@llnl.gov
361c5695bc adjusing ray start 2018-12-02 19:14:27 -08:00
Haocheng LIU
7055372955 Merge topic 'add-dynamic-analysis-setups'
b5e618c98 DynamicAnalysis: Blacklist third party modules and libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1469
2018-11-30 14:43:53 -05:00
Haocheng LIU
b5e618c980 DynamicAnalysis: Blacklist third party modules and libraries
For use with sanitizer builds.
2018-11-30 13:46:01 -05:00
Haocheng LIU
73659c2900 Merge topic 'remove-an-autosave-file'
deeb9c418 Remove a mis-added autossave file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1468
2018-11-30 08:41:35 -05:00
Haocheng LIU
deeb9c4183 Remove a mis-added autossave file 2018-11-30 08:40:10 -05:00
Haocheng LIU
501aa6f534 Merge topic 'rename-worklet-testing-executable'
0d39806f4 Rename worklet testing executable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1467
2018-11-29 16:00:31 -05:00
Haocheng LIU
0d39806f4f Rename worklet testing executable
Now it's in accordance with vtkm testing name convension as
UnitTests_vtkm_worklet_testing.
2018-11-29 15:51:41 -05:00
Ben Boeckel
d200b2501c Merge topic 'vtkmtargets-location'
867aa9438 cmake: place VTKmTargets.cmake beside VTKmConfig.cmake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1466
2018-11-28 18:26:37 -05:00
Ben Boeckel
867aa9438b cmake: place VTKmTargets.cmake beside VTKmConfig.cmake 2018-11-28 17:24:25 -05:00
Kenneth Moreland
0725bd4578 Merge topic 'average-by-key-warning'
6ebc3ea76 Fix potential warning in AverageByKey

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1463
2018-11-27 17:53:20 -05:00
Kenneth Moreland
3a7b9d84e1 Merge topic 'fix-cosmo-tools-examples'
e9d0d7de4 Fix the CosmoTools examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Haocheng LIU <haocheng.liu@kitware.com>
Merge-request: !1462
2018-11-27 16:43:51 -05:00
Haocheng LIU
412fe9bbb5 Merge topic 'Fix-logic-flaw-vtkm_unit_tests'
9d330cb54 Fix a logic flaw in vtkm_unit_tests function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1464
2018-11-27 15:11:19 -05:00
Haocheng LIU
9d330cb541 Fix a logic flaw in vtkm_unit_tests function
This commit fixes a logic flaw that will wrongly append `--device=`
to tests that does not specified devices.
2018-11-27 14:31:32 -05:00
Haocheng LIU
0a4b74b78b Merge topic 'fix-missing-symbol-dladdr'
9bd30571f Fix link errors for vtkm_cont when logging is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1461
2018-11-27 14:28:54 -05:00
Kenneth Moreland
e9d0d7de47 Fix the CosmoTools examples
The CosmoTools examples were still directly using device adapters.
Change the code to compile single executables that chooses a device at
runtime.
2018-11-27 10:56:00 -07:00
Haocheng LIU
9bd30571f5 Fix link errors for vtkm_cont when logging is enabled 2018-11-27 11:37:51 -05:00
Kenneth Moreland
6ebc3ea761 Fix potential warning in AverageByKey
To get the average, we (of course) divide the sum by the amount of
values, which is returned from valuesIn.GetNumberOfComponents(). To do
this, we need to cast the number of components (returned as a
vtkm::IdComponent) to a FieldType. This is a little more complex than it
first seems because FieldType might be a Vec type. If you just try a
static_cast<FieldType>(), it will use the constructor to FieldType which
might be a Vec constructor expecting the type of the component. This in
turn could cause a warning because the vtkm::IdComponent is implicitly
converted to the Vec's component type.

Get around this problem by first casting to the component type of the
field and then constructing a field value from that.
2018-11-27 09:31:23 -07:00
Haocheng LIU
e88e3ec39c Merge topic 'Merge-worklet-testing-executables'
885963667 Merge worklet testing executables into a device dependent shared library
88bcd0696 Bump Mean C++ Option Parser

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1432
2018-11-26 13:37:45 -05:00
Robert Maynard
a8da749e71 Release VTK-m 1.3.0
1.3.0 is our fourth official release of VTK-m.
The major changes to VTK-m from 1.2.0 can be found in:
  docs/changelog/1.3/release-notes.md
v1.3.0
2018-11-26 11:12:44 -05:00
Robert Maynard
81ac877163 Merge branch 'release_notes_1.3.0' 2018-11-26 11:11:51 -05:00
Robert Maynard
5712719538 Add release notes for v1.3.0 2018-11-26 11:11:10 -05:00
Haocheng LIU
8859636672 Merge worklet testing executables into a device dependent shared library
VTK-m has been updated to replace old per device worklet testing executables with a device
dependent shared library so that it's able to accept a device adapter
at runtime.
Meanwhile, it updates the testing infrastructure APIs. vtkm::cont::testing::Run
function would call ForceDevice when needed and if users need the device
adapter info at runtime, RunOnDevice function would pass the adapter into the functor.

Optional Parser is bumped from 1.3 to 1.7.
2018-11-23 10:13:56 -05:00
Haocheng LIU
88bcd06964 Bump Mean C++ Option Parser
This MR bumps the version from 1.3 to 1.7 to absorb MSC compiler
fixes and const-correctness.
2018-11-23 10:13:56 -05:00
Robert Maynard
b6b123e985 Merge topic '32bit_float_warnings'
b922851bf Correct rendering warning of a 64bit to 32bit conversion

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1458
2018-11-20 13:54:53 -05:00
Robert Maynard
c2cde4fae6 Merge topic 'findtbb_more_robust'
ad433780f Properly handle FindTBB modules that don't contain TBB_LIBRARY_RELEASE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1459
2018-11-19 16:27:03 -05:00
Robert Maynard
ad433780f0 Properly handle FindTBB modules that don't contain TBB_LIBRARY_RELEASE
The FindTBB modules that come with packages such as OSPRay don't
provide TBB_LIBRARY_RELEASE but instead only provide TBB_LIBRARY.
If TBB_LIBRARY_RELEASE isn't found, and TBB_LIBRARY is we will use
that as the release library
2018-11-19 15:50:38 -05:00
Robert Maynard
b922851bf2 Correct rendering warning of a 64bit to 32bit conversion 2018-11-19 14:20:45 -05:00
Robert Maynard
6fa6b6e8bf Merge topic 'msvc_compile_lang'
dfa9f6443 MSVC now supports the COMPILE_LANGUAGE generator expression.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Haocheng LIU <haocheng.liu@kitware.com>
Merge-request: !1455
2018-11-16 13:02:22 -05:00
Kenneth Moreland
6002b1c1b5 Merge topic 'more-precise-boundary-state'
3e3baad6f Add better queries to vtkm::exec::arg::BoundaryState

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1456
2018-11-14 18:17:36 -05:00
Kenneth Moreland
721d789c21 Merge topic 'color-table-presets'
33db6655f Make the building of static color table presets is thread safe
8984e74e8 Hold preset information in simple struct
70e10459c Update presets for ColorTable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1449
2018-11-14 18:15:51 -05:00
Kenneth Moreland
33db6655fc Make the building of static color table presets is thread safe
If multiple threads call a function with a static function
simultaneously for the first time, C++ does not guarantee that the
static member will be constructed correctly. Make sure that it happens
correctly.
2018-11-14 09:19:07 -06:00
Kenneth Moreland
3e3baad6f8 Add better queries to vtkm::exec::arg::BoundaryState
Previously, vtkm::exec::arg::BoundaryState only provided methods that
said whether or not the neighborhood extened past the boundary of a
mesh. That is fine for a 3x3x3 neighborhood, which can only extend over
the boundary by one. However, that is problematic for larger
neighborhoods where you may need to know how far neighborhood extends
over the boundary.

This changes allows you to query how far the neighborhood extends within
the constrains of the boundary.
2018-11-13 22:45:06 -06:00