diff options
| author | Jonathan L Long <jonlong@cs.berkeley.edu> | 2014-03-10 20:00:01 -0700 |
|---|---|---|
| committer | Jonathan L Long <jonlong@cs.berkeley.edu> | 2014-03-13 11:15:57 -0700 |
| commit | d8035354455973425312e267da95a7274cc0b403 (patch) | |
| tree | 6f3ff218abe10468b2f6483e098cfc412b542bc4 | |
| parent | ab3a2ac56aa78cdd358f7444ad7a1a509a41da72 (diff) | |
| download | caffeonacl-d8035354455973425312e267da95a7274cc0b403.tar.gz caffeonacl-d8035354455973425312e267da95a7274cc0b403.tar.bz2 caffeonacl-d8035354455973425312e267da95a7274cc0b403.zip | |
Rename pycaffe.cpp -> _caffe.cpp in preparation for python wrapper
This commit should not break any code which does not refer explicitly to
caffe.pycaffe.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | python/caffe/__init__.py | 2 | ||||
| -rw-r--r-- | python/caffe/_caffe.cpp (renamed from python/caffe/pycaffe.cpp) | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -45,8 +45,8 @@ NONGEN_CXX_SRCS := $(shell find \ LINT_REPORT := $(BUILD_DIR)/cpp_lint.log FAILED_LINT_REPORT := $(BUILD_DIR)/cpp_lint.error_log # PY$(PROJECT)_SRC is the python wrapper for $(PROJECT) -PY$(PROJECT)_SRC := python/$(PROJECT)/py$(PROJECT).cpp -PY$(PROJECT)_SO := python/$(PROJECT)/py$(PROJECT).so +PY$(PROJECT)_SRC := python/$(PROJECT)/_$(PROJECT).cpp +PY$(PROJECT)_SO := python/$(PROJECT)/_$(PROJECT).so # MAT$(PROJECT)_SRC is the matlab wrapper for $(PROJECT) MAT$(PROJECT)_SRC := matlab/$(PROJECT)/mat$(PROJECT).cpp MAT$(PROJECT)_SO := matlab/$(PROJECT)/$(PROJECT) diff --git a/python/caffe/__init__.py b/python/caffe/__init__.py index 9dd0ebf1..e8a8db7c 100644 --- a/python/caffe/__init__.py +++ b/python/caffe/__init__.py @@ -1 +1 @@ -from .pycaffe import * +from ._caffe import * diff --git a/python/caffe/pycaffe.cpp b/python/caffe/_caffe.cpp index ae0cdf06..1d7b2af3 100644 --- a/python/caffe/pycaffe.cpp +++ b/python/caffe/_caffe.cpp @@ -255,7 +255,7 @@ struct CaffeNet { // The boost python module definition. -BOOST_PYTHON_MODULE(pycaffe) { +BOOST_PYTHON_MODULE(_caffe) { boost::python::class_<CaffeNet>( "CaffeNet", boost::python::init<string, string>()) .def("Forward", &CaffeNet::Forward) |