Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 21:33:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity
8,963 Commits 9 Branches 24 Tags 36 MiB
8dcac290d2
Commit Graph

117 Commits

Author SHA1 Message Date
Vicente Adolfo Bolea Sanchez
ff84915bc3 Merge branch 'upstream-diy' into fix-use-c++14-in-every-target 
# By Diy Upstream
* upstream-diy:
  diy 2021-04-12 (bc7dcda5)
 2021-04-12 13:45:01 -04:00
Vicente Adolfo Bolea Sanchez
f60a45bc63 Enforce C++14 in the whole project 
Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
 2021-04-12 13:29:46 -04:00
Vicente Adolfo Bolea Sanchez
02f97325c4 Merge branch 'upstream-lcl' into refactor-use-cpp14 
# By Lightweight Cell Library Upstream
* upstream-lcl:
  lcl 2021-02-08 (6fe1a2d8)
 2021-02-08 17:13:10 +01:00
Robert Maynard
19216a3bd6 Merge branch 'upstream-lcl' into update_thirdparty_for_hip_support 
* upstream-lcl:
  lcl 2020-10-28 (b7fe5404)
 2020-10-28 14:21:28 -04:00
Robert Maynard
913787f3a8 Merge branch 'upstream-diy' into update_thirdparty_for_hip_support 
* upstream-diy:
  diy 2020-10-26 (538957e7)
 2020-10-26 17:20:25 -04:00
Robert Maynard
7c40254d39 diy: update for corrections to allow HIP compilation 2020-10-26 15:07:16 -04:00
Ben Boeckel
f4df3fe007 vtkmdiy: forward the bin install directory to diy 2020-08-26 14:18:33 -04:00
Ben Boeckel
a4b4b1a2c9 Merge branch 'upstream-diy' into HEAD 
# By Diy Upstream
* upstream-diy:
  diy 2020-08-26 (c9efaac9)
 2020-08-26 14:18:31 -04:00
Ben Boeckel
acde82a366 diy: update for install destination fix 2020-08-26 14:17:59 -04:00
Sujin Philip
c35323ae42 Merge branch 'upstream-diy' into update-to-latest-diy 
* upstream-diy:
  diy 2020-07-15 (4ea1241e)
 2020-07-15 15:36:03 -05:00
Sujin Philip
78221a09ed Update diy tag name 2020-07-15 15:35:48 -05:00
Robert Maynard
749a110cd0 Merge branch 'upstream-diy' into update_diy_to_always_build_with_pic 
* upstream-diy:
  diy 2020-07-01 (b0623438)
 2020-07-01 10:48:43 -04:00
Robert Maynard
5a2a26d3fc Update DIY to make sure we always build diy libs with pic enabled 2020-07-01 10:48:18 -04:00
Robert Maynard
a1680ef8bf Merge branch 'upstream-diy' into update_diy_to_namespace_DEBUG_define 
* upstream-diy:
  diy 2020-06-24 (ab765e66)
 2020-07-01 08:28:17 -04:00
Robert Maynard
f7b3d1bca7 Update DIY to not leak the DEBUG define 
Fixes #539
 2020-07-01 08:28:10 -04:00
Sujin Philip
934f085e09 Build diy as a library 
Support both mpi and nompi versions simultaneously.
 2020-06-08 15:57:51 -05:00
Sujin Philip
f0a37ac6aa Merge branch 'upstream-diy' into diy-mpi-nompi 
* upstream-diy:
  diy 2020-06-05 (b62915aa)
 2020-06-08 15:55:58 -05:00
Sujin Philip
6ca2b9f877 Point to new version of Diy 2020-06-08 15:55:38 -05:00
nadavi
02ef5291f5 incorporate -fPIC flag in lodepng when buliding linux 2020-04-24 12:10:35 -06:00
nadavi
b380e702d2 only include the lodepng header when installing 2020-04-22 15:00:19 -06:00
nadavi
62fe68acdd fixes to match old files 2020-04-22 12:18:43 -06:00
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