Commit c15c8639 authored by Yuxin Wu's avatar Yuxin Wu

bump version. relax gpu requirements

parent 20c7fcb4
...@@ -16,18 +16,18 @@ matrix: ...@@ -16,18 +16,18 @@ matrix:
include: include:
- os: linux - os: linux
python: 2.7 python: 2.7
env: TF_VERSION=1.0.0rc2 TF_TYPE=release env: TF_VERSION=1.0.1 TF_TYPE=release
- os: linux - os: linux
python: 3.5 python: 3.5
env: TF_VERSION=1.0.0rc2 TF_TYPE=release env: TF_VERSION=1.0.1 TF_TYPE=release
- os: linux - os: linux
python: 2.7 python: 2.7
env: TF_VERSION=1.0.0rc2 TF_TYPE=nightly env: TF_VERSION=1.0.1 TF_TYPE=nightly
- os: linux - os: linux
python: 3.5 python: 3.5
env: TF_VERSION=1.0.0rc2 TF_TYPE=nightly env: TF_VERSION=1.0.1 TF_TYPE=nightly
allow_failures: allow_failures:
- env: TF_VERSION=1.0.0rc2 TF_TYPE=nightly - env: TF_VERSION=1.0.1 TF_TYPE=nightly
install: install:
- pip install -U pip # the pip version on travis is too old - pip install -U pip # the pip version on travis is too old
......
...@@ -6,4 +6,4 @@ import cv2 # noqa ...@@ -6,4 +6,4 @@ import cv2 # noqa
import os import os
os.environ['OPENCV_OPENCL_RUNTIME'] = '' os.environ['OPENCV_OPENCL_RUNTIME'] = ''
__version__ = '0.1.6' __version__ = '0.1.7'
...@@ -96,8 +96,9 @@ class SyncMultiGPUTrainer(MultiGPUTrainer, ...@@ -96,8 +96,9 @@ class SyncMultiGPUTrainer(MultiGPUTrainer,
config.predict_tower = predict_tower config.predict_tower = predict_tower
super(SyncMultiGPUTrainer, self).__init__(config) super(SyncMultiGPUTrainer, self).__init__(config)
assert len(config.tower) >= 1, "MultiGPUTrainer must be used with at least one GPU." assert len(config.tower) >= 1, "MultiGPUTrainer must be used with at least one tower."
assert tf.test.is_gpu_available() if len(config.tower) > 1:
assert tf.test.is_gpu_available()
self.average_cost = average_cost self.average_cost = average_cost
@staticmethod @staticmethod
...@@ -185,7 +186,9 @@ class AsyncMultiGPUTrainer(MultiGPUTrainer, ...@@ -185,7 +186,9 @@ class AsyncMultiGPUTrainer(MultiGPUTrainer,
config.predict_tower = predict_tower config.predict_tower = predict_tower
self._scale_gradient = scale_gradient self._scale_gradient = scale_gradient
assert tf.test.is_gpu_available()
if len(config.tower) > 1:
assert tf.test.is_gpu_available()
def _setup(self): def _setup(self):
super(AsyncMultiGPUTrainer, self)._setup() super(AsyncMultiGPUTrainer, self)._setup()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment