Fixes detection of CuPy installed with pre-built wheels #1965
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
The CuPy library ships both a source distribution (`cupy`) as well as versions containing pre-built wheels (`cupy-cuda11x`, `cupy-cuda12x`, `cupy-rocm-5-0`, `cupy-rocm-4-3`). Use of `_is_package_available` to detect CuPy only works for the source distribution of CuPy and fails when using the pre-built wheels versions. This is because the `_is_package_available` will always attempt to resolve version information (even if it's not required) and in doing so assumes that the _importable_ package name matches the _installed_ distribution name. While this is usually the case, it doesn't work for CuPy and several other libraries. ONNX Runtime for example might be installed as `onnxruntime` or `onnxruntime-gpu` and thus Optimum just uses `importlib.util.find_spec` to work around the same problem. This commit replicates the same solution for CuPy.
|
Thank you for the fix ! |
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.
What does this PR do?
This PR fixes discovery of CuPy when it's installed using one of the distributions of pre-built wheels.
The CuPy library ships both a source distribution (
cupy) as well as versions containing pre-built wheels (cupy-cuda11x,cupy-cuda12x,cupy-rocm-5-0,cupy-rocm-4-3). Use of_is_package_availableto detect CuPy only works for the source distribution of CuPy and fails when using the pre-built wheels versions.This is because the
_is_package_availablewill always attempt to resolve version information (even if it's not required) and in doing so assumes that the importable package name matches the installed distribution name. While this is usually the case, it doesn't work for CuPy and several other libraries. ONNX Runtime for example might be installed asonnxruntimeoronnxruntime-gpuand thus Optimum just usesimportlib.util.find_specto work around the same problem. This commit replicates the same solution for CuPy.Fixes #1925
Who can review?
@fxmarty, @echarlaix, @JingyaHuang, @michaelbenayoun