Revert "Caffe Plugin" (apache#2852)

zheng-da · Jul 27, 2016 · fd6ce60 · fd6ce60
1 parent e343416
commit fd6ce60
Show file tree

Hide file tree

Showing 20 changed files with 2 additions and 1,382 deletions.
diff --git a/docs/how_to/caffe.md b/docs/how_to/caffe.md
diff --git a/example/caffe/caffe_net.py b/example/caffe/caffe_net.py
diff --git a/example/caffe/data.py b/example/caffe/data.py
diff --git a/example/caffe/train_model.py b/example/caffe/train_model.py
diff --git a/make/config.mk b/make/config.mk
@@ -111,10 +111,6 @@ EXTRA_OPERATORS =
 # plugins
 #----------------------------
 
-# whether to use caffe integration. This requires including caffe submodule.
-# CAFFE_PATH = caffe-lite 
-# MXNET_PLUGINS += plugin/caffe/caffe.mk
-
 # whether to use torch integration. This requires installing torch.
 # You also need to add TORCH_PATH/install/lib to your LD_LIBRARY_PATH
 # TORCH_PATH = $(HOME)/torch

diff --git a/plugin/caffe/caffe.mk b/plugin/caffe/caffe.mk
diff --git a/plugin/caffe/caffe_blob.cc b/plugin/caffe/caffe_blob.cc