Skip to content

python311Packages.tensorflow-bin: 2.15.0 -> 2.16.1#311945

Merged
samuela merged 2 commits intoNixOS:masterfrom
GaetanLepage:tensorflow-bin
May 19, 2024
Merged

python311Packages.tensorflow-bin: 2.15.0 -> 2.16.1#311945
samuela merged 2 commits intoNixOS:masterfrom
GaetanLepage:tensorflow-bin

Conversation

@GaetanLepage
Copy link
Contributor

@GaetanLepage GaetanLepage commented May 15, 2024

Description of changes

Changelog: https://github.com/tensorflow/tensorflow/releases/tag/v2.16.1

cc @jyp @abbradar

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.

@GaetanLepage GaetanLepage requested a review from samuela May 15, 2024 13:32
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label May 15, 2024
@GaetanLepage GaetanLepage requested a review from SomeoneSerge May 15, 2024 13:32
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label May 15, 2024
@ofborg ofborg bot requested a review from abbradar May 15, 2024 14:13
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels May 15, 2024
Copy link
Member

@samuela samuela left a comment

Choose a reason for hiding this comment

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

diff LGTM happy to merge assuming everything builds fine

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label May 16, 2024
@GaetanLepage
Copy link
Contributor Author

Result of nixpkgs-review pr 311945 run on x86_64-linux 1

14 packages marked as broken and skipped:
  • python312Packages.argos-translate-files
  • python312Packages.argos-translate-files.dist
  • python312Packages.argostranslate
  • python312Packages.argostranslate.dist
  • python312Packages.ctranslate2
  • python312Packages.ctranslate2.dist
  • python312Packages.faster-whisper
  • python312Packages.faster-whisper.dist
  • python312Packages.tensorflow-bin
  • python312Packages.tensorflow-bin.dist
  • python312Packages.translatehtml
  • python312Packages.translatehtml.dist
  • tts
  • tts.dist
18 packages built:
  • libretranslate (python311Packages.libretranslate)
  • libretranslate.dist (python311Packages.libretranslate.dist)
  • python311Packages.argos-translate-files
  • python311Packages.argos-translate-files.dist
  • python311Packages.argostranslate
  • python311Packages.argostranslate.dist
  • python311Packages.ctranslate2
  • python311Packages.ctranslate2.dist
  • python311Packages.faster-whisper
  • python311Packages.faster-whisper.dist
  • python311Packages.tensorflow-bin
  • python311Packages.tensorflow-bin.dist
  • python311Packages.translatehtml
  • python311Packages.translatehtml.dist
  • whisper-ctranslate2
  • whisper-ctranslate2.dist
  • wyoming-faster-whisper
  • wyoming-faster-whisper.dist

@GaetanLepage
Copy link
Contributor Author

Result of nixpkgs-review pr 311945 run on aarch64-linux 1

14 packages marked as broken and skipped:
  • python312Packages.argos-translate-files
  • python312Packages.argos-translate-files.dist
  • python312Packages.argostranslate
  • python312Packages.argostranslate.dist
  • python312Packages.ctranslate2
  • python312Packages.ctranslate2.dist
  • python312Packages.faster-whisper
  • python312Packages.faster-whisper.dist
  • python312Packages.tensorflow-bin
  • python312Packages.tensorflow-bin.dist
  • python312Packages.translatehtml
  • python312Packages.translatehtml.dist
  • tts
  • tts.dist
18 packages built:
  • libretranslate (python311Packages.libretranslate)
  • libretranslate.dist (python311Packages.libretranslate.dist)
  • python311Packages.argos-translate-files
  • python311Packages.argos-translate-files.dist
  • python311Packages.argostranslate
  • python311Packages.argostranslate.dist
  • python311Packages.ctranslate2
  • python311Packages.ctranslate2.dist
  • python311Packages.faster-whisper
  • python311Packages.faster-whisper.dist
  • python311Packages.tensorflow-bin
  • python311Packages.tensorflow-bin.dist
  • python311Packages.translatehtml
  • python311Packages.translatehtml.dist
  • whisper-ctranslate2
  • whisper-ctranslate2.dist
  • wyoming-faster-whisper
  • wyoming-faster-whisper.dist

-e "s/Requires-Dist: numpy (.*)/Requires-Dist: numpy/"
)
wheel pack ./unpacked/tensorflow*
mv *.whl $orig_name # avoid changes to the _os_arch.whl suffix
Copy link
Contributor Author

Choose a reason for hiding this comment

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

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.

Copy link
Contributor

Choose a reason for hiding this comment

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

Apparently this was introduced specifically for darwin: 6a2dad3

Copy link
Contributor

@SomeoneSerge SomeoneSerge May 18, 2024

Choose a reason for hiding this comment

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

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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 ?

@GaetanLepage
Copy link
Contributor Author

GaetanLepage commented May 17, 2024

Ok, this is good for me !

Summary:

  • Everything builds fine on both x86_64-linux and aarch64-linux (successful nixpkgs-review)
  • The x86_64-darwin version is not available because it depends on the broken python311Packages.jaxlib package.
  • It builds fine on aarch64-darwin but I cannot run nixpkgs-review because of moneydance: 2023.3_5064 -> 2024.1_5118 #306372 (comment). However, building python311Packages.ctranslate2 works fine !
    Everything builds fine on aarch64-darwin (successful nixpkgs-review)

-> @samuela (or anyone) you may merge if no other objection is raised :)

@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one person. label May 17, 2024
@GaetanLepage
Copy link
Contributor Author

Result of nixpkgs-review pr 311945 run on aarch64-darwin 1

18 packages marked as broken and skipped:
  • libretranslate
  • libretranslate.dist
  • python311Packages.libretranslate
  • python311Packages.libretranslate.dist
  • python312Packages.argos-translate-files
  • python312Packages.argos-translate-files.dist
  • python312Packages.argostranslate
  • python312Packages.argostranslate.dist
  • python312Packages.ctranslate2
  • python312Packages.ctranslate2.dist
  • python312Packages.faster-whisper
  • python312Packages.faster-whisper.dist
  • python312Packages.tensorflow-bin
  • python312Packages.tensorflow-bin.dist
  • python312Packages.translatehtml
  • python312Packages.translatehtml.dist
  • tts
  • tts.dist
16 packages built:
  • python311Packages.argos-translate-files
  • python311Packages.argos-translate-files.dist
  • python311Packages.argostranslate
  • python311Packages.argostranslate.dist
  • python311Packages.ctranslate2
  • python311Packages.ctranslate2.dist
  • python311Packages.faster-whisper
  • python311Packages.faster-whisper.dist
  • python311Packages.tensorflow-bin
  • python311Packages.tensorflow-bin.dist
  • python311Packages.translatehtml
  • python311Packages.translatehtml.dist
  • whisper-ctranslate2
  • whisper-ctranslate2.dist
  • wyoming-faster-whisper
  • wyoming-faster-whisper.dist

@GaetanLepage GaetanLepage requested a review from veprbl May 18, 2024 12:05
"$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/"
Copy link
Contributor

Choose a reason for hiding this comment

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

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

@samuela
Copy link
Member

samuela commented May 19, 2024

Proceeding with merge. We can handle #311945 (comment) in a future PR

@samuela samuela merged commit 56a8cf4 into NixOS:master May 19, 2024
@GaetanLepage GaetanLepage deleted the tensorflow-bin branch May 19, 2024 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants