Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d841f374c6c5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 299c95ac165e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 30, 2020

  1. tensorflow1: disable sysctl.h in hwloc 

    We need to override tensorflow's hwloc configuration, since it forces
sysctl.h usage which is removed since glibc 2.31. This does not appear
to effect tensorflow2.

See also tensorflow/tensorflow#45861

Fixes #104801
    @matthewbauer
    matthewbauer committed Dec 30, 2020
    Copy the full SHA
    a9ecac2 View commit details

Commits on Jan 1, 2021

  1. Merge pull request #107944 from matthewbauer/tensorflow-no-sysctl 

    tensorflow1: disable sysctl.h in hwloc
    @matthewbauer
    matthewbauer authored Jan 1, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    299c95a View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/development/python-modules/tensorflow/1/default.nix
5 changes: 5 additions & 0 deletions pkgs/development/python-modules/tensorflow/1/default.nix
View file
Original file line number Diff line number Diff line change
@@ -258,6 +258,11 @@ let
substituteInPlace tensorflow/tools/pip_package/setup.py \
--replace "numpy >= 1.16.0, < 1.19.0" "numpy >= 1.16.0"
# glibc 2.31+ does not have sys/sysctl.h
# see https://github.com/tensorflow/tensorflow/issues/45861
substituteInPlace third_party/hwloc/BUILD.bazel\
--replace "#define HAVE_SYS_SYSCTL_H 1" "#undef HAVE_SYS_SYSCTL_H"
'';

preConfigure = let