Commit Graph

47 Commits

Author SHA1 Message Date
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Nikolay Amiantov
e0795aa5e8 tensorflow: fix python2 build
Avoid using PYTHONPATH, switch to python envs instead.
2019-08-31 21:02:55 +03:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Nikolay Amiantov
71095460b9 tensorflow: fix build
You know, Tensorflow.
2019-08-27 02:43:48 +03:00
Nikolay Amiantov
3b3618ea3c buildBazelPackage: remove top-level symlinks
They always can be regenerated during the actual build, and they are sometimes
random, e.g in Tensorflow;

platforms -> NIX_BUILD_TOP/tmp/install/35282f5123611afa742331368e9ae529/_embedded_binaries/platforms
2019-08-19 11:23:17 +03:00
Nikolay Amiantov
19cdfe87f9 python.pkgs.tensorflow: update dependencies hash 2019-07-31 13:28:44 +03:00
Timo Kaufmann
d30ec1a0ef python.pkgs.tensorflow: fix optimization flags
Now need to be passed in the configure phase.

abbradar: Don't change CUDA build hash.
2019-07-31 13:28:44 +03:00
Nikolay Amiantov
019c13616b tensorflow: cleanup and merge with libtensorflow
This merges work done by yorickvP and timokau in #63208 and #63616 respectively.
Now the derivation builds both libtensorflow and the Python package and puts them into
different outputs.

Quite a bit of improvements were done on the top, including:

* Use official tag revision as source, not a branch;
* Use all system libraries possible (before only one was actually used);
* Move various environment variables to the derivation itself from hooks;
* Use source Python build instead of wheel build to ensure fixup hooks do their important jobs on libraries;
* And more that I forgot!
2019-07-31 13:28:44 +03:00
Nikolay Amiantov
170dd558df python.pkgs.tensorflow: cleanup binary build 2019-07-31 13:28:44 +03:00
Timo Kaufmann
3df4e2df95 tensorflow: re-enable build from source [WIP] 2019-07-31 13:28:15 +03:00
Colin
f634a929d4 pythonPackages.tensorflow: Hardcode a second search class. (#65584)
It appears without this, libcuda.so.1 is not picked up and nvidia
graphics are broken
2019-07-31 13:00:12 +03:00
Timo Kaufmann
377a60f902 python: tensorflow: 1.13.1 -> 1.14.0, tensorflow-tensorboard: 1.13.0 -> 1.14.0, tensorflow-estimator: 1.13.0 -> 1.14.0
All in one commit because the packages are all interdependent and have
to be upgraded together.
2019-06-27 22:37:20 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
volth
5ad79dc4bb compilation for particular x86_64 architecture 2019-04-30 14:28:04 +00:00
Timo Kaufmann
af7455b1c8 pythonPackages.tensorflow: fix python<3.4 build
This was already added for the source build, but missing for the binary
build.
2019-03-04 14:11:27 +01:00
Averell Dalton
9dd81f9389 python: tensorflow: remove python3.7 restriction 2019-03-02 09:05:38 +01:00
Jean-Philippe Bernardy
1c350dc99e pythonPackages.tensorflow: 1.11 -> 1.13.1 2019-03-02 09:05:38 +01:00
Frederik Rietdijk
0a2caa41fe Python: drop python.majorVersion
Drop `python.majorVersion`. For Python language version, use `python.pythonVersion`.
For implementation version, use `python.sourceVersion`.

Some expressions were broken. Those that were identified were fixed.

fixup major
2019-01-04 10:45:22 +01:00
Jean-Philippe Bernardy
a8a3928a34 python.packages.tensorflow: 1.9.0 -> 1.11.0 2018-10-15 14:49:52 +02:00
Herman Fries
69af83b202 tensorflow: Add contrib/tensor_forest to rpath 2018-10-13 10:20:42 +02:00
Jean-Philippe Bernardy
8162378401 python.pkgs.tensorflow 1.7.0 -> 1.9.0 2018-08-07 11:42:36 +02:00
Tyson Whitehead
fd0c467f96
tensorflow: workaround tensorboard collision from upstream pip hack
Upstream lists tensorboard as a utility from tensorflow despite it
being provided by tensorboard to stop pip for deleting it.  This
causes python.withPackages collisions between the two.
2018-08-03 14:28:46 -04:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Frederik Rietdijk
ced21f5e1a pythonPackages: remove name attribute`
The `buildPython*` function computes name from `pname` and `version`.
This change removes `name` attribute from all expressions in
`pkgs/development/python-modules`.

While at it, some other minor changes were made as well, such as
replacing `fetchurl` calls with `fetchPypi`.
2018-06-23 18:14:26 +02:00
Jean-Philippe Bernardy
7e1f9da6bc python.packages.tensorflow: repair postFixup phase
Remove an extra dot.
Fixes #41163
2018-06-12 09:11:56 +02:00
Jean-Philippe Bernardy
7d02ec9ac6 python.packages.tensorflow: add missing dependencies 2018-06-08 15:38:02 +02:00
Jean-Philippe Bernardy
82540b5e1a pythonPackages.tensorflow: 1.5.0 -> 1.7.1
Re-instates binary build for all versions.
2018-05-31 22:21:54 +02:00
Nikolay Amiantov
650d8c93a1 tensorflow: add a binary wheel release for Darwin 2018-04-05 15:00:18 +03:00
Nikolay Amiantov
94ebc13a6a tensorflow: disable XLA without CUDA
This configuration is sadly broken.
2018-02-27 03:16:35 +03:00
Nikolay Amiantov
8aeea493a5 python.pkgs.tensorflow: 1.3 -> 1.5 2018-02-21 00:50:24 +03:00
adisbladis
d99378654f pythonPackages: Add version and pname attributes to packages 2017-11-23 17:49:43 +01:00
Jean-Philippe Bernardy
6269306a8d pythonPackages.tensorflow: add flags for efficent math on CPU 2017-11-04 13:18:11 +03:00
Nikolay Amiantov
fe153d73ce tensorflow: 1.3.0 ->1.3.1
Build from source.

It's implemented as a two-staged Bazel build (see also
546b4aec776b3ea676bb4d58d89751919ce4f1ef).
2017-10-19 13:19:11 +03:00
Jean-Philippe Bernardy
244f34785e pythonPackages.tensorflow: repair cuda-dependent variant
merge the outputs of cudatoolkit locally in the tensorflow
derivation, using symlinkJoin

Fixes #29798
2017-10-10 16:16:37 +04:00
Nikolay Amiantov
864643ba27 tensorflow: support Python 3.5, fix dependencies
TensorBoard on Python 3 only works with 3.5.
2017-09-25 22:37:06 +03:00
Jean-Philippe Bernardy
01d53df77f pythonPackages.tensorflow 1.1 -> 1.3 2017-09-25 22:37:06 +03:00
Frederik Rietdijk
7aa2e6b590 Merge pull request #29263 from jyp/jyp-rename-maintainer
make my maintainer handle match my github username
2017-09-13 09:40:21 +02:00
Jean-Philippe Bernardy
1ba197f225 make my maintainer handle match my github username 2017-09-12 15:17:18 +02:00
Dmitry Vyal
6abb29f460
tensorflow-1.1.0 for python3.6
Google publishes prebuilt tensorflow whl for python 3.4, 3.5, 3.6,
but nix expression for tensorflow only supported 3.5.
This change adds support for python-3.6.
2017-09-12 12:52:35 +02:00
Nikolay Amiantov
1f2a18d916 protobuf: remove old versions
This leaves only protobuf3_1 which is the last version with libprotobuf2.

Also fix several packages to build with the latest protobuf.
2017-09-09 05:54:43 +03:00
Jean-Philippe Bernardy
1fdf42d461 pythonPackages.tensorflow: Don't change the rpath to point to gcc4.9
When using cuda, the rpath was set to include GCC lib version 4.9.
I am not sure what this was attempting to do, but an effect was to
prevent certain python libraries to find the correct (newer) version
of the std lib.

Also avoid mentions of any specifc version in the
propagatedBuildInputs
2017-05-30 11:06:19 +02:00
Jean-Philippe Bernardy
7b5356ed5e pythonPackages.tensorflow 1.0.0 -> 1.1.0 2017-05-09 10:09:11 +02:00
Jean-Philippe Bernardy
f37b34fe7c tensorflow: depend on cudatoolkit 8 and cudnn 5.1 2017-02-27 15:23:23 +01:00
Edward Tjörnhammar
7864782d71
pythonPackages.tensorflow: 0.10.0 -> 1.0.0 2017-02-27 10:52:21 +01:00
Frederik Rietdijk
97c3bebd92 tensorflowCuDNN -> tensorflowWithCuda
and move expression
2017-02-15 12:32:44 +01:00
Frederik Rietdijk
a069c16c22 tensorflowNoGpuSupport -> tensorflowWithoutCuda
and move expression
2017-02-15 12:32:44 +01:00