Cuda (luoyetx#8)

* remove blob diff

* fix warning

* only build Release

* add cuda code

* fix

* update appveyor

* Revert "update appveyor"

This reverts commit a29ce8f.

* add cudnn

* update

Author: luoyetx

LICENSE

@@ -1,44 +1,27 @@
-COPYRIGHT
+Copyright (c) 2015, zhangjie
 
-All contributions by the University of California:
-Copyright (c) 2014, 2015, The Regents of the University of California (Regents)
 All rights reserved.
 
-All other contributions:
-Copyright (c) 2014, 2015, the respective contributors
-All rights reserved.
-
-Caffe uses a shared copyright model: each contributor holds copyright over
-their contributions to Caffe. The project versioning records all such
-contribution and copyright details. If a contributor wants to further mark
-their specific copyright on a particular contribution, they should indicate
-their copyright solely in the commit message of the change when it is
-committed.
-
-LICENSE
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met: 
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer. 
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of mini-caffe nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-CONTRIBUTION AGREEMENT
-
-By contributing to the BVLC/caffe repository through pull-request, comment,
-or otherwise, the contributor releases their content to the
-license and copyright terms herein.

README.md

@@ -4,71 +4,68 @@ Mini-Caffe
 [![Build Status](https://travis-ci.org/luoyetx/mini-caffe.svg?branch=master)](https://travis-ci.org/luoyetx/mini-caffe)
 [![Build status](https://ci.appveyor.com/api/projects/status/x9s2iajv7rtxeo3t/branch/master?svg=true)](https://ci.appveyor.com/project/luoyetx/mini-caffe/branch/master)
 
-Minimal runtime core of Caffe. This repo is aimed to provide a minimal runtime of Caffe for those want to run Caffe model.
+Minimal runtime core of Caffe. This repo is aimed to provide a minimal C++ runtime core for those want to **Forward** a Caffe model.
 
-### Update
+### What can Mini-Caffe do?
 
-- 2017/01/16. Build with x64 and remove many code.
-- 2016/12/11. Mini-Caffe now only depends on OpenBLAS and protobuf.
+Mini-Caffe only depends on OpenBLAS and protobuf which means you can't train model with Mini-Caffe. It also only supports **Forward** function which means you can't apply models like nerual art style transform that uses **Backward** function.
 
-### What can mini-caffe do?
+### Build on Windows
 
-This repo has no CUDA, no Caffe tools which means you can only use mini-caffe to run the nerual network model in CPU mode. You should train the nerual model use caffe tools on *nix platform, mini-caffe is just an optional choice for testing the nerual model on Windows platform. If you want a fully ported Caffe, you may refer to [happynear/caffe-windows](https://github.com/happynear/caffe-windows) or [Microsoft/caffe](https://github.com/Microsoft/caffe).
+You need a VC compiler to build Mini-Caffe. Visual Studio 2013 Community should be fine. You can download from [here](https://www.visualstudio.com/downloads/).
 
-### Which compiler?
+##### OpenBLAS
 
-VC12 in Visual Studio 2013. We only build for x64, if you know the difference, it can be easily doned with x86. What's more, We also need CMake.
+OpenBLAS library is already shipped with the source code, we don't need to compile it. If you want, you could download other version from [here](https://sourceforge.net/projects/openblas/files/). [v0.2.14](https://sourceforge.net/projects/openblas/files/v0.2.14/) is used for Mini-Caffe.
 
-### 3rdparty libraries
+##### protobuf
 
-Since Caffe depends on many 3rdparty libraries, I have modified some code to remove the libraries Caffe use.
+protobuf is a git submodule in Mini-Caffe, we need to fetch the source code and compile it.
 
-- no CUDA
-- no DataLayer for train
-- no HDF5
+```
+$ git submodule update --init
+$ cmake .. -DUSE_CUDA=ON -DUSE_CUDNN=ON
+$ cd 3rdparty/src/protobuf/cmake
+$ mkdir build
+$ cd build
+$ cmake .. -DBUILD_TESTING=OFF -G "Visual Studio 12 2013 Win64"
+```
 
-but we still need libraries below.
+Use `protobuf.sln` to compile `Debug` and `Release` version.
 
-- ~~OpenCV~~
-- ~~Boost~~
-- ~~gflags~~
-- ~~glog~~
-- protobuf
-- openblas
+With these two libraries, we can compile Mini-Caffe now. Copy protobuf's include headers and libraries. Generate `caffe.pb.h` and `caffe.pb.cc`.
 
-~~We can download pre-compiled OpenCV and Boost, and set two environment variables `OpenCV_DIR` and `Boost_DIR`. For example, `OpenCV_DIR` = `D:\3rdparty\opencv2.4.8\build` and `Boost_DIR` = `D:\3rdparty\boost_1_57_0`. Pay attention to the Compiler version and build Architecture, which will be **VC12** and **x86**.~~
+```
+$ copydeps.bat
+$ generatepb.bat
+$ mkdir build
+$ cd build
+$ cmake .. -G "Visual Studio 12 2013 Win64"
+```
 
-For openblas, I already put the library in the source code.
+Use `mini-caffe.sln` to compile it.
 
-~~gflags, glog,~~ protobuf can be compiled by ourself, I add these libraries as submodules of mini-caffe.
+### Build on Linux
 
-To compile these libraries yourself, you should download the source code first.
+Install OpenBLAS and protobuf library through system package manager. Then build Mini-Caffe.
 
 ```
-git submodule update --init
+$ sudo apt install libopenblas-dev libprotobuf-dev protobuf-compiler
+$ protoc -I="./src/proto" --cpp_out="./src/proto" "./src/proto/caffe.proto"
+$ mkdir build
+$ cd build
+$ cmake ..
+$ make -j4
 ```
 
-all source code are under `3rdparty/src`.
+### With CUDA and CUDNN
 
-##### protobuf
+Install CUDA and CUDNN in your system, then we can compile Mini-Caffe with GPU support. Run cmake command below.
 
 ```
-cd 3rdparty/src/protobuf/cmake
-mkdir build
-cd build
-cmake .. -DBUILD_TESTING=OFF -G "Visual Studio 12 2013 Win64"
+$ cmake .. -DUSE_CUDA=ON -DUSE_CUDNN=ON
 ```
 
-use VS2013 to compile protobuf. `Debug` and `Release`.
-
-Once you have compiled these libraries, you need collect header files and lib files to `3rdparty/include` and `3rdparty/lib`. I provide a script for collecting, just run `copydeps.bat`, it will also copy dll files to `3rdparty/bin`.
-
-### cmake for mini-caffe
-
-Before we use cmake to generate vs solution file, we need to use protoc.exe to generate `caffe.pb.h` and `caffe.pb.cc`. Run `generatepb.bat` will use proto.exe and copy files to include folder and source folder.
-
-`mini-caffe.sln` is the solution file for VS2013.
-
-### Embed mini-caffe
+### Embed Mini-Caffe
 
-To use mini-caffe as a sub-project, you may refer to [mini-caffe-example](https://github.com/luoyetx/mini-caffe-example).
+To use Mini-Caffe as a library, you may refer to [mini-caffe-example](https://github.com/luoyetx/mini-caffe-example).

appveyor.yml

@@ -30,7 +30,6 @@ build_script:
       mkdir build
       cd build
       cmake .. -G "Visual Studio 12 2013 Win64"
-      msbuild mini-caffe.sln /t:Rebuild /p:Configuration=Debug;Platform=x64 /m
       msbuild mini-caffe.sln /t:Rebuild /p:Configuration=Release;Platform=x64 /m
       cd ..
 

caffe.LICENSE

@@ -0,0 +1,44 @@
+COPYRIGHT
+
+All contributions by the University of California:
+Copyright (c) 2014, 2015, The Regents of the University of California (Regents)
+All rights reserved.
+
+All other contributions:
+Copyright (c) 2014, 2015, the respective contributors
+All rights reserved.
+
+Caffe uses a shared copyright model: each contributor holds copyright over
+their contributions to Caffe. The project versioning records all such
+contribution and copyright details. If a contributor wants to further mark
+their specific copyright on a particular contribution, they should indicate
+their copyright solely in the commit message of the change when it is
+committed.
+
+LICENSE
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met: 
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+CONTRIBUTION AGREEMENT
+
+By contributing to the BVLC/caffe repository through pull-request, comment,
+or otherwise, the contributor releases their content to the
+license and copyright terms herein.