Commit Graph

5543 Commits

Author SHA1 Message Date
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
Robert Maynard
dfa9f64436 MSVC now supports the COMPILE_LANGUAGE generator expression. 2018-11-12 15:16:13 -05:00
Kenneth Moreland
8984e74e8c Hold preset information in simple struct
Creating all the presets as vtkm::cont::ColorTable objects and passing
them back was problematic. It caused state to be shared and caused
issues when deallocating after the device deallocation methods were
finalized. Instead, make a simple struct and build new color tables on
the fly.
2018-11-11 17:30:11 -07:00
Kenneth Moreland
70e10459c7 Update presets for ColorTable
The ParaView project went through a rigourous selection process
for a short list of color tables. Let's replicate that for our
presets.
2018-11-09 09:02:10 -07:00
Dave Pugmire
8497febfda Merge topic 'ghost_cell_rectilinear'
1e9c7b3c2 Add tests for rectilinear and explicit datasets. Remove a commented-out line.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1453
2018-11-08 10:14:25 -05:00
Dave Pugmire
1e9c7b3c2a Add tests for rectilinear and explicit datasets. Remove a commented-out line. 2018-11-06 16:39:56 -05:00
Robert Maynard
759f78a96b Merge topic 'simplify_field_constructors'
dadfeab00 Simplify vtkm::cont::Field by using delegating constructors.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1452
2018-11-05 08:16:25 -05:00
Robert Maynard
dadfeab00a Simplify vtkm::cont::Field by using delegating constructors. 2018-11-02 14:18:09 -04:00
Haocheng LIU
e178b8c4cd Merge topic 'change-RuntimeDeviceInformation-template-independent'
bb0671780 Make RuntimeDeviceInformation class template independent

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1446
2018-11-02 10:20:36 -04:00
Kenneth Moreland
67c9af91a9 Merge topic 'policies-for-auxiliary-fields'
86a747a11 Add ability to customize filter policy to auxiliary input fields

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1442
2018-11-01 20:04:01 -04:00
Haocheng LIU
bb06717803 Make RuntimeDeviceInformation class template independent
By making RuntimeDeviceInformation class template independent, vtkm is
able to detect
device info at runtime with a runtime specified deviceId. In the past
it's impossible
because the CRTP pattern does not allow function overloading(compiler
would complain
that DeviceAdapterRuntimeDetector does not have Exists() function
defined).
2018-11-01 14:55:33 -04:00
Matt Larsen
5af6ecd67c Merge topic 'install_color_table'
2d782ff7d removing some entries from test build exclusion (colors)
2addf9393 removing color conversion files from test build
e5d03852b add subdirectory for colorconversion

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1451
2018-11-01 13:41:27 -04:00
mclarsen
2d782ff7d0 removing some entries from test build exclusion (colors) 2018-11-01 09:45:57 -07:00
mclarsen
2addf93938 removing color conversion files from test build 2018-11-01 09:36:19 -07:00
mclarsen
e5d03852b1 add subdirectory for colorconversion 2018-11-01 09:25:10 -07:00
Kenneth Moreland
86a747a117 Add ability to customize filter policy to auxiliary input fields
The field infrastructure has a "trait" that specifies the valid types
for the default active scalar field. Most filters have at most one input
field. The majority of the remaining filters use the same types for
inputs. There are some examples, however, where some auxiliary fields
use different types. This change adds a second template parameter to
FieldTraits to customize the valid types of the input scalar field to
different fields.

These changes are in anticipation of the removal of list specifier tags
on worklet ControlSignature arguments.
2018-10-31 23:51:36 +01:00
Robert Maynard
5ded6352fe Merge topic 'install_colortable_hxx'
154b65f47 Install vtkm/cont/ColorTable.hxx so users can use color tables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !1448
2018-10-31 17:34:17 -04:00
Robert Maynard
154b65f47a Install vtkm/cont/ColorTable.hxx so users can use color tables 2018-10-31 17:02:12 -04:00
Matt Larsen
27d7162b1e Merge topic 'partial_composites'
fd4ff8c1f adding files patch forgot
e03703578 removing unused variable
5a1685d8a updates to the connectivity tracer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1447
2018-10-31 11:40:29 -04:00
Robert Maynard
458fc974b5 Merge topic 'rework_colortable_for_separable_compilation'
169ca722b Redesign vtkm::cont::ColorTable to work with separable compilation.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1445
2018-10-31 11:24:43 -04:00
Robert Maynard
169ca722b3 Redesign vtkm::cont::ColorTable to work with separable compilation. 2018-10-31 08:18:08 -04:00
Matt Larsen
fd4ff8c1f3 adding files patch forgot 2018-10-30 08:18:56 -07:00
Matt Larsen
e037035780 removing unused variable 2018-10-30 08:09:11 -07:00
Matt Larsen
5a1685d8aa updates to the connectivity tracer 2018-10-30 07:46:42 -07:00
Robert Maynard
8237db209e Merge topic 'noexcept_move_constructors'
c66a6e480 Provided vtkm::cont::Storage with move schematics
1f86878f7 Make the ArrayHandle move constructors noexcept.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1439
2018-10-29 10:24:48 -04:00
Robert Maynard
e549cea8eb Merge topic 'openmp_rendering_tests'
184bdf9d6 Test rendering with OpenMP

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1441
2018-10-25 08:29:31 -04:00
Robert Maynard
c66a6e480d Provided vtkm::cont::Storage with move schematics 2018-10-24 15:45:55 -04:00
Kenneth Moreland
41b006064d Merge topic 'remove-device-from-worklet-run-function'
5426ae0ed added runtime device tracker force
cb0323880 removed device from run function for AverageByKey

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1440
2018-10-24 15:42:59 -04:00
Robert Maynard
184bdf9d60 Test rendering with OpenMP 2018-10-24 15:39:54 -04:00
Matthew Letter
5426ae0ed3 added runtime device tracker force
added `vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(VTKM_DEFAULT_DEVICE_ADAPTER_TAG());`
2018-10-24 11:19:52 -06:00
Matthew Letter
cb03238804 removed device from run function for AverageByKey
I also cleaned up the unit test to no longer pass the device
2018-10-24 10:28:12 -06:00
Robert Maynard
1f86878f78 Make the ArrayHandle move constructors noexcept.
std::containers only activate fast emplace operations if the
T types move operators are noexcept
2018-10-23 16:21:05 -04:00
Robert Maynard
8475db6fea Merge topic 'filter-no-try-execute-changelog'
3b847f9ac Add change log for removal of TryExecute from filters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1437
2018-10-22 08:39:22 -04:00