Skip to content

Limit the upper versions of DALI wheel installation dependencies #5710

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

Merged
merged 2 commits into from
Nov 13, 2024

Conversation

stiepan
Copy link
Member

@stiepan stiepan commented Nov 13, 2024

Category: Bug fix / Other

Description:

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

@stiepan
Copy link
Member Author

stiepan commented Nov 13, 2024

!build

@@ -303,7 +304,7 @@ if(BUILD_NVIMAGECODEC)
message(STATUS "NVIMGCODEC_DEFAULT_INSTALL_PATH=${NVIMGCODEC_DEFAULT_INSTALL_PATH}")
add_definitions(-DNVIMGCODEC_DEFAULT_INSTALL_PATH=\"${NVIMGCODEC_DEFAULT_INSTALL_PATH}\")

set(DALI_INSTALL_REQUIRES_NVIMGCODEC "\'nvidia-nvimgcodec-cu${CUDA_VERSION_MAJOR} >= ${NVIMGCODEC_REQ_VERSION}',")
set(DALI_INSTALL_REQUIRES_NVIMGCODEC "\'nvidia-nvimgcodec-cu${CUDA_VERSION_MAJOR} >= ${NVIMGCODEC_REQ_MIN_VERSION}, <= ${NVIMGCODEC_REQ_MAX_VERSION}',")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
set(DALI_INSTALL_REQUIRES_NVIMGCODEC "\'nvidia-nvimgcodec-cu${CUDA_VERSION_MAJOR} >= ${NVIMGCODEC_REQ_MIN_VERSION}, <= ${NVIMGCODEC_REQ_MAX_VERSION}',")
set(DALI_INSTALL_REQUIRES_NVIMGCODEC "\'nvidia-nvimgcodec-cu${CUDA_VERSION_MAJOR} >= ${NVIMGCODEC_REQ_MIN_VERSION}, < ${NVIMGCODEC_REQ_MAX_VERSION}',")

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree; we know which version doesn't work. I doubt the version with the new API will appear as a patch for 0.3.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure. I just cherry-picked @jantonguirao PR and added other bounds on top of it.

@@ -274,7 +274,8 @@ endif()
##################################################################
set(DALI_INSTALL_REQUIRES_NVIMGCODEC "")
if(BUILD_NVIMAGECODEC)
set(NVIMGCODEC_REQ_VERSION "0.3.0")
set(NVIMGCODEC_REQ_MIN_VERSION "0.3.0")
set(NVIMGCODEC_REQ_MAX_VERSION "0.3.0.5")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
set(NVIMGCODEC_REQ_MAX_VERSION "0.3.0.5")
set(NVIMGCODEC_REQ_MAX_VERSION "0.4")

@dali-automaton
Copy link
Collaborator

CI MESSAGE: [20352442]: BUILD STARTED

@mzient mzient self-assigned this Nov 13, 2024
jantonguirao and others added 2 commits November 13, 2024 13:44
Signed-off-by: Joaquin Anton Guirao <janton@nvidia.com>
Signed-off-by: Kamil Tokarski <ktokarski@nvidia.com>
@stiepan stiepan force-pushed the whl_instal_deps_upper_bound branch from 6446067 to 5f1623e Compare November 13, 2024 12:44
@stiepan stiepan changed the title Limit the upper versions of DALI wheel install dependencies Limit the upper versions of DALI wheel installation dependencies Nov 13, 2024
@dali-automaton
Copy link
Collaborator

CI MESSAGE: [20353711]: BUILD STARTED

@stiepan stiepan merged commit 5b9047e into NVIDIA:main Nov 13, 2024
5 of 6 checks passed
stiepan added a commit that referenced this pull request Nov 13, 2024
* Limit the maximum version of nvimagecodec for current DALI
* Limit the upper versions of DALI wheel installation dependencies
---------

Signed-off-by: Joaquin Anton Guirao <janton@nvidia.com>
Signed-off-by: Kamil Tokarski <ktokarski@nvidia.com>
Co-authored-by: Joaquin Anton Guirao <janton@nvidia.com>
@dali-automaton
Copy link
Collaborator

CI MESSAGE: [20353711]: BUILD PASSED

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.

5 participants