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 2019/01/08 13:01:46 UTC
[GitHub] marcoabreu closed pull request #13338: [CI] Add CPU C++ test stage
marcoabreu closed pull request #13338: [CI] Add CPU C++ test stage
URL: https://github.com/apache/incubator-mxnet/pull/13338
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/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index a84ee2c53af..791c2bd0896 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -392,6 +392,7 @@ build_ubuntu_cpu_cmake_debug() {
-DUSE_MKL_IF_AVAILABLE=OFF \
-DUSE_OPENMP=OFF \
-DUSE_OPENCV=ON \
+ -DUSE_SIGNAL_HANDLER=ON \
-DCMAKE_BUILD_TYPE=Debug \
-G Ninja \
/work/mxnet
@@ -696,6 +697,7 @@ build_ubuntu_gpu_cmake_mkldnn() {
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CUDA_COMPILER_LAUNCHER=ccache \
+ -DUSE_SIGNAL_HANDLER=ON \
-DENABLE_TESTCOVERAGE=ON \
-DUSE_CUDA=1 \
-DUSE_CUDNN=1 \
@@ -720,12 +722,14 @@ build_ubuntu_gpu_cmake() {
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CUDA_COMPILER_LAUNCHER=ccache \
+ -DUSE_SIGNAL_HANDLER=ON \
-DENABLE_TESTCOVERAGE=ON \
- -DUSE_CUDA=1 \
- -DUSE_CUDNN=1 \
- -DUSE_MKLML_MKL=0 \
- -DUSE_MKLDNN=0 \
- -DUSE_DIST_KVSTORE=1 \
+ -DUSE_CUDA=ON \
+ -DUSE_CUDNN=ON \
+ -DUSE_MKL_IF_AVAILABLE=OFF \
+ -DUSE_MKLML_MKL=OFF \
+ -DUSE_MKLDNN=OFF \
+ -DUSE_DIST_KVSTORE=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCUDA_ARCH_NAME=Manual \
-DCUDA_ARCH_BIN=$CI_CMAKE_CUDA_ARCH_BIN \
@@ -861,7 +865,7 @@ unittest_ubuntu_cpugpu_perl() {
./perl-package/test.sh
}
-unittest_ubuntu_gpu_cpp() {
+unittest_cpp() {
set -ex
build/tests/mxnet_unit_tests
}
diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy
index 3ca1f2ee033..57454b9ee44 100644
--- a/ci/jenkins/Jenkins_steps.groovy
+++ b/ci/jenkins/Jenkins_steps.groovy
@@ -108,7 +108,7 @@ def compile_unix_cpu_openblas() {
}
def compile_unix_openblas_debug_cpu() {
- return ['CPU: Openblas, debug': {
+ return ['CPU: Openblas, cmake, debug': {
node(NODE_LINUX_CPU) {
ws('workspace/build-cpu-openblas') {
timeout(time: max_time, unit: 'MINUTES') {
@@ -882,7 +882,7 @@ def test_unix_cpp_gpu() {
ws('workspace/ut-cpp-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
utils.unpack_and_init('cmake_gpu', mx_cmake_lib, true)
- utils.docker_run('ubuntu_gpu', 'unittest_ubuntu_gpu_cpp', true)
+ utils.docker_run('ubuntu_gpu', 'unittest_cpp', true)
utils.publish_test_coverage()
}
}
@@ -896,7 +896,21 @@ def test_unix_cpp_mkldnn_gpu() {
ws('workspace/ut-cpp-mkldnn-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
utils.unpack_and_init('cmake_mkldnn_gpu', mx_cmake_mkldnn_lib, true)
- utils.docker_run('ubuntu_gpu', 'unittest_ubuntu_gpu_cpp', true)
+ utils.docker_run('ubuntu_gpu', 'unittest_cpp', true)
+ utils.publish_test_coverage()
+ }
+ }
+ }
+ }]
+}
+
+def test_unix_cpp_cpu() {
+ return ['Cpp: CPU': {
+ node(NODE_LINUX_CPU) {
+ ws('workspace/ut-cpp-cpu') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ utils.unpack_and_init('cpu_debug', mx_cmake_lib_debug, true)
+ utils.docker_run('ubuntu_cpu', 'unittest_cpp', false)
utils.publish_test_coverage()
}
}
diff --git a/ci/jenkins/Jenkinsfile_unix_cpu b/ci/jenkins/Jenkinsfile_unix_cpu
index e581bcf65dc..8f41fa69f91 100644
--- a/ci/jenkins/Jenkinsfile_unix_cpu
+++ b/ci/jenkins/Jenkinsfile_unix_cpu
@@ -54,7 +54,7 @@ core_logic: {
custom_steps.test_unix_r_cpu(),
custom_steps.test_unix_julia_cpu(),
custom_steps.test_unix_onnx_cpu(),
-
+ custom_steps.test_unix_cpp_cpu(),
/* Disabled due to master build failure:
* http://jenkins.mxnet-ci.amazon-ml.com/blue/organizations/jenkins/incubator-mxnet/detail/master/1221/pipeline/
* https://github.com/apache/incubator-mxnet/issues/11801
----------------------------------------------------------------
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