python311Packages.tensorflow-bin: 2.15.0 -> 2.16.1#311945
python311Packages.tensorflow-bin: 2.15.0 -> 2.16.1#311945samuela merged 2 commits intoNixOS:masterfrom
Conversation
samuela
left a comment
There was a problem hiding this comment.
diff LGTM happy to merge assuming everything builds fine
56e292c to
e317e98
Compare
|
Result of 14 packages marked as broken and skipped:
18 packages built:
|
|
Result of 14 packages marked as broken and skipped:
18 packages built:
|
e317e98 to
9a6fd43
Compare
| -e "s/Requires-Dist: numpy (.*)/Requires-Dist: numpy/" | ||
| ) | ||
| wheel pack ./unpacked/tensorflow* | ||
| mv *.whl $orig_name # avoid changes to the _os_arch.whl suffix |
There was a problem hiding this comment.
This was making the darwin build fail:
Unpacking to: unpacked/tensorflow-2.16.1...OK
Repacking wheel as ./tensorflow-2.16.1-cp311-cp311-macosx_12_0_arm64.whl...OK
mv: 'tensorflow-2.16.1-cp311-cp311-macosx_12_0_arm64.whl' and './tensorflow-2.16.1-cp311-cp311-macosx_12_0_arm64.whl' are the same file
Apparently, removing it does not make the linux builds fail, so I completely deleted it.
There was a problem hiding this comment.
Apparently this was introduced specifically for darwin: 6a2dad3
There was a problem hiding this comment.
Is it the intention for tensorflow-bin to support multiple versions of tensorflow in a single nixpkgs revision (e.g. through overrides)? I see the attrset entries contain a "version" field. This change might be breaking non-default instantiations of tensorflow-bin, maybe we should test them and if they fail - make the mv conditional rather than remove it. I say "maybe" because I don't know if this feature actually has any users
There was a problem hiding this comment.
Well, as it was introduced as a "fix" for darwin (which it probably was at the time), I assume than we can remove it now... as it is the cause of this new failure.
What is your take on this @veprbl ?
|
Ok, this is good for me ! Summary:
-> @samuela (or anyone) you may merge if no other objection is raised :) |
|
Result of 18 packages marked as broken and skipped:
16 packages built:
|
| "$out/${python.sitePackages}/tensorflow/python/saved_model" | ||
| "$out/${python.sitePackages}/tensorflow/python/util" | ||
| "$out/${python.sitePackages}/tensorflow/tsl/python/lib/core" | ||
| "$out/${python.sitePackages}/tensorflow.libs/" |
There was a problem hiding this comment.
A note for later: I think it's best that we get rid of the custom fixup logic. There are many other places in nixpkgs where implement a similar logic, which was the motivation for the now-abandoned #297590
|
Proceeding with merge. We can handle #311945 (comment) in a future PR |
Description of changes
Changelog: https://github.com/tensorflow/tensorflow/releases/tag/v2.16.1
cc @jyp @abbradar
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.