Commit Graph

4087 Commits

Author SHA1 Message Date
Li-Ta Lo
746c98e6c8 fix merge conflict with master branch, update to control signature 2018-01-03 11:27:13 -07:00
Li-Ta Lo
2a9439ab1e Merge branch 'master' into connected_component 2018-01-02 17:59:19 -07:00
Li-Ta Lo
4c2ef4f89b factor out CellSetConnectivity worklet, cleanup 2018-01-02 16:44:35 -07:00
Robert Maynard
a81919999a Merge topic 'vtkm_host_device_warnings'
93bc0198 Suppress false positive warnings about calling host device functions.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1042
2018-01-02 14:10:54 -05:00
Robert Maynard
93bc0198fe Suppress false positive warnings about calling host device functions. 2018-01-02 10:40:49 -05:00
Sujin Philip
39dd8feeac Merge topic 'fix-ExecutionWholeArray-usage'
6b190312 Cleanup includes of ExecutionWholeArray.h
3e10b504 Replace ExecutionWholeArray with WholeArray

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1039
2018-01-02 10:32:43 -05:00
Sujin Philip
6b19031200 Cleanup includes of ExecutionWholeArray.h 2018-01-02 10:30:16 -05:00
Sujin Philip
3e10b504e6 Replace ExecutionWholeArray with WholeArray 2018-01-02 10:30:16 -05:00
Robert Maynard
437ba96448 Merge topic 'cross_dot_product'
18ece6dc Better type signatures.
2537a1cf Worklets for cross and dot product.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1040
2017-12-29 09:04:41 -05:00
Robert Maynard
45ba5f1a9c Merge topic 'correct_vtkm_no_assert_flag'
053dccac Properly propagate down the VTKM_NO_ASSERT flag to configure file.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1041
2017-12-29 08:08:54 -05:00
Dave Pugmire
18ece6dce9 Better type signatures. 2017-12-29 06:48:39 -05:00
Robert Maynard
053dccac24 Properly propagate down the VTKM_NO_ASSERT flag to configure file. 2017-12-28 16:44:48 -05:00
Dave Pugmire
2537a1cf56 Worklets for cross and dot product. 2017-12-22 15:20:20 -05:00
Li-Ta Lo
2e88f4220a Connected component for triangle mesh 2017-12-22 10:31:02 -07:00
Robert Maynard
de7162ab8f Merge topic 'compile_in_dataset'
3eb8294b Build vtkm::cont::DataSet into the vtkm_cont library.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !1032
2017-12-22 08:24:38 -05:00
Sujin Philip
96c22747d5 Merge topic 'fix-field-api'
334262db Fix Field constructors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1035
2017-12-21 14:51:52 -05:00
Sujin Philip
334262db16 Fix Field constructors
1. Add option to copy user supplied array in make_ArrayHandle.
2. Replace Field constructors that take user supplied arrays with make_Field.
3. Replace CoordinateSystem constructors that take user supplied arrays with
   make_CoordinateSystem.
2017-12-21 12:48:15 -05:00
Matt Larsen
2fab4458e5 Merge topic 'ray_tracing_benchmarks'
83e51cf4 creating ray tracing benchmark
a4106506 trying to create a benchmark for ray tracing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1036
2017-12-21 10:52:06 -05:00
Matt Larsen
83e51cf42e creating ray tracing benchmark 2017-12-20 14:22:52 -08:00
Matt Larsen
a410650655 trying to create a benchmark for ray tracing 2017-12-20 10:25:16 -08:00
Sujin Philip
fab26344c6 Merge topic 'fix-ManagedMemory-issue'
b530a5ce Fix issue with Managed Memory for 0 size arrays

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1033
2017-12-20 09:39:04 -05:00
Robert Maynard
a6ec3ab093 Merge topic 'enable_all_point_gradient_tests'
a73fc3fd Enable all point gradient worklet tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1031
2017-12-20 08:25:23 -05:00
Robert Maynard
a32394b92b Merge topic 'correct_capitalization_in_datasetwriter'
1d816534 Local var for the array portal instead of inside the for loop.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1029
2017-12-20 08:25:10 -05:00
Sujin Philip
b530a5ce3f Fix issue with Managed Memory for 0 size arrays 2017-12-19 17:18:24 -05:00
Robert Maynard
a73fc3fd0a Enable all point gradient worklet tests 2017-12-19 16:31:47 -05:00
Robert Maynard
3eb8294b24 Build vtkm::cont::DataSet into the vtkm_cont library. 2017-12-19 15:14:30 -05:00
Robert Maynard
f97f5a6e67 Merge topic 'normalize_worklet'
c6a4e335 Normalize worklet (both in place, and copy).

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1028
2017-12-19 15:02:50 -05:00
Dave Pugmire
1d8165344f Local var for the array portal instead of inside the for loop. 2017-12-19 11:48:38 -05:00
Dave Pugmire
c6a4e335d9 Normalize worklet (both in place, and copy). 2017-12-19 11:44:30 -05:00
Utkarsh Ayachit
f98f42ded2 Merge topic 'add_mpi_tests'
186e6869 Add ability to run tests with `mpiexec`.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1025
2017-12-19 10:16:32 -05:00
Utkarsh Ayachit
186e686968 Add ability to run tests with mpiexec.
Extends `vtkm_unit_tests` to support running tests with `mpiexec`.
Updates `UnitTestMultiBlock` to use mpi, if available.
2017-12-18 14:45:25 -05:00
Utkarsh Ayachit
a6f6ea99a4 Merge topic 'vtk-h-integration'
1bb7dde9 Update MultiBlock to use `diy` for block-based operations.
e9c7e561 Add `EnvironmentTracker` to track MPI communicator.
d52b275e Making vtkm-cont depend on diy.
c63f3635 diy: pass operator instance to mpi_op<>::get()
42d5be31 diy: Add support for MPI_COMM_NULL.
6a4edd87 Exclude diy from VTK-m Copyright checks.
9b544471 Add `diy`
1f989b1f exclude `diy` from clang format.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1023
2017-12-15 16:00:44 -05:00
Utkarsh Ayachit
1bb7dde971 Update MultiBlock to use diy for block-based operations.
Updating MultiBlock to use `diy` for computing block summaries like
ranges, bounds etc. This makes it possible to MultiBlock to
work in distributed operations without explicit logic.
2017-12-15 15:15:23 -05:00
Utkarsh Ayachit
e9c7e5619c Add EnvironmentTracker to track MPI communicator.
When using MPI, we need a mechanism in VTK-m to set/get the MPI
controller. Added `EnvironmentTracker` to do that.
2017-12-15 15:15:23 -05:00
Utkarsh Ayachit
d52b275e59 Making vtkm-cont depend on diy. 2017-12-15 15:15:23 -05:00
Utkarsh Ayachit
c63f3635d5 diy: pass operator instance to mpi_op<>::get()
This makes it possible to add custom MPI reduction operations without
having to add too complex logic to allocating and freeing MPI operation.
2017-12-15 15:15:23 -05:00
Utkarsh Ayachit
42d5be319b diy: Add support for MPI_COMM_NULL. 2017-12-15 15:15:22 -05:00
Utkarsh Ayachit
6a4edd87f7 Exclude diy from VTK-m Copyright checks. 2017-12-15 15:15:22 -05:00
Utkarsh Ayachit
9b5444718c Add diy 2017-12-15 15:15:22 -05:00
Utkarsh Ayachit
1f989b1fb0 exclude diy from clang format. 2017-12-15 15:03:03 -05:00
Utkarsh Ayachit
9dfc6f814e Add MPI as a dependency.
Adding option to enable MPI. When enabled, we do `find_package(MPI)` in
the Base component itself.
2017-12-15 10:53:30 -05:00
Utkarsh Ayachit
e72ce1e141 Update MultiBlock to follow coding style.
Use `this` and rename `blocks` to `Blocks`.
2017-12-15 10:53:30 -05:00
Robert Maynard
0de08aae06 Merge topic 'teach_brigand_about_cray_compiler'
06c5f161 Teach brigand about more intel compiler limitations introduced in 18.X.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1020
2017-12-14 15:26:06 -05:00
Robert Maynard
06c5f1613f Teach brigand about more intel compiler limitations introduced in 18.X. 2017-12-14 13:40:03 -05:00
Robert Maynard
9fc3e6a778 Merge topic 'reduce_algorithms_boilerplate'
7420f72c Simplify the boilerplate functors in vtkm/cont/Algorithms.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1019
2017-12-12 18:15:21 -05:00
Robert Maynard
7420f72c24 Simplify the boilerplate functors in vtkm/cont/Algorithms. 2017-12-12 11:10:52 -05:00
Robert Maynard
a1a23f83d3 Merge topic 'intel_compiler_hangs_on_brigand_crossproduct'
f9f205e9 ListCrossProduct now uses a special version for MSVC2013
c02349a8 ListCrossProduct now uses a lazy evaluation implementation
7b1b9e44 Correctly forward rvalue functors when passed to CastAndCall

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1018
2017-12-12 09:29:50 -05:00
Matt Larsen
c7db823ea0 Merge topic 'algorithm_wrap'
bf6cb1bd removing state from functors and adding variadic templates
013113e3 Fixing streaming scan doc
eaebaea7 adding a wrapper for device adapter algorithm

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1011
2017-12-11 20:28:48 -05:00
Matt Larsen
bf6cb1bd62 removing state from functors and adding variadic templates 2017-12-11 14:15:12 -08:00
Robert Maynard
f9f205e9df ListCrossProduct now uses a special version for MSVC2013
The lazy version that was implemented to get the Intel compiler to work doesn't
work under MSVC2013. Since MSVC2013 is our least c++11 conforming compiler we
add a special MSVS2013 code path, since it will be the first compiler we drop.
2017-12-11 16:27:15 -05:00