From daf61affb1e5ce2cdaeefdca57a2050e4f9dbecc Mon Sep 17 00:00:00 2001 From: Yusuke Niitani Date: Fri, 26 Oct 2018 00:53:51 +0900 Subject: [PATCH 1/2] fix test with Chainerv5 --- tests/links_tests/connection_tests/test_conv_2d_bn_activ.py | 6 ++++-- .../links_tests/model_tests/ssd_tests/test_multibox_loss.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/links_tests/connection_tests/test_conv_2d_bn_activ.py b/tests/links_tests/connection_tests/test_conv_2d_bn_activ.py index 0689da11a2..47d44d811b 100644 --- a/tests/links_tests/connection_tests/test_conv_2d_bn_activ.py +++ b/tests/links_tests/connection_tests/test_conv_2d_bn_activ.py @@ -10,13 +10,15 @@ from chainercv.links import Conv2DBNActiv +from chainermn import create_communicator + def _add_one(x): return x + 1 try: - from chainermn import create_communicator + import mpi4py.MPI # NOQA _available = True except ImportError: _available = False @@ -126,7 +128,7 @@ def test_backward_gpu(self): self.check_backward(cuda.to_gpu(self.x), cuda.to_gpu(self.gy)) -@unittest.skipUnless(_available, 'ChainerMN is not installed') +@unittest.skipUnless(_available, 'mpi4py is not installed') class TestConv2DMultiNodeBNActiv(unittest.TestCase): in_channels = 1 diff --git a/tests/links_tests/model_tests/ssd_tests/test_multibox_loss.py b/tests/links_tests/model_tests/ssd_tests/test_multibox_loss.py index 131c408085..5d5e8048f9 100644 --- a/tests/links_tests/model_tests/ssd_tests/test_multibox_loss.py +++ b/tests/links_tests/model_tests/ssd_tests/test_multibox_loss.py @@ -12,9 +12,11 @@ from chainercv.links.model.ssd import multibox_loss +from chainermn import create_communicator + try: - from chainermn import create_communicator + import mpi4py.MPI # NOQA _available = True except ImportError: _available = False @@ -129,7 +131,7 @@ def test_forward_gpu(self): self.k) -@unittest.skipUnless(_available, 'ChainerMN is not installed') +@unittest.skipUnless(_available, 'mpi4py is not installed') class TestMultiNodeMultiboxLoss(unittest.TestCase): k = 3 From 9dbadff50760fb84ce4a3204b4cbf423e5efa9a5 Mon Sep 17 00:00:00 2001 From: Yusuke Niitani Date: Fri, 26 Oct 2018 08:32:38 +0900 Subject: [PATCH 2/2] bump up chainer version to v5 --- .travis.yml | 8 ++++---- README.md | 1 - environment.yml | 2 -- setup.py | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 737667abe6..99d486dc11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ python: - "2.7" - "3.6" env: - - CHAINER_VERSION=">=4.0" OPTIONAL_MODULES=0 - - CHAINER_VERSION=">=4.0" OPTIONAL_MODULES=1 - - CHAINER_VERSION="==5.0.0b1" OPTIONAL_MODULES=0 - - CHAINER_VERSION="==5.0.0b1" OPTIONAL_MODULES=1 + - CHAINER_VERSION=">=5.0" OPTIONAL_MODULES=0 + - CHAINER_VERSION=">=5.0" OPTIONAL_MODULES=1 + - CHAINER_VERSION="==6.0.0a1" OPTIONAL_MODULES=0 + - CHAINER_VERSION="==6.0.0a1" OPTIONAL_MODULES=1 notifications: email: false diff --git a/README.md b/README.md index fee497eca1..9a3a73e749 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ The instruction on installation using Anaconda is [here](http://chainercv.readth For additional features -+ [ChainerMN](https://github.com/chainer/chainermn) + Matplotlib + OpenCV + SciPy diff --git a/environment.yml b/environment.yml index 9358bdf031..a306a19617 100644 --- a/environment.yml +++ b/environment.yml @@ -14,5 +14,3 @@ dependencies: - Pillow - mpi4py - scipy - - pip: - - chainermn==1.3.0 diff --git a/setup.py b/setup.py index b6b9dc6962..ec5fe71037 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ setup_requires = ['numpy'] install_requires = [ - 'chainer>=4.0', + 'chainer>=5.0', 'Pillow' ]