Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 64e1dc5d9650
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: da8a3c3c2d18
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 28, 2021

  1. python3Packages.chainer: 6.5.0 -> 7.7.0

    @ishiy1993
    ishiy1993 committed Jan 28, 2021
    Copy the full SHA
    8798f2c View commit details

  2. python3Packages.chainer: refactor pytest

    @ishiy1993
    ishiy1993 committed Jan 28, 2021
    Copy the full SHA
    c355637 View commit details

Commits on Jan 29, 2021

  1. Merge pull request #111021 from ishiy1993/fix-chainer

    @SuperSandro2000
    SuperSandro2000 authored Jan 29, 2021
    Copy the full SHA
    da8a3c3 View commit details
Showing with 11 additions and 13 deletions.
  1. +11 −13 pkgs/development/python-modules/chainer/default.nix
24 changes: 11 additions & 13 deletions pkgs/development/python-modules/chainer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
{ 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
src = fetchFromGitHub {
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";