You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2017/11/15 18:40:37 UTC
[GitHub] piiswrong closed pull request #8665: fix image_random compile
piiswrong closed pull request #8665: fix image_random compile
URL: https://github.com/apache/incubator-mxnet/pull/8665
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/src/operator/image/image_random-inl.h b/src/operator/image/image_random-inl.h
index fa1d6dc529..8a3acf6f5f 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 32648bbfc0..83abc17548 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 742c142053..623179306a 100644
--- a/src/operator/tensor/elemwise_binary_scalar_op_basic.cc
+++ b/src/operator/tensor/elemwise_binary_scalar_op_basic.cc
@@ -57,7 +57,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,
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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