diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-29 02:20:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-29 02:20:01 +0100 |
commit | da8a3c3c2d183106756dace2d249906d81387b65 (patch) | |
tree | 08ad275fbbf9fe3a8bd7075cdd0ab4832a2826ac /pkgs/development/python-modules | |
parent | 64e1dc5d965075b85a578b410d6fc07f4baa9181 (diff) | |
parent | c355637b4f182379eb9ffa3d9c492d3fb0b2dd74 (diff) |
Merge pull request #111021 from ishiy1993/fix-chainer
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/chainer/default.nix | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 0c3b7a946fcd..9dd656efa88b 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy3k -, filelock, protobuf, numpy, pytest, mock, typing-extensions +, filelock, protobuf, numpy, pytestCheckHook, mock, typing-extensions , cupy, cudaSupport ? false }: buildPythonPackage rec { pname = "chainer"; - version = "6.5.0"; + version = "7.7.0"; disabled = !isPy3k; # python2.7 abandoned upstream # no tests in Pypi tarball @@ -13,16 +13,11 @@ buildPythonPackage rec { owner = "chainer"; repo = "chainer"; rev = "v${version}"; - sha256 = "0ha9fbl6sa3fbnsz3y1pg335iiskdbxw838m5j06zgzy156zna1x"; + sha256 = "0m97k5bv4pcp5rvbczvrr2vxddwzw2h42cm021f5y779jx5ghclh"; }; - # remove on 7.0 or 6.6 release - postPatch = '' - sed -i '/typing/d' setup.py - ''; - checkInputs = [ - pytest + pytestCheckHook mock ]; @@ -33,10 +28,13 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals cudaSupport [ cupy ]; - # avoid gpu tests - checkPhase = '' - pytest tests/chainer_tests/utils_tests -k 'not gpu and not cupy' - ''; + pytestFlagsArray = [ "tests/chainer_tests/utils_tests" ]; + + disabledTests = [ + "gpu" + "cupy" + "ideep" + ]; meta = with lib; { description = "A flexible framework of neural networks for deep learning"; |