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

python312Packages.torch: unroll recursive git retrieval #277789

Merged
merged 1 commit into from
Dec 15, 2024

Conversation

zeuner
Copy link
Contributor

@zeuner zeuner commented Dec 30, 2023

Description of changes

This PR replaces the recursive fetch of the package source by non-recursive fetches of the corresponding (sub-)modules. This allows using the more efficient specialized fetchers, is more robust in presence of network issues, and allows for reusing sub-modules if they don't change between updates. Furthermore, it can be a starting point for reducing code duplication caused by the sub-modules.

Fixes #276585

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot requested review from thoughtpolice, tscholak and teh December 30, 2023 21:27
@zeuner zeuner force-pushed the pytorch-unroll-2-1-2 branch from 510deef to bf48e15 Compare March 11, 2024 21:52
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label May 3, 2024
@zeuner zeuner force-pushed the pytorch-unroll-2-1-2 branch 2 times, most recently from a639010 to 1495e3a Compare October 9, 2024 11:15
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 9, 2024
@zeuner zeuner changed the title python311Packages.torch: unroll recursive git retrieval python312Packages.torch: unroll recursive git retrieval Oct 9, 2024
@FliegendeWurst FliegendeWurst added the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 31, 2024
Copy link
Member

@FliegendeWurst FliegendeWurst left a comment

Choose a reason for hiding this comment

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

There is a merge conflict

@zeuner zeuner force-pushed the pytorch-unroll-2-1-2 branch from 1495e3a to ce4850e Compare November 1, 2024 00:36
@zeuner
Copy link
Contributor Author

zeuner commented Nov 1, 2024

There is a merge conflict

Yes... not too surprisingly, there has been another upstream version merged.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 1, 2024
};
# the following expression has been generated using
# https://codeberg.org/gm6k/git-unroll
src =
Copy link
Member

Choose a reason for hiding this comment

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

Given the size of this expression, I think it would be best to outsource it to a new file src.nix or similar.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point. I'm now also exposing an update script through passthru.unroll-src.

@zeuner zeuner force-pushed the pytorch-unroll-2-1-2 branch from ce4850e to db4a2a8 Compare November 1, 2024 10:36
@zeuner
Copy link
Contributor Author

zeuner commented Nov 1, 2024

There is a merge conflict

Yes... not too surprisingly, there has been another upstream version merged.

again...

@zeuner zeuner force-pushed the pytorch-unroll-2-1-2 branch from db4a2a8 to c243f04 Compare November 3, 2024 21:47
@@ -219,6 +223,27 @@ let
"Rocm support is currently broken because `rocmPackages.hipblaslt` is unpackaged. (2024-06-09)" =
rocmSupport;
};

git-unroll = fetchFromGitea {
Copy link
Member

@FliegendeWurst FliegendeWurst Nov 4, 2024

Choose a reason for hiding this comment

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

This could be its own package, since it is also useful elsewhere. Can be done in another PR eventually

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 4, 2024
@FliegendeWurst FliegendeWurst merged commit 2bdbe4c into NixOS:master Dec 15, 2024
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

python3Packages.torch: redundancy and fragility fetching source
3 participants