Robert Maynard
26e50065ab
Merge branch 'upstream-lodepng' into namespace_lodepng
...
* upstream-lodepng:
lodepng 2019-07-17 (82328a33)
2019-07-17 14:21:13 -04:00
Robert Maynard
fb6235e0e9
VTK-m and DIY now properly export MPI requirements.
...
Previously an installed version of VTK-m wasn't relocatable as
it had system MPI paths. Additionally the installed vtkm_diy target
would depend on MPI but not `find_package(MPI)`
2019-06-24 14:48:01 -04:00
Robert Maynard
33d4f6958f
Merge branch 'upstream-lodepng' into add_lodepng_thirdparty
...
* upstream-lodepng:
lodepng 2019-06-16 (430268ba)
2019-06-19 14:40:00 -04:00
Robert Maynard
8153246381
Add lodepng as a vtk-m thirdparty library.
2019-06-19 14:39:46 -04:00
Robert Maynard
9dc8b06dfb
Cleanup logic surrounding the usage of vtkm thirdparty libraries
2019-06-18 16:08:42 -04:00
Allison Vacanti
1002c038e7
Merge branch 'upstream-loguru' into update_loguru
...
* upstream-loguru:
loguru 2019-03-21 (862ed46e)
2019-06-12 10:08:02 -04:00
Allison Vacanti
331c2d5690
Update to latest loguru for MSVC fixes.
2019-06-12 10:07:51 -04:00
Kenneth Moreland
e3cc3eecb4
Merge branch 'upstream-taotuple' into msvc-cuda-fixes
...
* upstream-taotuple:
taotuple 2019-06-05 (990962ae)
2019-06-05 12:02:44 -06:00
Robert Maynard
095e288383
Merge topic 'better_scoped_rt_dt'
...
bcaf7d9be ScopedRuntimeDeviceTracker have better controls of setting devices.
4212d0c04 RuntimeDeviceInformation now says the AnyTag exists.
fa03dc664 ScopedRuntimeDeviceTracker requires a device to execute on when constructed.
4020f5198 RuntimeDeviceTracker can't be copied and is only accessible via reference.
e9482018e ScopedRuntimeDeviceTracker has the same API as RuntimeDeviceTracker
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1676
2019-05-24 16:45:22 -04:00
Robert Maynard
4020f51988
RuntimeDeviceTracker can't be copied and is only accessible via reference.
...
As the RuntimeDeviceTracker is a per thread construct we now make
it explicit that you can only get a reference to the per-thread
version and can't copy it.
2019-05-20 11:43:05 -04:00
Robert Maynard
b8f5d582d6
Merge branch 'upstream-diy' into support_clang-cl
...
* upstream-diy:
diy 2019-05-14 (41fd7af6)
2019-05-14 11:47:02 -04:00
Robert Maynard
80e5f274a3
Update update-common.sh to the SHA1: b094fcba
...
This update allows for the update-common script to be run from
any directory
2019-05-13 15:17:23 -04:00
Robert Maynard
967581cf16
Merge branch 'upstream-taotuple' into update_tao_cuda_pragmas
...
* upstream-taotuple:
taotuple 2019-04-24 (57001975)
2019-04-29 09:12:58 -04:00
Robert Maynard
030b03e470
Remove unneeded diy build include directory
...
The diy build configured files are all located by the include
from the root vtkm include directory, so this include isn't needed
2019-04-22 15:00:30 -04:00
nadavi
fbcea82e78
conslidate the license statement
2019-04-17 10:57:13 -06:00
Diy Upstream
dbd3781d5c
diy 2019-04-09 (f7a68da4)
...
Code extracted from:
https://gitlab.kitware.com/third-party/diy2.git
at commit f7a68da4fbe93ae7a8699b66f125a98ace842998 (for/vtk-m).
2019-04-09 11:42:54 -04:00
Robert Maynard
5cc0d03f64
Merge branch 'upstream-diy' into clang_warnings
...
* upstream-diy:
diy 2019-04-09 (f7a68da4)
2019-04-09 11:42:54 -04:00
Robert Maynard
b2bbd66e60
Merge branch 'upstream-taotuple' into update_taoo
...
* upstream-taotuple:
taotuple 2019-04-03 (8e70fa8a)
2019-04-03 08:50:47 -04:00
Robert Maynard
e787d52afc
Merge branch 'optionparser-to-third-party' into 'master'
...
Wrap third party optionparser.h in vtkm/cont/internal/OptionParser.h
See merge request vtk/vtk-m!1593
2019-04-01 10:56:01 -04:00
Kenneth Moreland
7237c46898
Wrap third party optionparser.h in vtkm/cont/internal/OptionParser.h
...
Previously we just took the optionparser.h file and stuck it right in
our source code. That was problematic for a variety of reasons.
1. It incorrectly assigned our license to external code.
2. It made lots of unnecessary changes to the original source (like
reformatting).
3. It made it near impossible to track patches we make and updates to
the original software.
Instead, use the third-party system to track changes to optionparser.h
in a different repository and then pull that into ours.
2019-03-26 15:47:17 -06:00
Kenneth Moreland
184fe79298
Merge branch 'upstream-optionparser' into optionparser-to-third-party
...
* upstream-optionparser:
optionparser 2018-05-07 (eaca634d)
2019-03-26 15:35:55 -06:00
Kenneth Moreland
2c10b57ced
Add update script for optionparser third party library
2019-03-26 15:34:20 -06:00
Diy Upstream
ed4374b05d
diy 2019-03-13 (e8e68c7c)
...
Code extracted from:
https://gitlab.kitware.com/third-party/diy2.git
at commit e8e68c7cd2f362e706f11542a3408baa039de5e8 (for/vtk-m).
2019-03-26 14:53:42 -04:00
Robert Maynard
b9614bbc73
VTK-m always use cxx_std_<level> when requesting compiler level
...
The meta cxx_std_<level> flags are supported for compilers such
as IBM XL and PGI, where the granular flags such as cxx_auto_type
arent.
2019-03-12 16:13:43 -04:00
Ben Boeckel
e266dcb34f
Merge branch 'upstream-taotuple' into fix-undef-errors
...
* upstream-taotuple:
taotuple 2019-02-14 (b8ca98d2)
2019-02-14 16:29:33 -05:00
Haocheng LIU
542bb36594
Merge branch 'upstream-loguru' into revert-loguru-strdup-fix
...
* upstream-loguru:
loguru 2019-02-12 (6ab123ef)
2019-02-12 09:03:55 -05:00
Haocheng LIU
e3e63ff605
Merge branch 'upstream-loguru' into fix-loguru-memory-leak
...
* upstream-loguru:
loguru 2019-02-11 (2569911a)
2019-02-11 13:18:19 -05:00
Robert Maynard
4b0d56e7d0
Add Copyright to diy/serialization.h
2019-02-11 08:31:14 -05:00
Robert Maynard
451bff6f14
vtkmdiy: Use the new mangled VTKM_DIY_ defines
2019-02-08 14:31:34 -05:00
Robert Maynard
7d307b96ce
Merge branch 'upstream-diy' into diy_conditional_serialization
...
* upstream-diy:
diy 2019-02-08 (72a201e1)
2019-02-08 14:25:51 -05:00
Robert Maynard
74acc2a7bb
vtkmdiy: Support only including the serialization headers of diy
2019-02-08 11:40:59 -05:00
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