Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
luoyetx committed Dec 11, 2016
1 parent 8ae65ef commit c6f8290
Show file tree
Hide file tree
Showing 313 changed files with 329 additions and 38,314 deletions.
6 changes: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
[submodule "3rdparty/src/gflags"]
path = 3rdparty/src/gflags
url = https://github.com/gflags/gflags.git
[submodule "3rdparty/src/glog"]
path = 3rdparty/src/glog
url = https://github.com/google/glog.git
[submodule "3rdparty/src/protobuf"]
path = 3rdparty/src/protobuf
url = https://github.com/google/protobuf.git
1 change: 0 additions & 1 deletion 3rdparty/include/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
gflags/
glog/
google/
133 changes: 0 additions & 133 deletions 3rdparty/include/getopt.h

This file was deleted.

18 changes: 0 additions & 18 deletions 3rdparty/include/mkstemp.h

This file was deleted.

52 changes: 0 additions & 52 deletions 3rdparty/include/unistd.h

This file was deleted.

1 change: 0 additions & 1 deletion 3rdparty/src/gflags
Submodule gflags deleted from f0523f
1 change: 0 additions & 1 deletion 3rdparty/src/glog
Submodule glog deleted from 2a02db
33 changes: 11 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
mini-caffe
Mini-Caffe
==========

Minimal runtime core of Caffe porting to WIN32. This repo is aimed to provide a minimal runtime of Caffe for those want to run Caffe model on Windows platform.

### Update

- 2016/12/11. Mini-Caffe now only depends on OpenBLAS and protobuf.

### What can mini-caffe do?

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).
Expand All @@ -21,18 +25,18 @@ Since Caffe depends on many 3rdparty libraries, I have modified some code to rem

but we still need libraries below.

- OpenCV
- Boost
- gflags
- glog
- ~~OpenCV~~
- ~~Boost~~
- ~~gflags~~
- ~~glog~~
- protobuf
- openblas

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**.
~~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**.~~

For openblas, I already put the library in the source code.

gflags, glog, protobuf can be compiled by ourself, I add these libraries as submodules of mini-caffe. However, I also provide a pre-compiled version of these libraries. The binaries is compiled by VC12 for x86. You can download from [dropbox](https://www.dropbox.com/s/8zbimuiviiyede5/3rdparty-VC12-x86.zip?dl=0) or [baidu driver](http://pan.baidu.com/s/1hqOoCL2).
~~gflags, glog,~~ protobuf can be compiled by ourself, I add these libraries as submodules of mini-caffe. However, I also provide a pre-compiled version of these libraries. The binaries is compiled by VC12 for x86. You can download from [dropbox](https://www.dropbox.com/s/8zbimuiviiyede5/3rdparty-VC12-x86.zip?dl=0) or [baidu driver](http://pan.baidu.com/s/1hqOoCL2).

To compile these libraries yourself, you should download the source code first.

Expand All @@ -42,21 +46,6 @@ git submodule update --init

all source code are under `3rdparty/src`.

##### gflags

```
cd 3rdparty/src/gflags
mkdir build
cd build
cmake ..
```

use VS2013 to compile gflags. `Debug` and `Release`.

##### glog

glog project already provides a solution file for Visual Studio. Just compile `Debug` and `Release`.

##### protobuf

```
Expand Down
97 changes: 0 additions & 97 deletions README.zh.md

This file was deleted.

7 changes: 0 additions & 7 deletions copydeps.bat
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
mkdir 3rdparty\include\gflags
copy 3rdparty\src\gflags\build\include\gflags 3rdparty\include\gflags
copy 3rdparty\src\gflags\build\lib\Debug\gflags.lib 3rdparty\lib\gflagsd.lib
copy 3rdparty\src\gflags\build\lib\Debug\gflags_nothreads.lib 3rdparty\lib\gflags_nothreadsd.lib
copy 3rdparty\src\gflags\build\lib\Release\gflags.lib 3rdparty\lib\gflags.lib
copy 3rdparty\src\gflags\build\lib\Release\gflags_nothreads.lib 3rdparty\lib\gflags_nothreads.lib

mkdir 3rdparty\include\glog
copy 3rdparty\src\glog\src\windows\glog 3rdparty\include\glog
copy 3rdparty\src\glog\Debug\libglog.lib 3rdparty\lib\libglogd.lib
Expand Down
Loading

0 comments on commit c6f8290

Please sign in to comment.