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

Adding CUB Version Check #1082

Merged
merged 1 commit into from
Apr 20, 2020
Merged

Adding CUB Version Check #1082

merged 1 commit into from
Apr 20, 2020

Conversation

Balnian
Copy link
Contributor

@Balnian Balnian commented Mar 30, 2020

  • Added exact version match check of CUB to Thrust (if CUB version is not exactly the same as the Thrust version, a compilation error will occur)
  • Added escape hatch preprocessor define to avoid the version checking

Bug 2880957

@Balnian Balnian added the nvbug Has an associated internal NVIDIA NVBug. label Mar 30, 2020
@Balnian Balnian self-assigned this Mar 30, 2020
@brycelelbach brycelelbach added this to the 1.9.9 milestone Apr 20, 2020
brycelelbach
brycelelbach approved these changes Apr 20, 2020
View reviewed changes
thrust/system/cuda/config.h Outdated
#include <thrust/version.h>
#include <cub/version.cuh>
#if THRUST_VERSION != CUB_VERSION
#error Thrust version must match cub version exactly. Define THRUST_IGNORE_CUB_VERSION_CHECK to ignore.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Let's change the text to: "The version of CUB in your include path is not compatible with this release of Thrust. Define THRUST_IGNORE_CUB_VERSION_CHECK to ignore this."

@Balnian Balnian force-pushed the feature/CUB_Version_Check branch 2 times, most recently from 2f3d0c5 to 50c0d3e Compare April 20, 2020 20:32
@Balnian
Adding CUB Version Check
50c0d3e 
Bug 2880957

Reviewed-by:  Bryce Adelstein Lelbach aka wash <[email protected]>
Reviewed-by: Allison Vacanti <[email protected]>
@Balnian Balnian merged commit 91e5e33 into NVIDIA:master Apr 20, 2020
@leofang leofang mentioned this pull request May 29, 2020
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@brycelelbach brycelelbach brycelelbach approved these changes

@alliepiper alliepiper alliepiper approved these changes

Assignees

@Balnian Balnian

Labels
nvbug Has an associated internal NVIDIA NVBug.
Projects
None yet
Milestone
1.9.9
Development

Successfully merging this pull request may close these issues.
3 participants
@Balnian @alliepiper @brycelelbach