Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[CI] Add CPU C++ test stage #13338

Merged
merged 1 commit into from
Jan 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions ci/docker/runtime_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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
}
Expand Down
20 changes: 17 additions & 3 deletions ci/jenkins/Jenkins_steps.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down Expand Up @@ -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()
}
}
Expand All @@ -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()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ci/jenkins/Jenkinsfile_unix_cpu
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down