You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by jx...@apache.org on 2017/11/21 00:31:50 UTC
[incubator-mxnet] 05/08: fix image_random compile (#8665)
This is an automated email from the ASF dual-hosted git repository.
jxie pushed a commit to branch vision
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
commit ae9fd42e838a5d251db76397158c91799fddfb8b
Author: Yizhi Liu <ja...@gmail.com>
AuthorDate: Wed Nov 15 10:40:34 2017 -0800
fix image_random compile (#8665)
---
src/operator/image/image_random-inl.h | 2 +-
src/operator/image/image_random.cc | 4 ++--
src/operator/tensor/elemwise_binary_scalar_op_basic.cc | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/operator/image/image_random-inl.h b/src/operator/image/image_random-inl.h
index fa1d6dc..8a3acf6 100644
--- a/src/operator/image/image_random-inl.h
+++ b/src/operator/image/image_random-inl.h
@@ -31,7 +31,7 @@
#include <opencv2/core/mat.hpp>
#include "../mxnet_op.h"
#include "image_common.h"
-#include "operator/operator_common.h"
+#include "../../operator/operator_common.h"
namespace mxnet {
diff --git a/src/operator/image/image_random.cc b/src/operator/image/image_random.cc
index 32648bb..83abc17 100644
--- a/src/operator/image/image_random.cc
+++ b/src/operator/image/image_random.cc
@@ -25,8 +25,8 @@
#include <mxnet/base.h>
#include "./image_random-inl.h"
-#include "operator/operator_common.h"
-#include "operator/elemwise_op_common.h"
+#include "../../operator/operator_common.h"
+#include "../../operator/elemwise_op_common.h"
diff --git a/src/operator/tensor/elemwise_binary_scalar_op_basic.cc b/src/operator/tensor/elemwise_binary_scalar_op_basic.cc
index 2d6662e..13f806d 100644
--- a/src/operator/tensor/elemwise_binary_scalar_op_basic.cc
+++ b/src/operator/tensor/elemwise_binary_scalar_op_basic.cc
@@ -58,7 +58,7 @@ static bool BinaryScalarStorageTypeWithDenseResultStorageType(const NodeAttrs& a
kDefaultStorage,
dispatch_mode,
DispatchMode::kFCompute);
- } else if (dev_mask == kCPU) {
+ } else if (dev_mask == Context::kCPU) {
dispatched = storage_type_assign(&out_attrs[0],
kDefaultStorage,
dispatch_mode,
--
To stop receiving notification emails like this one, please contact
"commits@mxnet.apache.org" <co...@mxnet.apache.org>.