summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonathan L Long <jonlong@cs.berkeley.edu>2015-01-07 16:56:08 -0800
committerJonathan L Long <jonlong@cs.berkeley.edu>2015-02-16 22:47:30 -0800
commitd94f107ad990f02aa544868250cc5d48fa269eb1 (patch)
treed88996159bfb5a7aa295786c9d00c89f3c3f1338 /Makefile
parent965df8f069481510d0993af203378cf8e604f466 (diff)
downloadcaffeonacl-d94f107ad990f02aa544868250cc5d48fa269eb1.tar.gz
caffeonacl-d94f107ad990f02aa544868250cc5d48fa269eb1.tar.bz2
caffeonacl-d94f107ad990f02aa544868250cc5d48fa269eb1.zip
[pycaffe] allow Layer to be extended from Python
This is done by adding PythonLayer as a boost::python HeldType.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 88c0365e..ba60ae97 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,7 @@ NONEMPTY_LINT_REPORT := $(BUILD_DIR)/$(LINT_EXT)
# PY$(PROJECT)_SRC is the python wrapper for $(PROJECT)
PY$(PROJECT)_SRC := python/$(PROJECT)/_$(PROJECT).cpp
PY$(PROJECT)_SO := python/$(PROJECT)/_$(PROJECT).so
+PY$(PROJECT)_HXX := include/$(PROJECT)/python_layer.hpp
# MAT$(PROJECT)_SRC is the matlab wrapper for $(PROJECT)
MAT$(PROJECT)_SRC := matlab/$(PROJECT)/mat$(PROJECT).cpp
ifneq ($(MATLAB_DIR),)
@@ -420,7 +421,7 @@ py$(PROJECT): py
py: $(PY$(PROJECT)_SO) $(PROTO_GEN_PY)
-$(PY$(PROJECT)_SO): $(PY$(PROJECT)_SRC) | $(DYNAMIC_NAME)
+$(PY$(PROJECT)_SO): $(PY$(PROJECT)_SRC) $(PY$(PROJECT)_HXX) | $(DYNAMIC_NAME)
@ echo CXX/LD -o $@ $<
$(Q)$(CXX) -shared -o $@ $(PY$(PROJECT)_SRC) \
-o $@ $(LINKFLAGS) $(PYTHON_LDFLAGS) -l$(PROJECT) \