Initializing caffe::DataReader::bodies_ in libcaffe.so instead of caf…

…fe application
ROCm · Apr 28, 2017 · 017b0fc · 017b0fc
1 parent 9282ea0
commit 017b0fc
Show file tree

Hide file tree

Showing 18 changed files with 10 additions and 35 deletions.
diff --git a/examples/cifar10/convert_cifar_data.cpp b/examples/cifar10/convert_cifar_data.cpp
@@ -109,4 +109,3 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
diff --git a/examples/cpp_classification/classification.cpp b/examples/cpp_classification/classification.cpp
@@ -264,4 +264,3 @@ int main(int argc, char** argv) {
 }
 #endif  // USE_OPENCV
 
-#include "caffe/data_reader_hack.inl"
diff --git a/examples/mnist/convert_mnist_data.cpp b/examples/mnist/convert_mnist_data.cpp
@@ -146,4 +146,3 @@ int main(int argc, char** argv) {
 }
 #endif  // USE_LEVELDB and USE_LMDB
 
-#include "caffe/data_reader_hack.inl"
diff --git a/examples/siamese/convert_mnist_siamese_data.cpp b/examples/siamese/convert_mnist_siamese_data.cpp
@@ -128,4 +128,3 @@ int main(int argc, char** argv) {
 }
 #endif  // USE_LEVELDB
 
-#include "caffe/data_reader_hack.inl"
diff --git a/include/caffe/data_reader_hack.inl b/include/caffe/data_reader_hack.inl
diff --git a/src/caffe/data_reader.cpp b/src/caffe/data_reader.cpp
@@ -12,7 +12,7 @@ namespace caffe {
 
 using boost::weak_ptr;
 
-//map<const string, weak_ptr<DataReader::Body> > DataReader::bodies_;
+map<const string, weak_ptr<DataReader::Body> > DataReader::bodies_;
 static boost::mutex bodies_mutex_;
 
 DataReader::DataReader(const LayerParameter& param)

diff --git a/tools/caffe.cpp b/tools/caffe.cpp
@@ -452,5 +452,4 @@ int main(int argc, char** argv) {
   }
 }
 
-#include "caffe/data_reader_hack.inl"
 
diff --git a/tools/compute_image_mean.cpp b/tools/compute_image_mean.cpp
@@ -122,4 +122,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/convert_imageset.cpp b/tools/convert_imageset.cpp
@@ -158,4 +158,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/device_query.cpp b/tools/device_query.cpp
@@ -6,4 +6,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/extract_features.cpp b/tools/extract_features.cpp
@@ -182,4 +182,4 @@ int feature_extraction_pipeline(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/finetune_net.cpp b/tools/finetune_net.cpp
@@ -6,4 +6,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/net_speed_benchmark.cpp b/tools/net_speed_benchmark.cpp
@@ -6,4 +6,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/test_net.cpp b/tools/test_net.cpp
@@ -6,4 +6,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/train_net.cpp b/tools/train_net.cpp
@@ -6,4 +6,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/upgrade_net_proto_binary.cpp b/tools/upgrade_net_proto_binary.cpp
@@ -49,4 +49,4 @@ int main(int argc, char** argv) {
   return !success;
 }
 
-#include "caffe/data_reader_hack.inl"
+
diff --git a/tools/upgrade_net_proto_text.cpp b/tools/upgrade_net_proto_text.cpp
@@ -50,4 +50,3 @@ int main(int argc, char** argv) {
   return !success;
 }
 
-#include "caffe/data_reader_hack.inl"
diff --git a/tools/upgrade_solver_proto_text.cpp b/tools/upgrade_solver_proto_text.cpp
@@ -50,4 +50,3 @@ int main(int argc, char** argv) {
   return !success;
 }
 
-#include "caffe/data_reader_hack.inl"