[incubator-tvm] 03/05: Fix rebase issues

[jroesch]

This is an automated email from the ASF dual-hosted git repository.

jroesch pushed a commit to branch ci-docker-staging
in repository https://gitbox.apache.org/repos/asf/incubator-tvm.git

commit 44a785c83b4550fee7c0261b1f6fa57988d43f2f
Author: Jared Roesch <roesch...@gmail.com>
AuthorDate: Mon Oct 5 14:20:08 2020 -0700

    Fix rebase issues
---
 src/relay/op/nn/convolution.h                  | 4 ++++
 src/runtime/contrib/random/mt_random_engine.cc | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/relay/op/nn/convolution.h b/src/relay/op/nn/convolution.h
index 8a6c308..e7a5b13 100644
--- a/src/relay/op/nn/convolution.h
+++ b/src/relay/op/nn/convolution.h
@@ -362,13 +362,17 @@ bool Conv3DRel(const Array<Type>& types, int num_inputs, 
const Attrs& attrs,
           << "Conv3D: shape of weight is inconsistent with kernel_size, "
           << " kernel_size=" << param->kernel_size << " wshape=" << wshape;
     }
+
     if (param->channels.defined()) {
       CHECK(reporter->AssertEQ(param->channels, wshape[0]))
           << "Conv3D: shape of weight is inconsistent with channels, "
           << " channels=" << param->channels << " wshape=" << wshape;
     }
+
     if (!dshape_ncdhw[1].as<tir::AnyNode>() && !wshape[1].as<tir::AnyNode>()) {
       CHECK(reporter->AssertEQ(indexdiv(dshape_ncdhw[1], param->groups), 
wshape[1]));
+    }
+
     channels = wshape[0];
     dilated_ksize_z = 1 + (wshape[2] - 1) * param->dilation[0];
     dilated_ksize_y = 1 + (wshape[3] - 1) * param->dilation[1];
diff --git a/src/runtime/contrib/random/mt_random_engine.cc 
b/src/runtime/contrib/random/mt_random_engine.cc
index 8a4ee9a..8c20f07 100644
--- a/src/runtime/contrib/random/mt_random_engine.cc
+++ b/src/runtime/contrib/random/mt_random_engine.cc
@@ -42,7 +42,7 @@ class RandomEngine {
   /*!
    * \brief Creates a RandomEngine using a default seed.
    */
-  RandomEngine() { this->Seed(time(0)); }
+  RandomEngine() { this->Seed(time(nullptr)); }
 
   /*!
    * \brief Creates a RandomEngine, suggesting the use of a provided seed.