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

1540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Maynard
b8f28d6dee Merge topic 'properly_specify_fermi_when_cuda_autodetect_fails' 
19dc5672 Correct CUDA fallback to "fermi" when trying to do auto detection.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !353
 2016-03-11 10:04:51 -05:00
Robert Maynard
ba202cc1c8 Merge topic 'suppress_thrust_warnings_on_windows' 
55280637 Correct the VTKM_THIRDPARTY_PRE_INCLUDE/POST_INCLUDE for MSVC.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !354
 2016-03-11 10:04:16 -05:00
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
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
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
Robert Maynard
ad4f6c6485 All examples now use the proper CMake CUDA found variable. 2016-02-22 11:25:15 -05:00
Sujin Philip
14a01ef03a Merge topic 'add-knl-opt-flags' 
e79b8ff2 Add vectorization flags for KNL
0900e0c0 Fix how the vectorization flags are specified

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !340
 2016-02-22 08:55:45 -05:00
Sujin Philip
e79b8ff238 Add vectorization flags for KNL 2016-02-19 11:43:24 -05:00
Sujin Philip
0900e0c06c Fix how the vectorization flags are specified 
For intel compilers, specifying multiple flags will result in warnings and
the last flag overrides previous flags.
 2016-02-19 11:43:17 -05:00
Robert Maynard
e121a67c8e Merge topic 'correct_avx_options_for_intel' 
8589df3d Correct avx options when using the intel compiler.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !338
 2016-02-18 15:17:03 -05:00
Robert Maynard
8589df3df8 Correct avx options when using the intel compiler. 2016-02-18 14:58:39 -05:00
Robert Maynard
7161baacd1 Merge topic 'more_cellset_dimensionality_docs' 
3f2c68a4 Finish writing the comment explaining what GetDimensionality values mean.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !335
 2016-02-03 14:16:19 -05:00
Robert Maynard
3f2c68a4d6 Finish writing the comment explaining what GetDimensionality values mean. 2016-02-03 13:35:10 -05:00
Robert Maynard
07d299209e Merge topic 'fix/ExecutionWholeArray' 
5b705a52 Fixing return value for void function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !334
 2016-01-27 15:57:40 -05:00
Kenneth Moreland
8cdf2aa7e5 Merge branch 'msvc-warnings' into 'master' 
Fix MSVC warnings

Fix your typical batch of MSVC warnings including picky type conversions
and using "unsafe" std functions on pointers for iterators.

See merge request !333
 2016-01-27 13:02:15 -05:00
mclarsen
5b705a5239 Fixing return value for void function 2016-01-27 08:07:20 -08:00
Kenneth Moreland
f4e4dc9ebe Use serial device for copies in DataSetBuilderRectilinear 
A previous change used the Copy method of DeviceAdapterAlgorithm to
perform the actual copy in the CopyInto method. This works fine, except
that it uses the default device adapter, and the default device adapter
may need to copy the data to the device just to copy it to another
array. Instead, use the serial device adapter, which is guaranteed to
only perform one copy of the data.
 2016-01-27 08:45:29 -07:00
Kenneth Moreland
0731bd4a53 Fix compiler error about difference_type 
Whoops. Pointers are not classes and do not have a difference_type
member. You have to get that from iterator_traits. I'm not sure why this
succeeded on MSVC, but it was clearly wrong.
 2016-01-26 17:09:10 -07:00
Kenneth Moreland
cadf0e53ab Fix MSVC warnings 
Fix your typical batch of MSVC warnings including picky type conversions
and using "unsafe" std functions on pointers for iterators.
 2016-01-26 16:23:00 -07:00
Robert Maynard
2e97c2bc40 Merge topic 'correct_cuda_runtime_crashes' 
821096cf Perform necessary copies when deducing a worklets parameters.
bd3d2957 Fix ArrayPortalFromThrust to re-enable texture memory fast path.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !331
 2016-01-26 17:01:57 -05:00
Robert Maynard
b09fb3edf5 Merge topic 'update_interop_to_use_CopyInto' 
711b7122 Remove warnings from CopyInto with MSVC.
763691a7 Update TransferToOpenGL to use ArrayHandle::CopyInto.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !328
 2016-01-26 16:07:23 -05:00
Robert Maynard
6ad3f115ab Merge topic 'reenable_cuda_texture_fastpath' 
b2cd41d7 Fix ArrayPortalFromThrust to re-enable texture memory fast path.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !330
 2016-01-26 15:41:52 -05:00
Robert Maynard
821096cfd7 Perform necessary copies when deducing a worklets parameters. 
As part of the work to reduce the number of copies of array handles the CUDA
backend was broken. The transportation of stack allocated classes to CUDA
relies on all member variables being value based, not references/pointers.
This correct the issue of sending references to host side memory to CUDA, at
the cost of two copies of the Invocation object.

When we move to C++11 we need to revisit this work and see if std::move
can help reduce the cost of these copies.
 2016-01-26 15:08:46 -05:00
Robert Maynard
bd3d29577a Fix ArrayPortalFromThrust to re-enable texture memory fast path. 2016-01-26 14:30:25 -05:00
Robert Maynard
b2cd41d765 Fix ArrayPortalFromThrust to re-enable texture memory fast path. 2016-01-26 14:29:52 -05:00
Robert Maynard
bad060acd6 Merge topic 'remove_global_compile_options' 
ee368d0d Do not add c++ compiler optimizations to all compilers, but on a target basis.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !329
 2016-01-26 14:24:24 -05:00
Sujin Philip
3b94d350f4 Merge topic 'fix-VTKM_VECTORIZATION_IN_LOOP-placement' 
6efc1920 Fix VTKM_VECTORIZATION_IN_LOOP placement

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !321
 2016-01-25 16:03:16 -05:00
Robert Maynard
ee368d0d68 Do not add c++ compiler optimizations to all compilers, but on a target basis. 
As reported in Issue #54 the add_compile_options pollutes the global compile
flags. Instead we provided cmake flags for people to use.
 2016-01-25 14:38:06 -05:00
Robert Maynard
711b7122dc Remove warnings from CopyInto with MSVC. 2016-01-25 14:33:46 -05:00