Skip to content
This repository has been archived by the owner on Mar 21, 2024. It is now read-only.

Fix issues so all host/device combinations build and pass tests. #1158

Merged
merged 1 commit into from
Jun 8, 2020

Conversation

alliepiper
Copy link
Collaborator

@alliepiper alliepiper commented May 18, 2020

  • Add more metadata to mock specializations for testing iterator in
    testing/copy.cu.
  • Add missing include to shuffle unit test.
  • Specialize wrapped_function for void return types.
    • MSVC is not a fan of the pattern return static_cast<void>(expr);.
  • Replace deprecated tbb/tbb_thread.h with <thread>.
  • Fix overcounting of initial value in tbb scans.
    • Apparently reverse_join may be called before operator()
  • Use thrust::advance instead of += for generic iterators.
  • Wrap the OMP flags in -Xcompiler for NVCC
  • Extend ASSERT_STATIC_ASSERT skip for HOST=OMP, too
  • Add missing header caught by tbb.cuda configs.
  • Fix 'unsafe API' warnings in examples on MSVC: s/fopen/fstream/

@alliepiper alliepiper requested review from brycelelbach and griwes May 18, 2020 22:37
@alliepiper
Copy link
Collaborator Author

This fixes #1075.

@alliepiper
Copy link
Collaborator Author

CI: 28424174

Copy link
Collaborator

@brycelelbach brycelelbach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look into my comments, and then this looks good to go.

thrust/system/tbb/detail/scan.inl Outdated Show resolved Hide resolved
CMakeLists.txt Show resolved Hide resolved
thrust/detail/function.h Outdated Show resolved Hide resolved
thrust/detail/internal_functional.h Outdated Show resolved Hide resolved
thrust/system/tbb/detail/scan.inl Show resolved Hide resolved
@alliepiper
Copy link
Collaborator Author

I found some issues with the tbb.cuda configuration while testing out multiconfig in #1159. I'll track that down and fix it in this branch before merging.

@alliepiper alliepiper self-assigned this May 27, 2020
@alliepiper alliepiper marked this pull request as draft May 28, 2020 17:34
@alliepiper alliepiper force-pushed the feature/fix_tbb_with_vs branch from 79a6cd5 to 4d4fae1 Compare June 1, 2020 21:31
@alliepiper alliepiper changed the title Get TBB/OpenMP backends working on MSVC Fix issues so all host/device combinations build and pass tests. Jun 1, 2020
@alliepiper
Copy link
Collaborator Author

Rerunning CI in 28484502.

@alliepiper alliepiper added testing: internal ci in progress Currently testing on internal NVIDIA CI (DVS). testing: gpuCI passed Passed gpuCI testing. labels Jun 2, 2020
@alliepiper alliepiper marked this pull request as ready for review June 2, 2020 17:09
- Add more metadata to mock specializations for testing iterator in
    testing/copy.cu.
- Add missing include to shuffle unit test.
- Specialize wrapped_function for void return types.
  - MSVC is not a fan of the pattern `return static_cast<void>(expr);`.
- Replace deprecated `tbb/tbb_thread.h` with `<thread>`.
- Fix overcounting of initial value in tbb scans.
  - Apparently reverse_join may be called before operator()
- Use `thrust::advance` instead of `+=` for generic iterators.
- Wrap the OMP flags in -Xcompiler for NVCC
- Extend ASSERT_STATIC_ASSERT skip for HOST=OMP, too
- Add missing header caught by tbb.cuda configs.
- Fix 'unsafe API' warnings in examples on MSVC: s/fopen/fstream/
@alliepiper alliepiper force-pushed the feature/fix_tbb_with_vs branch from 4d4fae1 to 5fc37c1 Compare June 2, 2020 17:18
@alliepiper alliepiper added testing: internal ci passed Passed internal NVIDIA CI (DVS). and removed testing: internal ci in progress Currently testing on internal NVIDIA CI (DVS). labels Jun 3, 2020
@alliepiper alliepiper merged commit 311f3d8 into NVIDIA:master Jun 8, 2020
@alliepiper alliepiper deleted the feature/fix_tbb_with_vs branch July 3, 2020 20:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
testing: gpuCI passed Passed gpuCI testing. testing: internal ci passed Passed internal NVIDIA CI (DVS).
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants