Commit Graph

1616 Commits

Author SHA1 Message Date
Robert Maynard
55280637f8 Correct the VTKM_THIRDPARTY_PRE_INCLUDE/POST_INCLUDE for MSVC.
We now properly suppress a collection of warnings from thirdparty headers on
windows.
2016-03-11 09:59:49 -05:00
Robert Maynard
19dc5672bf Correct CUDA fallback to "fermi" when trying to do auto detection.
The logic would properly fall to fermi, but not set the proper NVCC flags
to actually compile targeting the fermi compute architecture.
2016-03-10 16:28:54 -05:00
Robert Maynard
5df0cf42fe Merge topic 'suppress_thrust_warnings_on_windows'
8c579b77 Setup VTKM_THIRDPARTY_PRE_INCLUDE/POST_INCLUDE for MSVC.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !352
2016-03-10 16:09:30 -05:00
Robert Maynard
8c579b7742 Setup VTKM_THIRDPARTY_PRE_INCLUDE/POST_INCLUDE for MSVC.
We now suppress a collection of warnings from thirdparty headers on windows.
2016-03-10 13:31:21 -05:00
Matt Larsen
5ddade7a44 Adding some basic documentation on atomics. 2016-03-09 14:29:59 -05:00
Robert Maynard
63ff43c613 Merge topic 'increase_timeout_on_cuda_worklet_tests'
559d2aab CUDA based worklets should now not timeout.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !350
2016-03-09 08:52:02 -05:00
Robert Maynard
559d2aab94 CUDA based worklets should now not timeout.
The first CUDA worklet test requires way more time because of the overhead to
allow the driver to convert the kernel code from virtual arch to actual arch.
2016-03-09 08:09:21 -05:00
Matt Larsen
e5c4aa3f78 Fixing cuda index error 2016-03-08 12:41:11 -08:00
Matt Larsen
00a7f6c14b Correcting function call 2016-03-08 12:04:55 -08:00
Matt Larsen
249cce352b Adding type restrictions to serial atomics 2016-03-08 10:39:23 -08:00
Matt Larsen
43131ee02b Adding comments about CAS 2016-03-08 09:58:20 -08:00
Matt Larsen
40b6db7eee Inserted missing , 2016-03-08 09:51:50 -08:00
Matt Larsen
3b46706e1f Adding compare and swap and removing unsigned atomics 2016-03-08 09:41:02 -08:00
Matt Larsen
12632de34b Casting Uint64 to long long 2016-03-04 15:17:56 -08:00
Matt Larsen
ecc12dddb7 using reinterpret cast and removing warning from atomic array test 2016-03-04 14:46:45 -08:00
Matt Larsen
72f2549bb9 Removing shadow variable 2016-03-04 12:12:25 -08:00
Matt Larsen
f3c7f188ee Fixing problem with function signatures matching long * to int * 2016-03-04 11:52:52 -08:00
Matt Larsen
733edc8325 changing MS method signatures to long instead of int 2016-03-04 11:13:53 -08:00
Matt Larsen
47452d82bc fixing typo 2016-03-04 10:49:43 -08:00
Matt Larsen
6d63961311 Misplaced bracket 2016-03-04 10:42:07 -08:00
Matt Larsen
da66ea6a15 Refactoring TBB atomics 2016-03-04 10:18:35 -08:00
Matt Larsen
e8b08f2e00 Merge branch 'master' into feature/atomics 2016-03-04 08:03:33 -08:00
Matt Larsen
f0f8f0b556 attempt 6 2016-03-03 23:36:21 -05:00
Matt Larsen
5df9088e1d Adding volatile 2016-03-03 23:13:26 -05:00
Matt Larsen
25604a0288 Another typo 2016-03-03 22:46:15 -05:00
Matt Larsen
4a28124658 Fixing typo 2016-03-03 22:17:29 -05:00
Matt Larsen
29ca4f38f6 Attempting type match 2016-03-03 19:42:35 -05:00
Matt Larsen
1448d0d3b4 Adding another typename 2016-03-03 16:04:04 -05:00
Matt Larsen
23e801da55 Adding typename 2016-03-03 15:34:44 -05:00
Matt Larsen
f0c20903b3 Sorting out iterator type 2016-03-03 15:30:28 -05:00
Matt Larsen
9a9f3a1d22 Forcing test 2016-03-02 17:41:19 -05:00
mclarsen
78888e6542 Testing Interlock exchange 2016-03-02 13:53:28 -08:00
Robert Maynard
7ca13aa9cd Merge topic 'add_missing_return_statement_to_ArrayHandleGroupVec'
230e651d Add missing return statement to ArrayHandleGroupVec

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !348
2016-02-26 15:02:59 -05:00
Robert Maynard
7c84e32835 Merge topic 'correct_namespace_for_ChooseCudaDevice'
2f98cdf7 Resolves Issue #56: ChooseCudaDevice functions are in the proper namespace.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !347
2016-02-26 14:38:17 -05:00
Robert Maynard
90071d824e Merge topic 'more_control_of_explicitset'
9f687a64 Derived CellSetExplicit classes can now modify the incremental build state.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !343
2016-02-26 14:27:27 -05:00
Robert Maynard
230e651d1b Add missing return statement to ArrayHandleGroupVec 2016-02-26 14:26:22 -05:00
Robert Maynard
2f98cdf717 Resolves Issue #56: ChooseCudaDevice functions are in the proper namespace. 2016-02-26 13:51:28 -05:00
Chuck Atkins
44bc930090 Merge topic 'fix-cuda-arch-detection'
b47982f7 Check return error codes when detecting CUDA capabilities.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !346
2016-02-25 15:28:19 -05:00
Robert Maynard
9f687a64f3 Derived CellSetExplicit classes can now modify the incremental build state. 2016-02-24 08:38:11 -05:00
Robert Maynard
f53c8af170 Merge topic 'vtk_vtkm_idtype_matching'
4a7085f4 Update VecTraits/TypeTraits to include types that VTK uses.
8820c0fb Make sure vtk and vtkm types match when long and long long are both 8bytes.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !339
2016-02-23 16:10:30 -05:00
Robert Maynard
65fd208e7f Merge topic 'cdash_upload_by_https'
b507b445 Switch over to uploading by https as that is required by cdash.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !345
2016-02-23 15:03:02 -05:00
Robert Maynard
b507b4457e Switch over to uploading by https as that is required by cdash.
This will also verify that all the build machines have a version of cmake
that has ssl enabled.
2016-02-23 14:03:52 -05:00
Chuck Atkins
b47982f7e4 Check return error codes when detecting CUDA capabilities. 2016-02-23 10:07:32 -05:00
Robert Maynard
ad0efb7c0e Merge topic 'update_cmake_install_rules'
bb904939 Resolves Issue 52, we now install all vtkm files correctly.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !342
2016-02-23 09:09:29 -05:00
Robert Maynard
ba59add541 Merge topic 'teach_FindBoostHeaders_about_boost_160'
bb7ed34e Teach FindBoostHeaders.cmake about boost 1.60

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !344
2016-02-23 08:42:17 -05:00
Robert Maynard
bb7ed34ed5 Teach FindBoostHeaders.cmake about boost 1.60 2016-02-22 16:00:00 -05:00
Robert Maynard
bb90493920 Resolves Issue 52, we now install all vtkm files correctly. 2016-02-22 14:20:35 -05:00
Robert Maynard
4a7085f415 Update VecTraits/TypeTraits to include types that VTK uses. 2016-02-22 14:20:25 -05:00
Robert Maynard
8820c0fbc8 Make sure vtk and vtkm types match when long and long long are both 8bytes.
Previously vtk would use long long and vtkm would use long, which would
cause nightmares when trying to do zero copy between the two libraries.
2016-02-22 14:20:25 -05:00
Robert Maynard
ea817bc7b8 Merge topic 'examples_use_updated_cuda_found_var'
ad4f6c64 All examples now use the proper CMake CUDA found variable.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !341
2016-02-22 14:17:19 -05:00