You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by la...@apache.org on 2019/07/10 22:22:54 UTC
[incubator-mxnet] branch master updated: fix the bug on Scala
Sparse (#15500)
This is an automated email from the ASF dual-hosted git repository.
lanking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 6191dd7 fix the bug on Scala Sparse (#15500)
6191dd7 is described below
commit 6191dd7083cac7574f8172a4a062bb9408cc7621
Author: Lanking <la...@live.com>
AuthorDate: Wed Jul 10 15:22:07 2019 -0700
fix the bug on Scala Sparse (#15500)
* fix the bug on sparse tensor
* update jenkins
---
ci/docker/runtime_functions.sh | 16 ++++++++--------
ci/jenkins/Jenkins_steps.groovy | 4 ++--
.../core/src/main/scala/org/apache/mxnet/NDArray.scala | 4 +++-
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 0fef2a0..424ab2c 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -952,13 +952,6 @@ unittest_ubuntu_python3_quantization_gpu() {
nosetests-3.4 $NOSE_COVERAGE_ARGUMENTS $NOSE_TIMER_ARGUMENTS --with-xunit --xunit-file nosetests_quantization_gpu.xml --verbose tests/python/quantization_gpu
}
-unittest_ubuntu_cpu_scala() {
- set -ex
- scala_prepare
- cd scala-package
- mvn -B integration-test
-}
-
unittest_centos7_cpu_scala() {
set -ex
cd /work/mxnet
@@ -1156,12 +1149,19 @@ integrationtest_ubuntu_cpu_dist_kvstore() {
../../tools/launch.py -n 3 --launcher local python test_server_profiling.py
}
+integrationtest_ubuntu_cpu_scala() {
+ set -ex
+ scala_prepare
+ cd scala-package
+ mvn -B verify -DskipTests=false
+}
+
integrationtest_ubuntu_gpu_scala() {
set -ex
scala_prepare
cd scala-package
export SCALA_TEST_ON_GPU=1
- mvn -B integration-test -DskipTests=false
+ mvn -B verify -DskipTests=false
}
integrationtest_ubuntu_gpu_dist_kvstore() {
diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy
index 668d2f7..4eb84b6 100644
--- a/ci/jenkins/Jenkins_steps.groovy
+++ b/ci/jenkins/Jenkins_steps.groovy
@@ -941,7 +941,7 @@ def test_unix_scala_cpu() {
ws('workspace/ut-scala-cpu') {
timeout(time: max_time, unit: 'MINUTES') {
utils.unpack_and_init('cpu', mx_lib, true)
- utils.docker_run('ubuntu_cpu', 'unittest_ubuntu_cpu_scala', false)
+ utils.docker_run('ubuntu_cpu', 'integrationtest_ubuntu_cpu_scala', false)
utils.publish_test_coverage()
}
}
@@ -955,7 +955,7 @@ def test_unix_scala_mkldnn_cpu(){
ws('workspace/ut-scala-mkldnn-cpu') {
timeout(time: max_time, unit: 'MINUTES') {
utils.unpack_and_init('mkldnn_cpu', mx_mkldnn_lib, true)
- utils.docker_run('ubuntu_cpu', 'unittest_ubuntu_cpu_scala', false)
+ utils.docker_run('ubuntu_cpu', 'integrationtest_ubuntu_cpu_scala', false)
utils.publish_test_coverage()
}
}
diff --git a/scala-package/core/src/main/scala/org/apache/mxnet/NDArray.scala b/scala-package/core/src/main/scala/org/apache/mxnet/NDArray.scala
index 1b7b31b..717120b 100644
--- a/scala-package/core/src/main/scala/org/apache/mxnet/NDArray.scala
+++ b/scala-package/core/src/main/scala/org/apache/mxnet/NDArray.scala
@@ -956,7 +956,9 @@ class NDArray private[mxnet](private[mxnet] val handle: NDArrayHandle,
DType(mxDtype.value)
}
- val sparseFormat: SparseFormat = {
+ // This is a optimization on the SparseFormat checking
+ // TODO: In some cases, the checking on Sparse is invalid (-1)
+ lazy val sparseFormat: SparseFormat = {
val mxSF = new RefInt
checkCall(_LIB.mxNDArrayGetStorageType(handle, mxSF))
SparseFormat(mxSF.value)