-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Disallow mixing requirements across PyTorch indexes #13179
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| use std::str::FromStr; | ||
|
|
||
| use pubgrub::Ranges; | ||
| use url::Url; | ||
|
|
||
| use uv_normalize::PackageName; | ||
| use uv_pep440::Version; | ||
| use uv_torch::TorchBackend; | ||
|
|
||
| use crate::pubgrub::{PubGrubDependency, PubGrubPackage, PubGrubPackageInner}; | ||
|
|
||
| #[derive(Debug, Clone, PartialEq, Eq)] | ||
| pub(super) struct SystemDependency { | ||
| /// The name of the system dependency (e.g., `cuda`). | ||
| name: PackageName, | ||
| /// The version of the system dependency (e.g., `12.4`). | ||
| version: Version, | ||
| } | ||
|
|
||
| impl SystemDependency { | ||
| /// Extract a [`SystemDependency`] from an index URL. | ||
| /// | ||
| /// For example, given `https://download.pytorch.org/whl/cu124`, returns CUDA 12.4. | ||
| pub(super) fn from_index(index: &Url) -> Option<Self> { | ||
| let backend = TorchBackend::from_index(index)?; | ||
| let cuda_version = backend.cuda_version()?; | ||
| Some(Self { | ||
| name: PackageName::from_str("cuda").unwrap(), | ||
| version: cuda_version, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| impl std::fmt::Display for SystemDependency { | ||
| fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | ||
| write!(f, "{}@{}", self.name, self.version) | ||
| } | ||
| } | ||
|
|
||
| impl From<SystemDependency> for PubGrubDependency { | ||
| fn from(value: SystemDependency) -> Self { | ||
| PubGrubDependency { | ||
| package: PubGrubPackage::from(PubGrubPackageInner::System(value.name)), | ||
| version: Ranges::singleton(value.version), | ||
| url: None, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use std::str::FromStr; | ||
|
|
||
| use url::Url; | ||
|
|
||
| use uv_normalize::PackageName; | ||
| use uv_pep440::Version; | ||
|
|
||
| use crate::resolver::system::SystemDependency; | ||
|
|
||
| #[test] | ||
| fn pypi() { | ||
| let url = Url::parse("https://pypi.org/simple").unwrap(); | ||
| assert_eq!(SystemDependency::from_index(&url), None); | ||
| } | ||
|
|
||
| #[test] | ||
| fn pytorch_cuda_12_4() { | ||
| let url = Url::parse("https://download.pytorch.org/whl/cu124").unwrap(); | ||
| assert_eq!( | ||
| SystemDependency::from_index(&url), | ||
| Some(SystemDependency { | ||
| name: PackageName::from_str("cuda").unwrap(), | ||
| version: Version::new([12, 4]), | ||
| }) | ||
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn pytorch_cpu() { | ||
| let url = Url::parse("https://download.pytorch.org/whl/cpu").unwrap(); | ||
| assert_eq!(SystemDependency::from_index(&url), None); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For now, this only applies when using
--torch-backend=auto. We could apply it more generally, though we risk breaking some users if they rely on this behavior for reasons that aren't yet clear.