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.

diff --git a/Makefile b/Makefile
index 54437f1..ebd4b76 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 9dd0ebf..e8a8db7 100644 (file)
--- 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
similarity index 99%
rename from python/caffe/pycaffe.cpp
rename to python/caffe/_caffe.cpp
index ae0cdf0..1d7b2af 100644 (file)
--- 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)