git.iko.soy/typeable/nixpkgs
on master help sign in
python3Packages.tensorflow: remove aliases with _2 suffix
commit129a60944321ce8754e3d191f7641aae4e237896 authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateThu 25 Nov 2021, 20:17 (5 years ago) parent5f91477
5 files changed+21−26
compare with master
unifiedsplit
pkgs/development/python-modules/mask-rcnn/default.nix+2−2 pkgs/development/python-modules/tensorflow/bin.nix+4−4 pkgs/development/python-modules/tensorflow/default.nix+6−6 pkgs/top-level/python-aliases.nix+4 pkgs/top-level/python-packages.nix+5−14
pkgs/development/python-modules/mask-rcnn/default.nix+2−2
@@ -12,7 +12,7 @@
1212, pillow
1313, scikitimage
1414, scipy
15−, tensorflow_2
15+, tensorflow
1616}:
1717
1818buildPythonPackage rec {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
3939 pillow
4040 scikitimage
4141 scipy
42− tensorflow_2 # Keras only supports tensorflow 2 now
42+ tensorflow
4343 ];
4444
4545 meta = with lib; {
pkgs/development/python-modules/tensorflow/bin.nix+4−4
@@ -17,8 +17,8 @@
1717, wheel
1818, opt-einsum
1919, backports_weakref
20−, tensorflow-estimator_2
21−, tensorflow-tensorboard_2
20+, tensorflow-estimator
21+, tensorflow-tensorboard
2222, cudaSupport ? false
2323, cudatoolkit
2424, cudnn
@@ -70,8 +70,8 @@ in buildPythonPackage {
7070 opt-einsum
7171 google-pasta
7272 wrapt
73− tensorflow-estimator_2
74− tensorflow-tensorboard_2
73+ tensorflow-estimator
74+ tensorflow-tensorboard
7575 keras-applications
7676 keras-preprocessing
7777 h5py
pkgs/development/python-modules/tensorflow/default.nix+6−6
@@ -3,10 +3,10 @@
33# Python deps
44, buildPythonPackage, pythonOlder, python
55# Python libraries
6−, numpy, tensorflow-tensorboard_2, absl-py
6+, numpy, tensorflow-tensorboard, absl-py
77, setuptools, wheel, Keras, keras-preprocessing, google-pasta
88, opt-einsum, astunparse, h5py
9−, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_2
9+, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator
1010, dill, flatbuffers-python, tblib, typing-extensions
1111# Common deps
1212, git, pybind11, which, binutils, glibcLocales, cython, perl
@@ -94,8 +94,8 @@ let
9494 setuptools
9595 six
9696 tblib
97− tensorflow-estimator_2
98− tensorflow-tensorboard_2
97+ tensorflow-estimator
98+ tensorflow-tensorboard
9999 termcolor
100100 typing-extensions
101101 wheel
@@ -457,12 +457,12 @@ in buildPythonPackage {
457457 protobuf
458458 six
459459 tblib
460− tensorflow-estimator_2
460+ tensorflow-estimator
461461 termcolor
462462 typing-extensions
463463 wrapt
464464 ] ++ lib.optionals withTensorboard [
465− tensorflow-tensorboard_2
465+ tensorflow-tensorboard
466466 ];
467467
468468 nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath;
pkgs/top-level/python-aliases.nix+4
@@ -96,6 +96,10 @@ mapAliases ({
9696 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
9797 sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02
9898 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28
99+ tensorflow-bin_2 = self.tensorflow-bin; # added 2021-11-25
100+ tensorflow-build_2 = self.tensorflow-build; # added 2021-11-25
101+ tensorflow-estimator_2 = self.tensorflow-estimator; # added 2021-11-25
102+ tensorflow-tensorboard_2 = self.tensorflow-tensorboard; # added 2021-11-25
99103 topydo = throw "topydo was moved to pkgs.topydo"; # added 2017-09-22
100104 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05
101105 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
pkgs/top-level/python-packages.nix+5−14
@@ -9221,15 +9221,13 @@ in {
92219221
92229222 tensorboardx = callPackage ../development/python-modules/tensorboardx { };
92239223
9224− tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/bin.nix {
9224+ tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix {
92259225 cudaSupport = pkgs.config.cudaSupport or false;
92269226 cudatoolkit = pkgs.cudatoolkit_11_0;
92279227 cudnn = pkgs.cudnn_cudatoolkit_11_0;
92289228 };
92299229
9230− tensorflow-bin = self.tensorflow-bin_2;
9231−
9232− tensorflow-build_2 = callPackage ../development/python-modules/tensorflow {
9230+ tensorflow-build = callPackage ../development/python-modules/tensorflow {
92339231 inherit (pkgs.darwin) cctools;
92349232 cudaSupport = pkgs.config.cudaSupport or false;
92359233 cudatoolkit = pkgs.cudatoolkit_11_0;
@@ -9241,20 +9239,13 @@ in {
92419239 lmdb-core = pkgs.lmdb;
92429240 };
92439241
9244− tensorflow-build = self.tensorflow-build_2;
9245−
9246− tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator { };
9247−
9248− tensorflow-estimator = self.tensorflow-estimator_2;
9242+ tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { };
92499243
92509244 tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { };
92519245
9252− tensorflow = self.tensorflow_2;
9253− tensorflow_2 = self.tensorflow-build_2;
9254−
9255− tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard { };
9246+ tensorflow = self.tensorflow-build;
92569247
9257− tensorflow-tensorboard = self.tensorflow-tensorboard_2;
9248+ tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { };
92589249
92599250 tensorflowWithCuda = self.tensorflow.override {
92609251 cudaSupport = true;