Skip to content
This repository was archived by the owner on Jul 2, 2021. It is now read-only.

fix travis with Chainerv5 #717

Merged
merged 2 commits into from
Oct 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,3 @@ dependencies:
- Pillow
- mpi4py
- scipy
- pip:
- chainermn==1.3.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

setup_requires = ['numpy']
install_requires = [
'chainer>=4.0',
'chainer>=5.0',
'Pillow'
]

Expand Down
6 changes: 4 additions & 2 deletions tests/links_tests/connection_tests/test_conv_2d_bn_activ.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions tests/links_tests/model_tests/ssd_tests/test_multibox_loss.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down