Skip to content

python312Packages.tensorflow: use tensorflow-bin by default #345658

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.

Sign up for GitHub

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

Merged
SomeoneSerge merged 3 commits into from
Nov 25, 2024
Merged

python312Packages.tensorflow: use tensorflow-bin by default #345658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb13561
python312Packages.tensorflow: use tensorflow-bin by default
GaetanLepage Oct 1, 2024
804211c
python312Packages.tf-keras: clean derivation
GaetanLepage Oct 1, 2024
a076a88
python312Packages.keras: add missing dependency distutils
GaetanLepage Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkgs/development/python-modules/keras/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
packaging,
rich,
tensorflow,
pythonAtLeast,
distutils,
}:

buildPythonPackage rec {
Expand Down Expand Up @@ -48,7 +50,7 @@ buildPythonPackage rec {
packaging
rich
tensorflow
];
] ++ lib.optionals (pythonAtLeast "3.12") [ distutils ];

pythonImportsCheck = [
"keras"
Expand Down
18 changes: 6 additions & 12 deletions pkgs/development/python-modules/tf-keras/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchPypi,

# build-system
setuptools,
wheel,

# dependencies
numpy,
tensorflow,

# tests
pytestCheckHook,
}:

Expand All @@ -15,24 +19,14 @@ buildPythonPackage rec {
version = "2.17.0";
pyproject = true;

disabled = pythonOlder "3.9";

src = fetchPypi {
pname = "tf_keras";
inherit version;
hash = "sha256-/al8GNow2g9ypafoDz7uNDsJ9MIG2tbFfJRPss0YVg4=";
};

nativeBuildInputs = [
];

pythonRelaxDeps = [
"tensorflow"
];

build-system = [
setuptools
wheel
];

dependencies = [
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4098,7 +4098,7 @@ with pkgs;

tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };

libtensorflow = python3.pkgs.tensorflow.libtensorflow;
libtensorflow = python3.pkgs.tensorflow-build.libtensorflow;

libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { };

Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15399,7 +15399,7 @@ self: super: with self; {

tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { };

tensorflow = self.tensorflow-build;
tensorflow = self.tensorflow-bin;

tensorflowWithCuda = self.tensorflow.override {
cudaSupport = true;
Expand Down