update to BVLC/caffe@f28f5ae

luoyetx · Jul 3, 2016 · 8ae65ef · 8ae65ef
1 parent 3c85204
commit 8ae65ef
Show file tree

Hide file tree

Showing 11 changed files with 216 additions and 770 deletions.
diff --git a/include/caffe/util/hdf5.hpp b/include/caffe/util/hdf5.hpp
diff --git a/src/caffe/common.cpp b/src/caffe/common.cpp
@@ -7,6 +7,8 @@
 #include "caffe/common.hpp"
 #include "caffe/util/rng.hpp"
 
+#include <process.h>
+
 namespace caffe {
 
 // Make sure each thread can have different values.
@@ -45,8 +47,8 @@ void GlobalInit(int* pargc, char*** pargv) {
   ::gflags::ParseCommandLineFlags(pargc, pargv, true);
   // Google logging.
   ::google::InitGoogleLogging(*(pargv)[0]);
-  // Provide a backtrace on segfault.
-  ::google::InstallFailureSignalHandler();
+  //// Provide a backtrace on segfault.
+  //::google::InstallFailureSignalHandler();
 }
 
 #ifdef CPU_ONLY  // CPU-only Caffe.

diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp
diff --git a/src/caffe/layers/hdf5_data_layer.cu b/src/caffe/layers/hdf5_data_layer.cu
diff --git a/src/caffe/layers/hdf5_output_layer.cpp b/src/caffe/layers/hdf5_output_layer.cpp
diff --git a/src/caffe/layers/hdf5_output_layer.cu b/src/caffe/layers/hdf5_output_layer.cu