Merge pull request BVLC#834 from qipeng/dev

Included cmath in common.hpp to avoid isnan complaints from the xcode co...

include/caffe/common.hpp

@@ -6,6 +6,7 @@
 #include <boost/shared_ptr.hpp>
 #include <glog/logging.h>
 
+#include <cmath>
 #include <map>
 #include <set>
 #include <string>
@@ -71,6 +72,7 @@ using boost::shared_ptr;
 // Common functions and classes from std that caffe often uses.
 using std::fstream;
 using std::ios;
+using std::isnan;
 using std::iterator;
 using std::make_pair;
 using std::map;

matlab/caffe/matcaffe.cpp

@@ -183,7 +183,7 @@ static mxArray* do_get_weights() {
       mxArray* mx_layer_cells = NULL;
       if (layer_names[i] != prev_layer_name) {
         prev_layer_name = layer_names[i];
-        const mwSize dims[2] = {layer_blobs.size(), 1};
+        const mwSize dims[2] = {static_cast<mwSize>(layer_blobs.size()), 1};
         mx_layer_cells = mxCreateCellArray(2, dims);
         mxSetField(mx_layers, mx_layer_index, "weights", mx_layer_cells);
         mxSetField(mx_layers, mx_layer_index, "layer_names",

src/caffe/test/test_solver.cpp

@@ -96,7 +96,7 @@ TYPED_TEST(SolverTest, TestInitTrainTestNets) {
      "  } "
      "} ";
   this->InitSolverFromProtoString(proto);
-  ASSERT_TRUE(this->solver_->net());
+  ASSERT_TRUE(this->solver_->net() != NULL);
   EXPECT_TRUE(this->solver_->net()->has_layer("loss"));
   EXPECT_FALSE(this->solver_->net()->has_layer("accuracy"));
   ASSERT_EQ(2, this->solver_->test_nets().size());