projects
/
platform
/
upstream
/
caffeonacl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fb5c568
7683986
)
Merge pull request #752 from Yangqing/sweep
author
Jeff Donahue
<jeff.donahue@gmail.com>
Mon, 21 Jul 2014 17:25:59 +0000
(10:25 -0700)
committer
Jeff Donahue
<jeff.donahue@gmail.com>
Mon, 21 Jul 2014 17:25:59 +0000
(10:25 -0700)
reapply namespace change
1
2
include/caffe/net.hpp
patch
|
diff1
|
diff2
|
blob
|
history
src/caffe/layers/accuracy_layer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/caffe/layers/dropout_layer.cu
patch
|
diff1
|
diff2
|
blob
|
history
src/caffe/layers/image_data_layer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/caffe/layers/image_data_layer.cu
patch
|
diff1
|
diff2
|
blob
|
history
src/caffe/layers/pooling_layer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/caffe/layers/pooling_layer.cu
patch
|
diff1
|
diff2
|
blob
|
history
src/caffe/layers/window_data_layer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/caffe/layers/window_data_layer.cu
patch
|
diff1
|
diff2
|
blob
|
history
src/caffe/net.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
include/caffe/net.hpp
Simple merge
diff --cc
src/caffe/layers/accuracy_layer.cpp
index
58ea6ae
,
95439b9
..
7c91311
---
1
/
src/caffe/layers/accuracy_layer.cpp
---
2
/
src/caffe/layers/accuracy_layer.cpp
+++ b/
src/caffe/layers/accuracy_layer.cpp
@@@
-10,10
-10,9
+10,8
@@@
#include "caffe/util/math_functions.hpp"
#include "caffe/util/io.hpp"
-
namespace caffe {
- using std::max;
-
template <typename Dtype>
void AccuracyLayer<Dtype>::SetUp(
const vector<Blob<Dtype>*>& bottom, vector<Blob<Dtype>*>* top) {
diff --cc
src/caffe/layers/dropout_layer.cu
Simple merge
diff --cc
src/caffe/layers/image_data_layer.cpp
Simple merge
diff --cc
src/caffe/layers/image_data_layer.cu
Simple merge
diff --cc
src/caffe/layers/pooling_layer.cpp
Simple merge
diff --cc
src/caffe/layers/pooling_layer.cu
Simple merge
diff --cc
src/caffe/layers/window_data_layer.cpp
Simple merge
diff --cc
src/caffe/layers/window_data_layer.cu
Simple merge
diff --cc
src/caffe/net.cpp
Simple merge