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

Switch CD to cmake build #17646

Closed
wants to merge 1 commit into from
Closed

Switch CD to cmake build #17646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions cd/mxnet_lib/static/Jenkins_pipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ libmxnet = 'lib/libmxnet.so'
licenses = 'licenses/*'

// libmxnet dependencies
mx_native_deps = 'lib/libgfortran.so.3, lib/libquadmath.so.0'
mx_deps = 'lib/libgfortran.so.3, lib/libquadmath.so.0, 3rdparty/mkldnn/build/install/include/dnnl_version.h, 3rdparty/mkldnn/build/install/include/dnnl_config.h'
mx_native_deps = 'lib/libgfortran.so.3, lib/libopenblas.so.0, lib/libquadmath.so.0'
mx_deps = 'lib/libgfortran.so.3, lib/libopenblas.so.0, lib/libquadmath.so.0, 3rdparty/mkldnn/build/install/include/dnnl_version.h, 3rdparty/mkldnn/build/install/include/dnnl_config.h'

// library type
// either static or dynamic - depending on how it links to its dependencies
Expand All @@ -46,7 +46,7 @@ def build(mxnet_variant) {
node(NODE_LINUX_CPU) {
ws("workspace/mxnet_${libtype}/${mxnet_variant}/${env.BUILD_NUMBER}") {
ci_utils.init_git()
// Compiling in Ubuntu14.04 due to glibc issues.
// Compiling in Ubuntu14.04 due to glibc issues.
// This should be updates once we have clarity on this issue.
ci_utils.docker_run('publish.ubuntu1404_cpu', "build_static_libmxnet ${mxnet_variant}", false)
ci_utils.pack_lib("mxnet_${mxnet_variant}", libmxnet_pipeline.get_stash(mxnet_variant))
Expand Down
19 changes: 2 additions & 17 deletions ci/docker/runtime_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2005,22 +2005,6 @@ build_static_scala_cpu() {
}

build_static_python_cpu() {
set -ex
pushd .
export mxnet_variant=cpu
./ci/publish/python/build.sh
popd
}

build_static_python_cu101() {
set -ex
pushd .
export mxnet_variant=cu101
./ci/publish/python/build.sh
popd
}

build_static_python_cpu_cmake() {
set -ex
pushd .
export mxnet_variant=cpu
Expand All @@ -2029,7 +2013,7 @@ build_static_python_cpu_cmake() {
popd
}

build_static_python_cu101_cmake() {
build_static_python_cu101() {
set -ex
pushd .
export mxnet_variant=cu101
Expand All @@ -2042,6 +2026,7 @@ publish_scala_build() {
set -ex
pushd .
scala_prepare
export CMAKE_STATICBUILD=1
./ci/publish/scala/build.sh
popd
}
Expand Down
26 changes: 0 additions & 26 deletions ci/jenkins/Jenkins_steps.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,19 +676,6 @@ def test_static_python_cpu() {
}]
}

def test_static_python_cpu_cmake() {
return ['Static build CPU 14.04 Python with CMake' : {
node(NODE_LINUX_CPU) {
ws('workspace/ut-publish-python-cpu') {
timeout(time: max_time, unit: 'MINUTES') {
utils.init_git()
utils.docker_run("publish.ubuntu1404_cpu", 'build_static_python_cpu_cmake', false)
}
}
}
}]
}

def test_static_python_gpu() {
return ['Static build GPU 14.04 Python' : {
node(NODE_LINUX_GPU) {
Expand All @@ -702,19 +689,6 @@ def test_static_python_gpu() {
}]
}

def test_static_python_gpu_cmake() {
return ['Static build GPU 14.04 Python' : {
node(NODE_LINUX_GPU) {
ws('workspace/ut-publish-python-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
utils.init_git()
utils.docker_run("publish.ubuntu1404_gpu", 'build_static_python_cu101_cmake', true)
}
}
}
}]
}

def test_unix_python3_cpu() {
return ['Python3: CPU': {
node(NODE_LINUX_CPU) {
Expand Down