Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Caffe without the patch, cpp-package fixed also with Caffe plugin #5573

Merged
merged 36 commits into from
Mar 31, 2017
Merged

Caffe without the patch, cpp-package fixed also with Caffe plugin #5573

Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
d5f2439
PEP8 indentation fix
Mar 23, 2017
d8cdb85
Remove executable flag
Mar 23, 2017
1a1cea5
Remove executable flags
Mar 23, 2017
0261889
Fixing cpp-package including problems with caffe converter
Mar 24, 2017
1a69803
Fix warnings
cjolivier01 Mar 25, 2017
7e5e539
Remove need for caffe patch for caffe plugin
cjolivier01 Mar 25, 2017
208e912
Ignore cmake paths, remove rebuildable op.h for cpp-package
cjolivier01 Mar 25, 2017
d4aa582
cpp-package examples fixed. Makefile and CMake of op.h and examples a…
cjolivier01 Mar 26, 2017
84f1d4c
cpp-package examples fixed. Makefile and CMake of op.h and examples a…
cjolivier01 Mar 26, 2017
8216db5
Fix source file
cjolivier01 Mar 26, 2017
1e2e157
Better example.mk
cjolivier01 Mar 26, 2017
36ccab2
Turn off caffe by default
cjolivier01 Mar 26, 2017
6f65a27
lint fixes
cjolivier01 Mar 26, 2017
84aeb15
Trying to figure out how to fix submodules
cjolivier01 Mar 26, 2017
b57245e
Merge branch 'master' into caffefix
cjolivier01 Mar 26, 2017
a408279
nohub problem on travis so force retry
cjolivier01 Mar 26, 2017
38d9770
Edited test to just run make instead of obsolete make example
cjolivier01 Mar 26, 2017
8361297
Fix cpp-package op.h bootstrapping with CMake
cjolivier01 Mar 27, 2017
9d519f9
Merge branch 'master' into caffefix
cjolivier01 Mar 27, 2017
dde8f33
Build tweaking cpp-package
Mar 29, 2017
214b1eb
Merge in from master
Mar 29, 2017
b72af94
Lint fixes
Mar 29, 2017
33a6231
op.h generator
Mar 29, 2017
8b9a929
FIx cpp-package for latest merge from master
Mar 29, 2017
04e3baf
Fix lint
Mar 29, 2017
5918bd1
static link
Mar 29, 2017
6b0876e
link whole static lib
Mar 29, 2017
001175c
Merge branch 'master' into caffefix
cjolivier01 Mar 30, 2017
ec4f1ab
Trigger another build attempt
Mar 30, 2017
b89397f
Trigger another build attempt
Mar 30, 2017
a7f6766
Add caffe plugin support (disabled until dependencies can be added to…
Mar 30, 2017
fd8152d
Add cufft library
Mar 30, 2017
5bbee1e
win32 cufft library
Mar 30, 2017
2b42e03
don't link unit tests as static
Mar 30, 2017
e4987aa
Add include for rebuildable protobuf header caffe.pb.h
Mar 30, 2017
c21e859
Merge branch 'master' into caffefix
piiswrong Mar 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into caffefix
  • Loading branch information
@cjolivier01
cjolivier01 authored Mar 26, 2017
commit b57245e14ec13bb24eecea0ac89440f0297d14f7

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.