Merge pull request #93 from tqchen/master

remove warning
apache · Sep 18, 2015 · cb40e00 · cb40e00
2 parents 5de9233 + dc4ff9d
commit cb40e00
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/dmlc-core b/dmlc-core
diff --git a/mshadow b/mshadow
diff --git a/src/engine/engine.cc b/src/engine/engine.cc
@@ -25,8 +25,9 @@ inline Engine* CreateEngine() {
     ret = CreateThreadedEnginePerDevice();
   }
 
-  CHECK_NE(ret, nullptr)
-      << "Cannot find Engine " << type;
+  if (ret ==nullptr) {
+    LOG(FATAL) << "Cannot find Engine " << type;
+  }
   if (!default_engine) {
     LOG(INFO) << "MXNet start using engine: " << type;
   }

diff --git a/src/engine/threaded_engine_pooled.cc b/src/engine/threaded_engine_pooled.cc
@@ -7,6 +7,7 @@
 #include <dmlc/base.h>
 #include <dmlc/logging.h>
 #include <dmlc/concurrency.h>
+#include <cassert>
 #include "./threaded_engine.h"
 #include "./thread_pool.h"
 #include "./stream_manager.h"

diff --git a/src/operator/operator.cc b/src/operator/operator.cc
@@ -15,8 +15,9 @@ namespace mxnet {
 // implementation of all factory functions
 OperatorProperty *OperatorProperty::Create(const char* type_name) {
   auto *creator = dmlc::Registry<OperatorPropertyReg>::Find(type_name);
-  CHECK_NE(creator, nullptr)
-      << "Cannot find Operator " << type_name << " in registry";
+  if (creator == nullptr) {
+    LOG(FATAL) << "Cannot find Operator " << type_name << " in registry";
+  }
   return creator->body();
 }
 }  // namespace mxnet
diff --git a/src/symbol/graph_executor.cc b/src/symbol/graph_executor.cc
@@ -167,8 +167,9 @@ inline std::vector<std::pair<T, T> > GraphExecutor::GetInplaceOption(
         out_grad_index, in_data_index, out_data_index, in_grad_ptr);
     std::vector<std::pair<T, T> > remap(remap_index.size());
     for (size_t i = 0; i < remap_index.size(); ++i) {
-      CHECK_NE(args_array[remap_index[i].first], nullptr)
-          << "BackwardInplaceOption uses input that is returned by DeclareBackwardDependency";
+      if (args_array[remap_index[i].first] == nullptr) {
+        LOG(FATAL) << "BackwardInplaceOption uses input that is returned by DeclareBackwardDependency";
+      }
       remap[i].first = *args_array[remap_index[i].first];
       remap[i].second = *static_cast<T*>(remap_index[i].second);
     }