Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't use nvjpegGetHardwareDecoderInfo in pre-11.9 NVJPEG #4325

Merged
merged 1 commit into from
Oct 10, 2022

Conversation

mzient
Copy link
Contributor

@mzient mzient commented Oct 10, 2022

Signed-off-by: Michal Zientkiewicz michalz@nvidia.com

Category:

Other (e.g. Documentation, Tests, Configuration)

Description:

With CUDA toolkit 11.8 comes NVJPEG 11.9 which introduces a new function. While we check for its presence at run-time, we don't do it at compile time, rendering NVJPEG decoder not-compilable with older 11.x toolkits.
This PR fixes the issue.

Additional information:

Affected modules and functionalities:

Key points relevant for the review:

Tests:

  • Existing tests apply
  • New tests added
    • Python tests
    • GTests
    • Benchmark
    • Other
  • N/A

Checklist

Documentation

  • Existing documentation applies
  • Documentation updated
    • Docstring
    • Doxygen
    • RST
    • Jupyter
    • Other
  • N/A

DALI team only

Requirements

  • Implements new requirements
  • Affects existing requirements
  • N/A

REQ IDs: N/A

JIRA TASK: N/A

Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>
#if NVJPEG_VER_MAJOR > 11 || \
(NVJPEG_VER_MAJOR == 11 && (NVJPEG_VER_MINOR > 4 || \
(NVJPEG_VER_MINOR == 4 && NVJPEG_VER_PATCH >= 1)))
#define NVJPEG_FLAT_VERSION(major, minor, patch) ((major)*1000000+(minor)*1000+(patch))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Compute a flattened version that's easier to compare.

@JanuszL JanuszL self-assigned this Oct 10, 2022
@dali-automaton
Copy link
Collaborator

CI MESSAGE: [6136182]: BUILD STARTED

@jantonguirao jantonguirao self-assigned this Oct 10, 2022
@dali-automaton
Copy link
Collaborator

CI MESSAGE: [6136182]: BUILD PASSED

@mzient mzient merged commit 869a570 into NVIDIA:main Oct 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants