Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-21 03:25:48 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity
4,478 Commits 9 Branches 24 Tags 38 MiB
de79765c24
Commit Graph

4478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Maynard
7c54125b66 Switch over from static const to static constexpr where possible. 2018-03-10 11:39:58 -05:00
Utkarsh Ayachit
66e356f7d9 Merge topic 'add-filters' 
86bd81de streamline: handle different storage types for fields.
de4e840e enhance filter API
c255c0eb add `vtkm::cont::ConditionalCastAndCall`
54c2d234 Make it easier to iterator over blocks.
d1a59aad Fixes for CrossProduct and DotProduct.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1100
 2018-03-10 09:24:35 -05:00
Utkarsh Ayachit
66fcf2a7fd Merge branch 'upstream-diy' into fix-diy-warnings 
* upstream-diy:
  diy 2018-03-10 (08f19c67)
 2018-03-10 09:24:19 -05:00
Diy Upstream
95743c6ee3 diy 2018-03-10 (08f19c67) 
Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit 08f19c677d84e08d9e7ee301c98db04c2bc2c7bd (for/vtk-m).
 2018-03-10 09:24:19 -05:00
Matt Larsen
4d14214480 Merge topic 'invert_clip' 
9cebcdaa adjusting formatting
0d671bcb adding inverted clip unit tests
2daba821 adding the ability to invert clips

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1107
 2018-03-09 22:30:14 -05:00
Matt Larsen
9cebcdaaa5 adjusting formatting 2018-03-09 13:58:08 -08:00
Matt Larsen
0d671bcb22 adding inverted clip unit tests 2018-03-09 13:51:28 -08:00
Robert Maynard
c026d14b97 DynamicArrayHandle prunes invalid Value/Storage set before cast and call 
By pruning the invalid combinations first we reduce the amount of work
the compiler has to do. Additionally it makes for smaller callstacks when
the compiler errors out during a CastAndCall.
 2018-03-09 16:14:27 -05:00
Matt Larsen
2daba82188 adding the ability to invert clips 2018-03-08 18:28:08 -08:00
Utkarsh Ayachit
86bd81de3f streamline: handle different storage types for fields. 
this is required now that, in theory, streaminlines filter can be
executed treating the coordinate system as the vector field.
 2018-03-07 13:42:23 -05:00
Utkarsh Ayachit
de4e840eae enhance filter API 
Filters now support executing on a dataset to produce a result dataset
with automatic mapping of fields to the output dataset. Fields to map
can be selected using `vtkm::filter::FieldSelection` class, which provides
constructors to map all or no fields, along with a selection of fields.

This updates all tests to use the new filter API.
 2018-03-07 13:42:23 -05:00
Robert Maynard
7fd9950c56 Merge topic 'disable_assert_cuda_75' 
a75c6ae4 Automatically disable assert for CUDA 7.5 as they don't work in device code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !1105
 2018-03-07 10:41:57 -05:00
Robert Maynard
65077ad121 Merge topic 'connected_component' 
1a13324a Merge branch 'master' into connected_component
e058aaeb extend CellSetConnectivity to CellSetUniform and CellSetExplicit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1104
 2018-03-07 10:29:33 -05:00
Robert Maynard
a75c6ae419 Automatically disable assert for CUDA 7.5 as they don't work in device code 2018-03-07 09:18:37 -05:00
Robert Maynard
d3fe1a6bd4 Merge topic 'allow_diy_to_build_on_powerpc_clang' 
496ebb96 Merge branch 'upstream-diy' into allow_diy_to_build_on_powerpc_clang
5dedd3c6 diy 2018-03-06 (56d516fd)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1102
 2018-03-07 08:02:53 -05:00
Li-Ta Lo
1a13324a9a Merge branch 'master' into connected_component 2018-03-06 16:23:43 -07:00
Li-Ta Lo
e058aaebd9 extend CellSetConnectivity to CellSetUniform and CellSetExplicit 2018-03-06 16:21:32 -07:00
Utkarsh Ayachit
c255c0ebe7 add vtkm::cont::ConditionalCastAndCall 
Adding a function to conditionally do CastAndCall.
 2018-03-06 15:54:46 -05:00
Utkarsh Ayachit
54c2d2345e Make it easier to iterator over blocks. 
Now `for (block : multiblock)` is supported.
 2018-03-06 15:54:46 -05:00
Utkarsh Ayachit
d1a59aad20 Fixes for CrossProduct and DotProduct. 2018-03-06 15:54:46 -05:00
Robert Maynard
496ebb9628 Merge branch 'upstream-diy' into allow_diy_to_build_on_powerpc_clang 
* upstream-diy:
  diy 2018-03-06 (56d516fd)
 2018-03-06 14:56:05 -05:00
Diy Upstream
5dedd3c661 diy 2018-03-06 (56d516fd) 
Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit 56d516fdc2633de03731ae4a391909edf61be9d2 (for/vtk-m).
 2018-03-06 14:56:04 -05:00
Dave Pugmire
4fd3203bc2 Merge topic 'cross_and_dot_filters' 
da2b518e fix compiler warning
1a0dfaa7 Add mapfield method.
daf11713 Filters to compute the cross and dot product of vector fields.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1098
 2018-02-27 16:00:43 -05:00
Utkarsh Ayachit
52b78a903a Merge topic 'make-diy-non-optional' 
756c7e1d selectively disable C4275.
7f52fcd1 Merge branch 'upstream-diy' into make-diy-non-optional
b8ae3236 diy 2018-02-27 (e140ad94)
4ade3984 warnings: int/size_t conversion warnings.
18fec921 don't exclude DIY warnings.
4813d7cb disable non-fixable MSVC warnings.
61e57d4e fix shadowed variable warnings.
7002c71e add warning guards around diy includes.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1091
 2018-02-27 15:50:41 -05:00
Utkarsh Ayachit
756c7e1d11 selectively disable C4275. 2018-02-27 13:42:52 -05:00
Dave Pugmire
da2b518e63 fix compiler warning 2018-02-27 13:35:35 -05:00
Dave Pugmire
1a0dfaa760 Add mapfield method. 2018-02-27 13:24:30 -05:00
Diy Upstream
b8ae323613 diy 2018-02-27 (e140ad94) 
Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit e140ad948d01de6d7a2bd112183800f16e3a72f0 (for/vtk-m).
 2018-02-27 12:25:56 -05:00
Utkarsh Ayachit
7f52fcd18b Merge branch 'upstream-diy' into make-diy-non-optional 
* upstream-diy:
  diy 2018-02-27 (e140ad94)
 2018-02-27 12:25:56 -05:00
Dave Pugmire
daf1171382 Filters to compute the cross and dot product of vector fields. 2018-02-27 09:24:46 -05:00
Robert Maynard
dff800028b Merge topic 'allow_vtkm_cont_compilation_with_cuda_75' 
dde7c76a Worklets can't be in anonymous namespace as CUDA 7.5 doesn't support those.
601a839d VTK-m uses static const/constexpr when supported ( so not on cuda 7.5 )
505e7aa1 VTK-m now has defines for the CUDA version even when not using nvcc.
a60e3780 CUDA 7.5 doesn't like suppressing warning codes that don't exist
41d968f6 Cuda ExecutionPolicy when using CUDA 7.5 is aware we use raw pointer now
6202d8d2 CudaAllocator guards all CUDA 8.0+ calls behind ifdef's.
ff9dcc47 Consistently mark variables as static const across all of vtk-m

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1088
 2018-02-27 08:34:37 -05:00
Robert Maynard
dde7c76a9f Worklets can't be in anonymous namespace as CUDA 7.5 doesn't support those. 2018-02-26 16:42:00 -05:00
Robert Maynard
601a839d5d VTK-m uses static const/constexpr when supported ( so not on cuda 7.5 ) 
These changes now allow VTK-m to compile on CUDA 7.5 by using const arrays,
when compiling with CUDA 8+ support we upgrade to static const arrays, and
lastly when CUDA is disabled we fully elevate to static constexpr.
 2018-02-26 16:41:29 -05:00
Robert Maynard
505e7aa1ec VTK-m now has defines for the CUDA version even when not using nvcc. 
This is needed so so that the CUDA and C++ compiler generate the same code
when scanning a shared header but generating different translation units
 2018-02-26 16:38:26 -05:00
Robert Maynard
a60e378003 CUDA 7.5 doesn't like suppressing warning codes that don't exist 
Newer versions of CUDA have no problem suppressing warning codes that don't
exist.
 2018-02-26 16:37:57 -05:00
Robert Maynard
41d968f68d Cuda ExecutionPolicy when using CUDA 7.5 is aware we use raw pointer now 
The failure was caused by not updating CUDA 7.5 code paths when we
removed the usage of ::thrust::cuda::pointer.
 2018-02-26 16:37:57 -05:00
Robert Maynard
6202d8d22d CudaAllocator guards all CUDA 8.0+ calls behind ifdef's. 2018-02-26 16:37:57 -05:00
Robert Maynard
ff9dcc4750 Consistently mark variables as static const across all of vtk-m 2018-02-26 16:37:57 -05:00
Utkarsh Ayachit
4ade3984ac warnings: int/size_t conversion warnings. 2018-02-26 15:33:56 -05:00
Utkarsh Ayachit
18fec92119 don't exclude DIY warnings. 2018-02-26 15:33:56 -05:00
Utkarsh Ayachit
4813d7cb7f disable non-fixable MSVC warnings. 2018-02-26 15:33:56 -05:00
Utkarsh Ayachit
61e57d4e73 fix shadowed variable warnings. 2018-02-26 15:33:56 -05:00
Utkarsh Ayachit
7002c71e95 add warning guards around diy includes. 
Adding `VTKM_THIRDPARTY_PRE_INCLUDE` and `VTKM_THIRDPARTY_POST_INCLUDE`
guards around diy includes.
 2018-02-26 15:33:56 -05:00
Utkarsh Ayachit
70b647071c Make DIY a required dependency. 
DIY now depends on MPI optionally. Hence we no longer need to depend on
DIY optionally based on whether MPI was enabled. Update cmake and c++
code to always use DIY-based components.

DIY is built with MPI support if VTKm_ENABLE_MPI is ON.
 2018-02-26 11:25:56 -05:00
Robert Maynard
a1d5dc4550 Merge topic 'vtkm_remove_vs2013_workarounds' 
ee69c7a4 Remove VS2013 workarounds from VTK-m.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1095
 2018-02-26 08:50:10 -05:00
Robert Maynard
ee69c7a4b7 Remove VS2013 workarounds from VTK-m. 2018-02-23 15:39:39 -05:00
Robert Maynard
d205f9530e Update the documentation on when we need CMake 3.9+ 2018-02-23 15:38:44 -05:00
Robert Maynard
e630ac5aa4 Merge branch 'master' into vtk-m-cmake_refactor 2018-02-23 14:52:00 -05:00
Robert Maynard
01c9d6e2a6 Merge topic 'vtkm_prefers_using_over_typedef' 
182f4707 vtkm prefers 'using' over typedef.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1092
 2018-02-23 13:15:02 -05:00
Robert Maynard
182f4707e7 vtkm prefers 'using' over typedef. 2018-02-23 10:47:20 -05:00