Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 02:25:42 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity
7,392 Commits 9 Branches 24 Tags 38 MiB
abf5692887
Commit Graph

96 Commits

Author SHA1 Message Date
nadavi
abf5692887 Merge branch 'upstream-lodepng' into lodepng-in-lib 
* upstream-lodepng:
  lodepng 2020-04-16 (b51302e1)
 2020-04-22 12:07:52 -06:00
nadavi
e925d6d54c turn lodepng into a library 2020-04-22 12:07:32 -06:00
Kenneth Moreland
75a46dc2eb Remove tao tuple from third party libraries 
We are no longer using this code. It has been replaced by vtkm::Tuple.
 2020-03-16 17:12:17 -06:00
Robert Maynard
cbf20ac3bb Merge branch 'upstream-diy' into aligned_union_check_handle_gcc_485 
* upstream-diy:
  diy 2019-12-17 (bb86e1f7)
 2019-12-17 10:19:43 -05:00
Robert Maynard
2e48d98d94 Merge branch 'upstream-diy' into update_check_for_aligned_union 
* upstream-diy:
  diy 2019-12-16 (e365b66a)
 2019-12-16 09:49:30 -05:00
Sujin Philip
48927c6da3 Merge topic 'fix-lcl-dashboard' 
0bb8cbf42 Fix CellLocatorUniformBins test
169049143 Merge branch 'upstream-lcl' into fix-lcl-dashboard
e7cf79a93 lcl 2019-10-09 (d7604cbf)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1888
 2019-10-10 08:32:29 -04:00
Robert Maynard
1de5774d57 Merge topic 'just_infer_execution_signature' 
cf2d62fb9 Remove unneeded ExecutionSignatures
c3f0060cc ExecutionSignatures are now optional for simple worklets
1b08521fa Merge branch 'upstream-taotuple'
c6d309566 taotuple 2019-10-08 (0d1e4dfd)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1882
 2019-10-09 15:44:36 -04:00
Sujin Philip
169049143c Merge branch 'upstream-lcl' into fix-lcl-dashboard 
* upstream-lcl:
  lcl 2019-10-09 (d7604cbf)
 2019-10-09 11:05:19 -04:00
Robert Maynard
1b08521fab Merge branch 'upstream-taotuple' 
* upstream-taotuple:
  taotuple 2019-10-08 (0d1e4dfd)
 2019-10-08 11:13:51 -04:00
Sujin Philip
b0592ce4c8 Switch from VTK-c to LCL 2019-10-07 15:38:36 -04:00
Sujin Philip
f7dced892f Merge branch 'upstream-lcl' into update-vtkc-to-lcl 
* upstream-lcl:
  lcl 2019-10-07 (49094fec)
 2019-10-07 15:37:55 -04:00
Sujin Philip
d0c6d16123 Add update script for LCL 2019-10-07 15:37:34 -04:00
Sujin Philip
e08d862f94 Use Light-Weight Cell Library 2019-09-24 21:22:10 -04:00
Sujin Philip
e56b34fc98 Merge branch 'upstream-vtkc' into use-vtkc 
* upstream-vtkc:
  vtkc 2019-09-24 (cdc72582)
 2019-09-24 21:21:40 -04:00
Sujin Philip
2a6aadc691 Add update file for VTK-c 2019-09-21 16:30:39 -04:00
Sujin Philip
2a1e1dcfd9 Parallel Contour Tree 
This work updates Gunther Contour tree work to be parallel.
With contributions from: @oruebel, @dcamp and @sujin.philip.
 2019-09-12 12:17:37 -04:00
Robert Maynard
c4e1262e14 Correct symbol visibility issues found by ubsan testing 2019-09-11 08:30:49 -04:00
Ben Boeckel
7b8b223c53 Merge topic 'fix-taotuple-import' 
Fix taotuple import

Acked-by: Robert Maynard <robert.maynard@kitware.com
Merge-request: !1801
 2019-08-23 09:00:44 -04:00
Ben Boeckel
f5b3e23573 Merge branch 'upstream-taotuple' into fix-taotuple-import 
* upstream-taotuple:
  taotuple 2019-06-05 (990962ae)
 2019-08-22 14:10:06 -04:00
Ben Boeckel
b366e6b643 taotuple: remove import to reset it 2019-08-22 14:09:59 -04:00
Sujin Philip
8d9991cd71 Merge branch 'upstream-diy' into update-diy 
* upstream-diy:
  diy 2019-08-22 (2153469e)
 2019-08-22 14:04:20 -04:00
Sujin Philip
c0b497cc83 diy: remove in order to reset the import 2019-08-22 14:04:03 -04:00
Diy Upstream
a4d07730cc diy 2019-08-20 (166f7d1b) 
Code extracted from:

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

at commit 166f7d1bf6b4940b9edd3f91c78acf8ea6aa5bca (for/vtk-m).
 2019-08-21 09:16:05 -04:00
Sujin Philip
eea4225d8e Fix update.sh for diy 2019-08-21 09:15:56 -04:00
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