diff options
| author | Ronghang Hu <huronghang@hotmail.com> | 2015-05-28 16:24:30 +0800 |
|---|---|---|
| committer | Ronghang Hu <huronghang@hotmail.com> | 2015-05-29 13:21:25 +0800 |
| commit | d3d7d07be981ab046da99e1ad5d84217bf0ec4c3 (patch) | |
| tree | 4c87893f6a2e5f33da0f4cae8946e5b1a2c43aef /Makefile | |
| parent | 6af8efc0bf51d475077be146e5ab7b7899ad705d (diff) | |
| download | caffeonacl-d3d7d07be981ab046da99e1ad5d84217bf0ec4c3.tar.gz caffeonacl-d3d7d07be981ab046da99e1ad5d84217bf0ec4c3.tar.bz2 caffeonacl-d3d7d07be981ab046da99e1ad5d84217bf0ec4c3.zip | |
Clean up old matcaffe wrapper and rename caffe.reset to caffe.reset_all
Remove old matlab wrapper but keep the classification demo and hdf5 demo
Change 'caffe.reset()' to 'caffe.reset_all()' to avoid potential name conflict.
Otherwise, Matlab R2015a complains:
Warning: Function reset has the same name as a MATLAB builtin. We suggest you rename the
function to avoid a potential name conflict.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 25 |
1 files changed, 4 insertions, 21 deletions
@@ -65,7 +65,6 @@ NONGEN_CXX_SRCS := $(shell find \ src/$(PROJECT) \ include/$(PROJECT) \ python/$(PROJECT) \ - matlab/$(PROJECT) \ matlab/+$(PROJECT)/private \ examples \ tools \ @@ -80,15 +79,12 @@ NONEMPTY_LINT_REPORT := $(BUILD_DIR)/$(LINT_EXT) 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 -# MAT$(PROJECT)_PKG_SRC is the mex entrance point of matlab package for $(PROJECT) -MAT$(PROJECT)_PKG_SRC := matlab/+$(PROJECT)/private/$(PROJECT)_.cpp +# MAT$(PROJECT)_SRC is the mex entrance point of matlab package for $(PROJECT) +MAT$(PROJECT)_SRC := matlab/+$(PROJECT)/private/$(PROJECT)_.cpp ifneq ($(MATLAB_DIR),) MAT_SO_EXT := $(shell $(MATLAB_DIR)/bin/mexext) endif -MAT$(PROJECT)_SO := matlab/$(PROJECT)/$(PROJECT).$(MAT_SO_EXT) -MAT$(PROJECT)_PKG_SO := matlab/+$(PROJECT)/private/$(PROJECT)_.$(MAT_SO_EXT) +MAT$(PROJECT)_SO := matlab/+$(PROJECT)/private/$(PROJECT)_.$(MAT_SO_EXT) ############################## # Derive generated files @@ -451,7 +447,7 @@ $(PY$(PROJECT)_SO): $(PY$(PROJECT)_SRC) $(PY$(PROJECT)_HXX) | $(DYNAMIC_NAME) mat$(PROJECT): mat -mat: $(MAT$(PROJECT)_SO) $(MAT$(PROJECT)_PKG_SO) +mat: $(MAT$(PROJECT)_SO) $(MAT$(PROJECT)_SO): $(MAT$(PROJECT)_SRC) $(STATIC_NAME) @ if [ -z "$(MATLAB_DIR)" ]; then \ @@ -464,18 +460,6 @@ $(MAT$(PROJECT)_SO): $(MAT$(PROJECT)_SRC) $(STATIC_NAME) CXX="$(CXX)" \ CXXFLAGS="\$$CXXFLAGS $(MATLAB_CXXFLAGS)" \ CXXLIBS="\$$CXXLIBS $(STATIC_LINK_COMMAND) $(LDFLAGS)" -output $@ - -$(MAT$(PROJECT)_PKG_SO): $(MAT$(PROJECT)_PKG_SRC) $(STATIC_NAME) - @ if [ -z "$(MATLAB_DIR)" ]; then \ - echo "MATLAB_DIR must be specified in $(CONFIG_FILE)" \ - "to build mat$(PROJECT)."; \ - exit 1; \ - fi - @ echo MEX $< - $(Q)$(MATLAB_DIR)/bin/mex $(MAT$(PROJECT)_PKG_SRC) \ - CXX="$(CXX)" \ - CXXFLAGS="\$$CXXFLAGS $(MATLAB_CXXFLAGS)" \ - CXXLIBS="\$$CXXLIBS $(STATIC_LINK_COMMAND) $(LDFLAGS)" -output $@ runtest: $(TEST_ALL_BIN) $(TOOL_BUILD_DIR)/caffe @@ -601,7 +585,6 @@ clean: @- $(RM) -rf $(DISTRIBUTE_DIR) @- $(RM) $(PY$(PROJECT)_SO) @- $(RM) $(MAT$(PROJECT)_SO) - @- $(RM) $(MAT$(PROJECT)_PKG_SO) supercleanfiles: $(eval SUPERCLEAN_FILES := $(strip \ |