diff options
author | Jonathan L Long <jonlong@cs.berkeley.edu> | 2014-08-30 23:49:44 -0700 |
---|---|---|
committer | Jonathan L Long <jonlong@cs.berkeley.edu> | 2014-08-30 23:49:44 -0700 |
commit | 9d541499a992d89347602c198560f440fabae43e (patch) | |
tree | 4792521a843ed4b38439d15de92c8a3389c2f0d2 /python | |
parent | e7f712eb977287ef89c63385aaa291c5672ca3b1 (diff) | |
download | caffeonacl-9d541499a992d89347602c198560f440fabae43e.tar.gz caffeonacl-9d541499a992d89347602c198560f440fabae43e.tar.bz2 caffeonacl-9d541499a992d89347602c198560f440fabae43e.zip |
[pycaffe] live in caffe namespace instead of opening it
Diffstat (limited to 'python')
-rw-r--r-- | python/caffe/_caffe.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/python/caffe/_caffe.cpp b/python/caffe/_caffe.cpp index 0014c581..dd4062c2 100644 --- a/python/caffe/_caffe.cpp +++ b/python/caffe/_caffe.cpp @@ -22,8 +22,6 @@ #define PyArray_SetBaseObject(arr, x) (PyArray_BASE(arr) = (x)) #endif - -using namespace caffe; // NOLINT(build/namespaces) using boost::python::dict; using boost::python::extract; using boost::python::len; @@ -32,6 +30,8 @@ using boost::python::object; using boost::python::handle; using boost::python::vector_indexing_suite; +namespace caffe { + // for convenience, check that input files can be opened, and raise an // exception that boost will send to Python if not (caffe could still crash // later if the input files are disturbed before they are actually used, but @@ -364,3 +364,5 @@ BOOST_PYTHON_MODULE(_caffe) { import_array(); } + +} // namespace caffe |