[GitHub] [incubator-mxnet] drivanov commented on a change in pull request #14154: Improving the run time of the tests which use assert_almost_equal OR check_numeric_gradient functions

[GitBox <gi...@apache.org>]

drivanov commented on a change in pull request #14154: Improving the run time of the tests which use assert_almost_equal OR check_numeric_gradient functions
URL: https://github.com/apache/incubator-mxnet/pull/14154#discussion_r262235526
 
 

 ##########
 File path: src/operator/contrib/allclose_op-inl.h
 ##########
 @@ -0,0 +1,138 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*!
+ * \file allclose-inl.h
+ * \brief Operator implementing numpy.allclose function.
+ * \author Andrei Ivanov
+ */
+#ifndef MXNET_OPERATOR_CONTRIB_ALLCLOSE_OP_INL_H_
+#define MXNET_OPERATOR_CONTRIB_ALLCLOSE_OP_INL_H_
+
+#include <mxnet/operator_util.h>
+#include <vector>
+#include "../mshadow_op.h"
+#include "../mxnet_op.h"
+#include "../operator_common.h"
+#include "../elemwise_op_common.h"
+#include "../tensor/init_op.h"
+
+namespace mxnet {
+namespace op {
+
+struct AllCloseParam : public dmlc::Parameter<AllCloseParam> {
+  float rtol, atol;
+  bool equal_nan;
+  DMLC_DECLARE_PARAMETER(AllCloseParam) {
+    DMLC_DECLARE_FIELD(rtol)
+      .set_default(1e-05)
+      .describe("Relative tolerance.");
+    DMLC_DECLARE_FIELD(atol)
+      .set_default(1e-08)
+      .describe("Absolute tolerance.");
+    DMLC_DECLARE_FIELD(equal_nan)
+      .set_default(true)
+      .describe("Whether to compare NaN’s as equal. If True, NaN’s in a will be considered equal "
+                "to NaN’s in b in the output array.");
+  }
+};
+
+inline bool AllCloseShape(const nnvm::NodeAttrs& attrs,
+                          std::vector<TShape>* in_attrs,
+                          std::vector<TShape>* out_attrs) {
+  CHECK_EQ(in_attrs->size(), 2U) << "Input:[array1, array2]";
+  CHECK_EQ(out_attrs->size(), 1U);
+
+  SHAPE_ASSIGN_CHECK(*out_attrs, 0, TShape());
+  return in_attrs->at(0) == in_attrs->at(1);
+}
+
+inline bool AllCloseType(const nnvm::NodeAttrs& attrs,
+                         std::vector<int> *in_attrs,
+                         std::vector<int> *out_attrs) {
+  CHECK_EQ(in_attrs->size(), 2U);
+  CHECK_EQ(out_attrs->size(), 1U);
+
+  // The output will be boolean stored as an integer
+  TYPE_ASSIGN_CHECK(*out_attrs, 0, mshadow::kInt32);
+  return (*out_attrs)[0] != -1;
+}
+
+using namespace mshadow_op::isnan_typed;
+
+template<int req>
+struct allclose_forward {
+  template<typename DType>
+  MSHADOW_XINLINE static void Map(int i, int *out_data, const DType* in_a, const DType* in_b,
+                                  const float rtol, const float atol, bool equal_nan) {
+      const DType a = in_a[i], b = in_b[i];
+      const bool val = (IsNan(a) || IsNan(b))? equal_nan :
+                       a == b ||
+                       (a > b?  a - b : b - a) <= atol + (b > 0? rtol * b :  (-rtol) * b);
+      KERNEL_ASSIGN(out_data[i], req, val? 1 : 0);
+  }
+};
+
+template<typename xpu>
+size_t GetAdditionalMemorySize(const int num_items);
+
+template<typename xpu>
+void AllCloseAction(mshadow::Stream<xpu> *s,
+                    int *workspaceMemory,
+                    size_t extraStorageBytes,
+                    const TBlob& in_array0,
+                    const TBlob& in_array1,
+                    const std::vector<OpReqType>& req,
+                    const AllCloseParam& param,
+                    int *outPntr);
+
+template<typename xpu>
+void AllClose(const nnvm::NodeAttrs& attrs,
+              const OpContext& ctx,
+              const std::vector<TBlob>& inputs,
+              const std::vector<OpReqType>& req,
+              const std::vector<TBlob>& outputs) {
+  CHECK_EQ(inputs.size(), 2U);
+  CHECK_EQ(outputs.size(), 1U);
+  CHECK_EQ(req.size(), 1U);
+
+  const TBlob& in_array0 = inputs[0];
+  const TBlob& in_array1 = inputs[1];
+
+  const AllCloseParam& param = nnvm::get<AllCloseParam>(attrs.parsed);
+
+  auto s = ctx.get_stream<xpu>();
+  const int num_items = in_array0.Size();
+
+  // Get length of the additional memory (which is used only by DeviceReduce::Min(...) on gpu)
+  const size_t extraStorageBytes = GetAdditionalMemorySize<xpu>(num_items);
+  const size_t workspace_total_bytes_ = num_items * sizeof(float) + extraStorageBytes;
 
 Review comment:
   Actually, it was a good catch!
   
   We don't need to use `type_flag` or even `float` here. The correct fix would be
   ```
     const size_t workspace_total_bytes_ = num_items * sizeof(int) + extraStorageBytes;
   ```
   
   In my initial implementation `out_data`, which is used in 
   ```
     MSHADOW_XINLINE static void Map(int i, int *out_data, const DType* in_a, const DType* in_b,
   ```
   was a pointer to `float`. But when I was implementing the possibility for  `in_a, in_b` also be **not-a-numbers**, I 've changed the type of pointer to `int *out_data`.
   
   Perhaps, we could use even `char *out_data`, but I am not sure if 
   ```
     cub::DeviceReduce::Min(workspaceMemory + num_items, extraStorageBytes,
                            workspaceMemory, outPntr, num_items);
   ```
   would allow for `workspaceMemory` be a `char *` 
   
   

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services