Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,792 Commits 8 Branches 22 Tags 30 MiB
cb6c1514a2
Commit Graph

4792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Allison Vacanti
cb6c1514a2 Merge topic 'apple_clang_tao_fix' 
03bf07720 Fallback to SimpleTuple.h for Apple Clang 9.0.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1237
 2018-05-30 15:31:13 -04:00
Allison Vacanti
03bf077207 Fallback to SimpleTuple.h for Apple Clang 9.0. 
This compiler gets tripped up parsing tao's zip implementation.
 2018-05-30 15:22:52 -04:00
Kenneth Moreland
2b10108a32 Merge topic 'inconsistent-generated-files' 
201ea1c57 Fix inconsistency in generated WorkletInvokeFunctorDetail.h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1235
 2018-05-30 11:01:44 -04:00
Kenneth Moreland
33c814b2df Merge topic 'changelog-in-wrong-dir' 
e9a9ec341 One of the changelog files was placed in the wrong directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1236
 2018-05-30 11:01:22 -04:00
Kenneth Moreland
e9a9ec3411 One of the changelog files was placed in the wrong directory 2018-05-30 07:39:50 -06:00
Kenneth Moreland
201ea1c578 Fix inconsistency in generated WorkletInvokeFunctorDetail.h 
There was a direct edit to WorkletInvokeFunctorDetail.h that was not
reflected in WorkletInvokeFunctorDetail.h.in. This makes the two files
consistent so that future edits will not loose the changes.
 2018-05-29 17:39:16 -06:00
Kenneth Moreland
01581a8204 Merge topic 'changelog-scatter-to-dispatcher' 
6fb6bd702 Add changelog file for changes moving scatter to dispatcher

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1230
 2018-05-29 18:38:08 -04:00
Shreeraj Jadhav
cf02f8d5ec Merge topic 'example-msvc-build-fix' 
16b06c857 Fix VTKDataSetWriter::WriteDataset() overload const correctness

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1232
 2018-05-29 17:41:04 -04:00
Allison Vacanti
9cfc9112cd Merge topic '228-consolidate_cuda_internals' 
1f6a662c0 Merge DevAdaptAlgoThrust --> DevAdaptAlgoCuda.
be0c6a17a Move DevAdaptAtomicArrayImplementation to its own file.
3af9f6608 Merge ArrayManagerExecutionThrustDevice into AMECuda.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1228
 2018-05-29 15:59:12 -04:00
Shreeraj Jadhav
16b06c8577 Fix VTKDataSetWriter::WriteDataset() overload const correctness 
Compilation error (C2666) is caused by ambiguous call to overloaded function
vtkm::io::writer::VTKDataSetWriter::WriteDataSet().
One of the overloaded functions was not constant (though it is supposed to be).
This fixes compilation error in example "ParticleAdvection" when building
in Windows 7 Visual Studio 2015.
 2018-05-29 14:36:07 -04:00
Allison Vacanti
1f6a662c0a Merge DevAdaptAlgoThrust --> DevAdaptAlgoCuda. 2018-05-29 14:07:29 -04:00
Allison Vacanti
be0c6a17a9 Move DevAdaptAtomicArrayImplementation to its own file. 2018-05-29 14:07:29 -04:00
Allison Vacanti
3af9f66083 Merge ArrayManagerExecutionThrustDevice into AMECuda. 2018-05-29 14:07:29 -04:00
Shreeraj Jadhav
c94422d2ed Merge topic 'Readme-Testing-Config-Example' 
c374c2cd9 Document Supported and Tested Versions of Dependencies, Update Example.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1229
 2018-05-29 12:55:49 -04:00
Allison Vacanti
72ba3d1ca0 Merge topic '155-typedef_to_using-funcsig_edition' 
93506d25e Change function signatures to use 'using' aliases.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1231
 2018-05-29 09:38:27 -04:00
Allison Vacanti
93506d25e2 Change function signatures to use 'using' aliases. 
Also cleaned up some lingering type typedefs.
 2018-05-25 17:18:41 -04:00
Shreeraj Jadhav
c374c2cd9a Document Supported and Tested Versions of Dependencies, Update Example. 
This addresses Issue #147. A list of tested versions for each dependency has
been added based on the configurations of the nightly test builds.
The partial example code in the README has been completed and tested
to generate correct output.
 2018-05-25 17:00:50 -04:00
Kenneth Moreland
6fb6bd702e Add changelog file for changes moving scatter to dispatcher 2018-05-25 14:17:11 -06:00
Allison Vacanti
a8f4f13371 Merge topic 'instantiate_and_export_rendering_templates' 
cf358bdc8 Ensure that LinearBVH template codes are exported on all compilers.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1226
 2018-05-25 09:33:52 -04:00
Allison Vacanti
cf358bdc84 Ensure that LinearBVH template codes are exported on all compilers. 2018-05-24 15:48:09 -04:00
Robert Maynard
5011eddcb5 Merge topic 'changelog_cmake_changes' 
543952e03 add a changelog entry for new cmake design

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Haocheng LIU <haocheng.liu@kitware.com>
Merge-request: !1225
 2018-05-24 10:47:46 -04:00
Robert Maynard
543952e039 add a changelog entry for new cmake design 2018-05-24 10:28:18 -04:00
Kenneth Moreland
411f12cd33 Merge topic 'gradient-vecoutput-device-execution' 
86f3ffa76 Updated gradient scalar output to use new execution obejct

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1208
 2018-05-24 10:23:28 -04:00
Allison Vacanti
ac06d16836 Merge topic '212-compvec_cuda_crash' 
bb9d6dbda Fix UnitTestDataSetBuilderExplicit failures.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1224
 2018-05-24 09:00:16 -04:00
Allison Vacanti
bb9d6dbdac Fix UnitTestDataSetBuilderExplicit failures. 
The nvcc-vtable-order-depends-on-per-translation-unit-instantiation-order
bug was to blame.
 2018-05-23 15:45:26 -04:00
Haocheng LIU
299ed1df70 Merge topic 'Convert-enums-to-enum-structs' 
5c797169e Use the strong typed enums for vtkm::cont::Field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1218
 2018-05-23 11:49:55 -04:00
Allison Vacanti
386c2ece1e Merge topic 'cuda_vec_flag_fix' 
f557bd187 Fix vectorization flags used by CUDA.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1223
 2018-05-22 16:27:43 -04:00
Allison Vacanti
f557bd1878 Fix vectorization flags used by CUDA. 
The -Xcompiler flag wants a comma sep list of flags, we were
passing one with whitespace delimiters.
 2018-05-22 14:50:04 -04:00
Haocheng LIU
5c797169ec Use the strong typed enums for vtkm::cont::Field 
Since Field association is used either when creating or working
with 'vtkm::cont::Field', it's put in the class itself.
 2018-05-22 11:44:51 -04:00
Allison Vacanti
72b379d978 Merge topic 'benchmark_cleanup' 
3a5b4da26 Set device adapter on benchmarks.
9f64c56d1 Prevent FPE in BenchmarkCopySpeed.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1222
 2018-05-21 15:00:33 -04:00
Allison Vacanti
3a5b4da26e Set device adapter on benchmarks. 2018-05-21 14:47:41 -04:00
Allison Vacanti
9f64c56d16 Prevent FPE in BenchmarkCopySpeed. 
UInt64(mean(samples)) may equal zero.
 2018-05-21 14:47:01 -04:00
Robert Maynard
87e25dc773 Merge topic 'source_in_build_tuple_failures' 
87ca7e7a Source in build test ignore the taotuple thirdparty library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1221
 2018-05-21 12:45:00 -04:00
Haocheng LIU
715b384cca Merge topic 'Add-float-versions-for-math-pi' 
fae8409c Add float version operations for vtkm::Math Pi()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1210
 2018-05-21 11:22:32 -04:00
Haocheng LIU
fae8409c9c Add float version operations for vtkm::Math Pi() 
This commit also removes the old static_cast<vtkm::float32>vtkm::Pi() usages and
fix serveral conversion warnings.
 2018-05-21 10:58:15 -04:00
Robert Maynard
87ca7e7a45 Source in build test ignore the taotuple thirdparty library 2018-05-21 10:22:45 -04:00
Robert Maynard
7836fff251 Merge topic 'correct_improper_thirdparty_include_paths' 
d9af7649 thirdparty libraries now obey VTKm_INSTALL_ONLY_LIBRARIES
37c57ebb vtkm thirdparty includes are now usable from an installed vtk-m.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1216
 2018-05-19 09:12:41 -04:00
Robert Maynard
ec75f9d215 Merge topic 'nvcc_ice_fix' 
c229c92c Merge branch 'upstream-taotuple' into nvcc_ice_fix
8bfa1538 taotuple 2018-05-18 (2cf903d6)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1217
 2018-05-19 09:12:16 -04:00
Robert Maynard
9f4f87c35b Merge topic 'document_more_vtkm_changes_since_1.2.0' 
245d27bd Add changelog documents for major changes I made to VTK-m since 1.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1219
 2018-05-19 08:30:23 -04:00
Abhishek Yenpure
7291327e98 Merge topic 'fix_warnings' 
3f08c444 Fixing warnings introduced by MR 1165

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1212
 2018-05-18 20:02:34 -04:00
Allison Vacanti
7ea7acee5e Merge topic 'changelog-update' 
00a9225c Add changelog messages for fancy arrayhandle changes.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1220
 2018-05-18 17:45:25 -04:00
Allison Vacanti
00a9225ce1 Add changelog messages for fancy arrayhandle changes. 2018-05-18 17:39:49 -04:00
Robert Maynard
245d27bd5c Add changelog documents for major changes I made to VTK-m since 1.2 2018-05-18 17:36:22 -04:00
David Thompson
7df0410a81 Merge topic 'cell-measure-fixes' 
7cbbb016 Fix `multi_backend` when using double precision.
52a14958 Fix cell measure when using double precision as default.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1214
 2018-05-18 17:07:52 -04:00
Robert Maynard
d9af7649e4 thirdparty libraries now obey VTKm_INSTALL_ONLY_LIBRARIES 
This way we only install thirdparty headers and CMake information
when VTKm_INSTALL_ONLY_LIBRARIES is set to false.
 2018-05-18 16:40:55 -04:00
Allison Vacanti
c229c92c0b Merge branch 'upstream-taotuple' into nvcc_ice_fix 
* upstream-taotuple:
  taotuple 2018-05-18 (2cf903d6)
 2018-05-18 16:26:38 -04:00
TaoCpp Tuple Upstream
8bfa153806 taotuple 2018-05-18 (2cf903d6) 
Code extracted from:

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

at commit 2cf903d6e44af7f277e21d804294ffd1f0528af8 (for/vtk-m).
 2018-05-18 16:26:37 -04:00
Robert Maynard
37c57ebb25 vtkm thirdparty includes are now usable from an installed vtk-m. 2018-05-18 16:11:41 -04:00
Sujin Philip
d9ff56a701 Merge topic 'add-changelog' 
d5676214 Add Changelog for previous commits

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1215
 2018-05-18 15:33:07 -04:00
ayenpure
3f08c44436 Fixing warnings introduced by MR 1165 2018-05-18 12:25:52 -07:00