Fix CUDA 10.0 compilation #2917
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
!build |
|
CI MESSAGE: [2324287]: BUILD STARTED |
|
CI MESSAGE: [2324292]: BUILD STARTED |
|
CI MESSAGE: [2324292]: BUILD FAILED |
- moves isHWDecoderSupported to CUDA 11 ifdef as it uses HasHwDecoder function not available for CUDA 10 Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
JanuszL
force-pushed
the
fix_cuda10_compilation
branch
from
ab4ef8a
to
ff91cc4
Compare
|
CI MESSAGE: [2324541]: BUILD STARTED |
|
CI MESSAGE: [2324543]: BUILD STARTED |
|
CI MESSAGE: [2324287]: BUILD FAILED |
|
CI MESSAGE: [2324543]: BUILD PASSED |
|
CI MESSAGE: [2324541]: BUILD FAILED |
|
CI MESSAGE: [2324541]: BUILD PASSED |
szalpal
approved these changes
May 4, 2021
mzient
reviewed
May 5, 2021
| @@ -74,7 +74,7 @@ class nvJPEGDecoder : public Operator<MixedBackend>, CachedDecoderImpl { | |||
| nvjpeg2k_thread_(1, | |||
| spec.GetArgument<int>("device_id"), | |||
| spec.GetArgument<bool>("affine")) { | |||
| #if NVJPEG_VER_MAJOR >= 11 | |||
| #if NVJPEG_VER_MAJOR >= 11 && NVJPEG_VER_MINOR >= 1 | |||
There was a problem hiding this comment.
Technically this is wrong, because for 12.0 the condition would fail.
Suggested change
| #if NVJPEG_VER_MAJOR >= 11 && NVJPEG_VER_MINOR >= 1 | |
| #if NVJPEG_VER_MAJOR > 11 || (NVJPEG_VER_MAJOR == 11 && NVJPEG_VER_MINOR >= 1) |
mzient
reviewed
May 5, 2021
| @@ -558,7 +558,7 @@ class nvJPEGDecoder : public Operator<MixedBackend>, CachedDecoderImpl { | |||
|
|
|||
| // only when we have ROI info check if nvjpegDecodeBatchedSupportedEx supports it | |||
| if (nvjpeg_decode) { | |||
| #if NVJPEG_VER_MAJOR >= 11 | |||
| #if NVJPEG_VER_MAJOR >= 11 && NVJPEG_VER_MINOR >= 1 | |||
There was a problem hiding this comment.
Suggested change
| #if NVJPEG_VER_MAJOR >= 11 && NVJPEG_VER_MINOR >= 1 | |
| #if NVJPEG_VER_MAJOR > 11 || (NVJPEG_VER_MAJOR == 11 && NVJPEG_VER_MINOR >= 1) |
Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
|
CI MESSAGE: [2336625]: BUILD STARTED |
|
CI MESSAGE: [2336626]: BUILD STARTED |
mzient
approved these changes
May 5, 2021
|
CI MESSAGE: [2336626]: BUILD FAILED |
|
CI MESSAGE: [2336625]: BUILD FAILED |
|
CI MESSAGE: [2336625]: BUILD PASSED |
|
CI MESSAGE: [2336626]: BUILD PASSED |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
function not available for CUDA 10
Signed-off-by: Janusz Lisiecki jlisiecki@nvidia.com
Why we need this PR?
Pick one, remove the rest
What happened in this PR?
Fill relevant points, put NA otherwise. Replace anything inside []
moves isHWDecoderSupported to CUDA 11 ifdef as it uses HasHwDecoder function not available for CUDA 10
nvml.h
NA
CI build for CUDA 10.0
NA
JIRA TASK: [NA]