Haocheng LIU
6e6968d97f
Fix diy include and Timer construction errors in examples
2019-02-06 15:28:09 -05:00
Robert Maynard
ad98d818ce
VTK-m now doesn't clobber external DIY installations
...
Fixes #334
2019-02-05 13:05:14 -05:00
Robert Maynard
2812842984
Merge branch 'upstream-diy' into correct_more_diy2_warnings
...
* upstream-diy:
diy 2019-01-09 (149953b0)
2019-01-09 11:04:01 -05:00
Robert Maynard
5fa086f7d4
Merge branch 'upstream-diy' into fix_diy2_unused_call_result_warning
...
* upstream-diy:
diy 2019-01-08 (839fd11e)
2019-01-08 12:35:31 -05:00
luz.paz
d5beb69ec1
Misc. typos
...
Found via `codespell`
2018-10-04 10:30:33 -04:00
Robert Maynard
db1b394336
Merge branch '291_logging' into 'master'
...
Add general logging support
See merge request vtk/vtk-m!1414
2018-10-04 09:36:47 -04:00
Sujin Philip
ebcd0ade6a
Move test_equal_* functions to vtkm::cont::testing
...
Implement more general versions of `test_equal_ArrayHandles`, `test_equal_CellSets`, `test_equal_Fields`, and `test_equal_DataSets` functions and put them
in vtkm/cont/testing/Testing.hi with the hope that they will be useful for
others also.
2018-09-25 13:58:39 -04:00
Allison Vacanti
a754787e38
Add loguru to project.
2018-09-21 14:43:56 -04:00
Allison Vacanti
7864a1daac
Merge branch 'upstream-loguru' into tmp
...
* upstream-loguru:
loguru 2018-09-21 (9d48e6b0)
2018-09-21 14:25:01 -04:00
Allison Vacanti
12f78e7404
Add loguru thirdparty metadata.
2018-09-21 14:24:48 -04:00
Haocheng LIU
2f57470a13
Merge branch 'upstream-diy' into update-diy
...
* upstream-diy:
diy 2018-07-09 (38da7b11)
2018-07-10 13:52:20 -04:00
Allison Vacanti
be31ce0124
Merge branch 'upstream-taotuple' into fix_msvc2017_tuple_get
...
* upstream-taotuple:
taotuple 2018-07-05 (ee1b4af3)
2018-07-05 09:50:31 -04:00
Allison Vacanti
768086a0f3
Merge branch 'upstream-taotuple' into cuda_32bit_id_fix
...
* upstream-taotuple:
taotuple 2018-06-29 (4bd72b5e)
2018-06-29 16:45:56 -04:00
Allison Vacanti
b4110cd5dd
Update update.sh for taotuple to reflect upstream changes.
2018-06-29 14:49:07 -04:00
TaoCpp Tuple Upstream
2d7ae33db5
taotuple 2018-06-05 (ae493658)
...
Code extracted from:
https://gitlab.kitware.com/third-party/taotuple.git
at commit ae4936580baf117373e73c23f0f8407d7589e6ff (for/vtk-m).
2018-06-05 12:24:07 -04:00
Allison Vacanti
abdf24a8f5
Merge branch 'upstream-taotuple' into CUDA_tuple_warnings
...
* upstream-taotuple:
taotuple 2018-06-05 (ae493658)
2018-06-05 12:24:07 -04:00
TaoCpp Tuple Upstream
7c1d273673
taotuple 2018-06-01 (81c6f933)
...
Code extracted from:
https://gitlab.kitware.com/third-party/taotuple.git
at commit 81c6f933832b135bfb07e7c99e33f4dcaa1014af (for/vtk-m).
2018-06-04 14:41:15 -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
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
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
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
Robert Maynard
37c57ebb25
vtkm thirdparty includes are now usable from an installed vtk-m.
2018-05-18 16:11:41 -04:00
Allison Vacanti
193447078f
Add vtkm_taotuple to build system.
2018-05-16 11:45:11 -04:00
Allison Vacanti
d23c445296
Merge branch 'upstream-taotuple' into tmp
...
* upstream-taotuple:
taotuple 2018-05-15 (e3de8c97)
2018-05-15 15:19:13 -04:00
Allison Vacanti
b00f6c1c0a
Add taocpp/tuple as a thirdparty package.
2018-05-15 13:32:42 -04:00
Robert Maynard
03ce61f299
Merge branch 'upstream-diy' into correct_clang_6_warnings
...
* upstream-diy:
diy 2018-05-02 (a2fdc50d)
2018-05-02 14:28:46 -04:00
Robert Maynard
8808b41fbd
Merge branch 'master' into vtk-m-cmake_refactor
2018-03-29 22:51:26 -04: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
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
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
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
e630ac5aa4
Merge branch 'master' into vtk-m-cmake_refactor
2018-02-23 14:52:00 -05:00
Utkarsh Ayachit
61e28ae1cb
Merge branch 'upstream-diy' into update_diy
...
* upstream-diy:
diy 2018-02-15 (3c908c14)
2018-02-21 13:16:12 -05:00
luz.paz
80b11afa24
Misc. typos
...
Found via `codespell -q 3` via downstream VTK
2018-01-30 06:51:47 -05:00
Robert Maynard
98e4a34cd1
VTKm now refers to diy as vtkm_diy
...
This is done to be more consistent with the vtkm CMake naming and
to make sure we don't conflict with other exported diy instances.
2018-01-16 15:42:36 -05:00
Robert Maynard
0660c67fef
Merge branch 'master' into vtk-m-cmake_refactor
2018-01-16 15:42:28 -05:00
Utkarsh Ayachit
ce193592c5
diy: update cmake rules.
...
DIY Thirdparty module now builds and also generates a
`vtkm/thirdparty/diy/Configure.h` which can in future support external
DIY.
2018-01-03 14:35:00 -05:00
Utkarsh Ayachit
a610329bb2
Merge branch 'upstream-diy' into diy-as-3rd-party
...
* upstream-diy:
diy 2018-01-02 (aa778e24)
2018-01-03 14:06:35 -05:00
Utkarsh Ayachit
4339b4e2d2
Add update script for diy.
2018-01-03 14:06:14 -05:00
Utkarsh Ayachit
2aab6ba47e
Add 3rd-party harness.
...
Add docs and scripts for 3rd party modules in VTK-m.
This is an import of scripts from VTK.
2018-01-03 13:58:59 -05:00