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 2018/08/24 20:03:21 UTC
[GitHub] szha closed pull request #12338: Release1.3 cherry-pick few PRs
szha closed pull request #12338: Release1.3 cherry-pick few PRs
URL: https://github.com/apache/incubator-mxnet/pull/12338
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/Jenkinsfile b/Jenkinsfile
index 50b86ec7190..0e4aa199a6c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -173,12 +173,12 @@ core_logic: {
}
}
},
- 'CPU: Clang 5': {
+ 'CPU: Clang 6': {
node(NODE_LINUX_CPU) {
- ws('workspace/build-cpu-clang50') {
+ ws('workspace/build-cpu-clang60') {
timeout(time: max_time, unit: 'MINUTES') {
utils.init_git()
- utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_clang50', false)
+ utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_clang60', false)
}
}
}
@@ -194,13 +194,13 @@ core_logic: {
}
}
},
- 'CPU: Clang 5 MKLDNN': {
+ 'CPU: Clang 6 MKLDNN': {
node(NODE_LINUX_CPU) {
- ws('workspace/build-cpu-mkldnn-clang50') {
+ ws('workspace/build-cpu-mkldnn-clang60') {
timeout(time: max_time, unit: 'MINUTES') {
utils.init_git()
- utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_clang50_mkldnn', false)
- utils.pack_lib('mkldnn_cpu_clang5', mx_mkldnn_lib)
+ utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_clang60_mkldnn', false)
+ utils.pack_lib('mkldnn_cpu_clang6', mx_mkldnn_lib)
}
}
}
@@ -363,16 +363,16 @@ core_logic: {
}
}
},
- // 'ARMv7':{
- // node(NODE_LINUX_CPU) {
- // ws('workspace/build-ARMv7') {
- // timeout(time: max_time, unit: 'MINUTES') {
- // utils.init_git()
- // utils.docker_run('armv7', 'build_armv7', false)
- // }
- // }
- // }
- // },
+ 'ARMv7':{
+ node(NODE_LINUX_CPU) {
+ ws('workspace/build-ARMv7') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ utils.init_git()
+ utils.docker_run('armv7', 'build_armv7', false)
+ }
+ }
+ }
+ },
'ARMv6':{
node(NODE_LINUX_CPU) {
ws('workspace/build-ARMv6') {
diff --git a/ci/docker/Dockerfile.build.armv7 b/ci/docker/Dockerfile.build.armv7
index 6316270f9cf..2ad3bea519c 100755
--- a/ci/docker/Dockerfile.build.armv7
+++ b/ci/docker/Dockerfile.build.armv7
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for Android ARMv7
-FROM dockcross/linux-armv7
+FROM mxnetci/dockcross-linux-armv7:08212018
ENV ARCH armv7l
ENV HOSTCC gcc
diff --git a/ci/docker/install/ubuntu_clang.sh b/ci/docker/install/ubuntu_clang.sh
index 39a5600ce9d..40761716933 100755
--- a/ci/docker/install/ubuntu_clang.sh
+++ b/ci/docker/install/ubuntu_clang.sh
@@ -21,11 +21,11 @@
# the whole docker cache for the image
set -ex
-# Install clang 3.9 (the same version as in XCode 8.*) and 5.0 (latest major release)
+# Install clang 3.9 (the same version as in XCode 8.*) and 6.0 (latest major release)
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main" && \
- apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" && \
+ apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" && \
apt-get update && \
- apt-get install -y clang-3.9 clang-5.0 && \
+ apt-get install -y clang-3.9 clang-6.0 && \
clang-3.9 --version && \
- clang-5.0 --version
+ clang-6.0 --version
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 35311396e34..1e38ec48e6c 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -349,11 +349,11 @@ build_ubuntu_cpu_clang39() {
-j$(nproc)
}
-build_ubuntu_cpu_clang50() {
+build_ubuntu_cpu_clang60() {
set -ex
- export CXX=clang++-5.0
- export CC=clang-5.0
+ export CXX=clang++-6.0
+ export CC=clang-6.0
build_ccache_wrappers
@@ -381,11 +381,11 @@ build_ubuntu_cpu_clang39_mkldnn() {
-j$(nproc)
}
-build_ubuntu_cpu_clang50_mkldnn() {
+build_ubuntu_cpu_clang60_mkldnn() {
set -ex
- export CXX=clang++-5.0
- export CC=clang-5.0
+ export CXX=clang++-6.0
+ export CC=clang-6.0
build_ccache_wrappers
diff --git a/src/operator/tensor/control_flow_op.h b/src/operator/tensor/control_flow_op.h
index 94e65109c35..e9aa9f63fae 100644
--- a/src/operator/tensor/control_flow_op.h
+++ b/src/operator/tensor/control_flow_op.h
@@ -189,6 +189,7 @@ inline bool WhereOpShape(const nnvm::NodeAttrs& attrs,
return true;
} else if ((*in_attrs)[0].ndim() == 1) {
CHECK_EQ((*in_attrs)[0].Size(), static_cast<size_t>(tshape[0]));
+ return true;
}
return false;
}
diff --git a/tests/python/unittest/test_operator.py b/tests/python/unittest/test_operator.py
index e1e5c9e61c2..5e5e956691f 100644
--- a/tests/python/unittest/test_operator.py
+++ b/tests/python/unittest/test_operator.py
@@ -4507,6 +4507,14 @@ def test_invalid_shape():
y=mx.nd.array([[8,9],[10,11],[12,13]]),
condition=mx.nd.array([1,0])), MXNetError)
+ def test_1d_cond():
+ cond = mx.nd.array([1, 0, 1])
+ x = mx.nd.array([[2, 3], [4, 5], [6, 7]])
+ y = mx.nd.array([[7, 8], [9, 10], [10, 11]])
+ expect_out = np.array([[2, 3], [9, 10], [6, 7]])
+ out = mx.nd.where(cond, x, y).asnumpy()
+ assert(expect_out.all() == out.all())
+
test_where_helper((5, 9), True)
test_where_helper((5, 9), False)
test_where_helper((5, 7, 9), True)
@@ -4518,6 +4526,7 @@ def test_invalid_shape():
test_where_numeric_gradient((5, 7, 9), True)
test_where_numeric_gradient((5, 7, 9), False)
test_invalid_shape()
+ test_1d_cond()
@with_seed()
def test_new_softmax():
----------------------------------------------------------------
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