diff options
| author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2015-01-25 20:37:52 -0800 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2015-01-25 20:39:13 -0800 |
| commit | 47e8831ac09c82fb210e8d032a2f770499619540 (patch) | |
| tree | de29959ab147cb48fb5eccc840310bcd49a363af /python | |
| parent | d33fffbd229ad29e06fa294356c4526ea2e82987 (diff) | |
| download | caffeonacl-47e8831ac09c82fb210e8d032a2f770499619540.tar.gz caffeonacl-47e8831ac09c82fb210e8d032a2f770499619540.tar.bz2 caffeonacl-47e8831ac09c82fb210e8d032a2f770499619540.zip | |
[pycaffe] de-dupe imports
Diffstat (limited to 'python')
| -rw-r--r-- | python/caffe/__init__.py | 4 | ||||
| -rw-r--r-- | python/caffe/pycaffe.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/python/caffe/__init__.py b/python/caffe/__init__.py index 8dd2464d..acdfc071 100644 --- a/python/caffe/__init__.py +++ b/python/caffe/__init__.py @@ -1,6 +1,6 @@ from .pycaffe import Net, SGDSolver -from .pycaffe import set_mode_cpu, set_mode_gpu, set_phase_train, set_phase_test -from .pycaffe import set_device +from ._caffe import set_mode_cpu, set_mode_gpu, set_device, \ + set_phase_train, set_phase_test from .classifier import Classifier from .detector import Detector import io diff --git a/python/caffe/pycaffe.py b/python/caffe/pycaffe.py index 8899309d..31dc1f9b 100644 --- a/python/caffe/pycaffe.py +++ b/python/caffe/pycaffe.py @@ -8,8 +8,6 @@ from itertools import izip_longest import numpy as np from ._caffe import Net, SGDSolver -from ._caffe import set_mode_cpu, set_mode_gpu, set_phase_train, set_phase_test -from ._caffe import set_device import caffe.io # We directly update methods from Net here (rather than using composition or |