code review comments

smessmer · smessmer · commit b51ba2cfd61a · 2018-06-28T17:31:34.000-07:00
diff --git a/caffe2/core/operator.cc b/caffe2/core/operator.cc
@@ -100,10 +100,7 @@ unique_ptr<OperatorBase> TryCreateC2Operator(
 
 unique_ptr<OperatorBase> TryCreateC10Operator(
     const string& key, const OperatorDef& operator_def, Workspace* ws) {
-  if (auto op = C10OperatorRegistry()->Create(key, operator_def, ws)) {
-    return op;
-  }
-  return nullptr;
+  return C10OperatorRegistry()->Create(key, operator_def, ws);
 }
 
 unique_ptr<OperatorBase> TryCreateOperator(
diff --git a/caffe2/operators/c10_sigmoid_op.h b/caffe2/operators/c10_sigmoid_op.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include "../core/tensor.h"
+#include "caffe2/core/tensor.h"
 #include "caffe2/utils/Array.h"
 
 namespace caffe2 {
 
 struct SigmoidOp final {
     static constexpr const char* name = "sigmoid";
     
-    using Signature = bool(Tensor<CPUContext> input, Tensor<CPUContext>* output);
+    using Signature = void(Tensor<CPUContext> input, Tensor<CPUContext>* output);
 
     static constexpr c10::guts::array<const char*, 2> parameter_names = {{"input", "output"}};
 };
diff --git a/caffe2/operators/c10_sigmoid_op_cpu.cc b/caffe2/operators/c10_sigmoid_op_cpu.cc
@@ -7,13 +7,11 @@ using caffe2::CPUContext;
 
 namespace {
 template<class DataType>
-bool sigmoid_op_cpu_impl(Tensor<CPUContext> input, Tensor<CPUContext> *output) {
+void sigmoid_op_cpu_impl(Tensor<CPUContext> input, Tensor<CPUContext> *output) {
     output->ResizeLike(input);
 
     caffe2::ConstEigenVectorArrayMap<DataType> xM(input.data<DataType>(), input.size());
     caffe2::EigenVectorArrayMap<DataType>(output->mutable_data<DataType>(), input.size()) = 1. / (1. + (-xM).exp());
-
-    return true;
 }
 } // namespace
 
