nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

python3Packages.tensorflow: remove aliases with _2 suffix

Browse Source
This commit is contained in:
Dmitry Kalinkin 2021-11-25 20:17:58 -05:00
parent 5f914776f4
commit 129a609443
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
5 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/mask-rcnn/default.nix
View File

@ -12,7 +12,7 @@
, pillow
, scikitimage
, scipy
, tensorflow_2
, tensorflow
}:
buildPythonPackage rec {
@ -39,7 +39,7 @@ buildPythonPackage rec {
pillow
scikitimage
scipy
tensorflow_2 # Keras only supports tensorflow 2 now
tensorflow
];
meta = with lib; {

8
pkgs/development/python-modules/tensorflow/bin.nix
View File

@ -17,8 +17,8 @@
, wheel
, opt-einsum
, backports_weakref
, tensorflow-estimator_2
, tensorflow-tensorboard_2
, tensorflow-estimator
, tensorflow-tensorboard
, cudaSupport ? false
, cudatoolkit
, cudnn
@ -70,8 +70,8 @@ in buildPythonPackage {
opt-einsum
google-pasta
wrapt
tensorflow-estimator_2
tensorflow-tensorboard_2
tensorflow-estimator
tensorflow-tensorboard
keras-applications
keras-preprocessing
h5py

12
pkgs/development/python-modules/tensorflow/default.nix
View File

@ -3,10 +3,10 @@
# Python deps
, buildPythonPackage, pythonOlder, python
# Python libraries
, numpy, tensorflow-tensorboard_2, absl-py
, numpy, tensorflow-tensorboard, absl-py
, setuptools, wheel, Keras, keras-preprocessing, google-pasta
, opt-einsum, astunparse, h5py
, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_2
, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator
, dill, flatbuffers-python, tblib, typing-extensions
# Common deps
, git, pybind11, which, binutils, glibcLocales, cython, perl
@ -94,8 +94,8 @@ let
setuptools
six
tblib
tensorflow-estimator_2
tensorflow-tensorboard_2
tensorflow-estimator
tensorflow-tensorboard
termcolor
typing-extensions
wheel
@ -457,12 +457,12 @@ in buildPythonPackage {
protobuf
six
tblib
tensorflow-estimator_2
tensorflow-estimator
termcolor
typing-extensions
wrapt
] ++ lib.optionals withTensorboard [
tensorflow-tensorboard_2
tensorflow-tensorboard
];
nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath;

4
pkgs/top-level/python-aliases.nix
View File

@ -96,6 +96,10 @@ mapAliases ({
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02
sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28
tensorflow-bin_2 = self.tensorflow-bin; # added 2021-11-25
tensorflow-build_2 = self.tensorflow-build; # added 2021-11-25
tensorflow-estimator_2 = self.tensorflow-estimator; # added 2021-11-25
tensorflow-tensorboard_2 = self.tensorflow-tensorboard; # added 2021-11-25
topydo = throw "topydo was moved to pkgs.topydo"; # added 2017-09-22
tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05
WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29

19
pkgs/top-level/python-packages.nix
View File

@ -9221,15 +9221,13 @@ in {
tensorboardx = callPackage ../development/python-modules/tensorboardx { };
tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/bin.nix {
tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix {
cudaSupport = pkgs.config.cudaSupport or false;
cudatoolkit = pkgs.cudatoolkit_11_0;
cudnn = pkgs.cudnn_cudatoolkit_11_0;
};
tensorflow-bin = self.tensorflow-bin_2;
tensorflow-build_2 = callPackage ../development/python-modules/tensorflow {
tensorflow-build = callPackage ../development/python-modules/tensorflow {
inherit (pkgs.darwin) cctools;
cudaSupport = pkgs.config.cudaSupport or false;
cudatoolkit = pkgs.cudatoolkit_11_0;
@ -9241,20 +9239,13 @@ in {
lmdb-core = pkgs.lmdb;
};
tensorflow-build = self.tensorflow-build_2;
tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator { };
tensorflow-estimator = self.tensorflow-estimator_2;
tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { };
tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { };
tensorflow = self.tensorflow_2;
tensorflow_2 = self.tensorflow-build_2;
tensorflow = self.tensorflow-build;
tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard { };
tensorflow-tensorboard = self.tensorflow-tensorboard_2;
tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { };
tensorflowWithCuda = self.tensorflow.override {
cudaSupport = true;