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

tensorflow: Fix compilation with numpy 1.19.x #98083

Merged
merged 1 commit into from Sep 21, 2020

Conversation

@avdv
Copy link
Contributor

avdv commented Sep 16, 2020

Motivation for this change

Current version does not build.

ZHF: #97479

Context: https://hydra.nixos.org/build/126811197/nixlog/1

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Numpy introduced a breaking API change in version 1.19.x, see [1].

There is a simple fix [2] available in the master branch.

[1]: tensorflow/tensorflow#40688
[2]: tensorflow/tensorflow@75ea0b3
@avdv avdv requested review from FRidh and jonringer as code owners Sep 16, 2020
@ofborg ofborg bot added the 6.topic: python label Sep 16, 2020
@ofborg ofborg bot requested a review from abbradar Sep 16, 2020
@avdv avdv mentioned this pull request Sep 17, 2020
1 of 10 tasks complete
@danieldk
Copy link
Member

danieldk commented Sep 20, 2020

@ofborg build python37Packages.tensorflow

@danieldk danieldk changed the title Fix tensorflow building against numpy 1.19.x tensorflow: Fix compilation with numpy 1.19.x Sep 20, 2020
Copy link
Member

danieldk left a comment

LGTM, nice to have this fixed!

Tested CUDA build, confirmed that training works.

@FRidh @jonringer any objections against merging this?

Copy link
Contributor

jonringer left a comment

diff LGTM

@danieldk danieldk merged commit a034f20 into NixOS:master Sep 21, 2020
19 checks passed
19 checks passed
tests tests
Details
action
Details
python37Packages.tensorflow on aarch64-linux No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8f5bfd6"; rev="8f5bfd6af15ef83d3ff17cd278061293cd3a1f58"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8f5bfd6"; rev="8f5bfd6af15ef83d3ff17cd278061293cd3a1f58"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8f5bfd6"; rev="8f5bfd6af15ef83d3ff17cd278061293cd3a1f58"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8f5bfd6"; rev="8f5bfd6af15ef83d3ff17cd278061293cd3a1f58"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8f5bfd6"; rev="8f5bfd6af15ef83d3ff17cd278061293cd3a1f58"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8f5bfd6"; rev="8f5bfd6af15ef83d3ff17cd278061293cd3a1f58"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8f5bfd6"; rev="8f5bfd6af15ef83d3ff17cd278061293cd3a1f58"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
python37Packages.tensorflow on x86_64-linux Success
Details
@avdv avdv deleted the avdv:zhf-fix-tensorflow branch Sep 21, 2020
@avdv avdv mentioned this pull request Sep 21, 2020
0 of 10 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.