Skip to content

Commit

Permalink
Revert "replace cu101 with cuda since compat is no longer to be used"
Browse files Browse the repository at this point in the history 
with the replaement of gpuwithcompatenv with base gpu in ubuntu_gpu_cu101
all the unix-gpu builds which previously were switched to build_cuda can now be replaced back to gpu_cu101

This reverts commit 715078a.
  • Loading branch information
@ChaiBapchya
ChaiBapchya committed May 9, 2020
1 parent 152d2f5 commit e068021
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions ci/jenkins/Jenkins_steps.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def compile_unix_int64_gpu(lib_name) {
ws('workspace/build-gpu-int64') {
timeout(time: max_time, unit: 'MINUTES') {
utils.init_git()
utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_large_tensor', false)
utils.docker_run('ubuntu_build_cu101', 'build_ubuntu_gpu_large_tensor', false)
utils.pack_lib(lib_name, mx_cmake_lib)
}
}
Expand Down Expand Up @@ -310,7 +310,7 @@ def compile_unix_cmake_gpu(lib_name) {
ws('workspace/build-cmake-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
utils.init_git()
utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_cmake', false)
utils.docker_run('ubuntu_gpu_cu101', 'build_ubuntu_gpu_cmake', false)
utils.pack_lib(lib_name, mx_cmake_lib_cython)
}
}
Expand All @@ -324,7 +324,7 @@ def compile_unix_cmake_gpu_no_rtc(lib_name) {
ws('workspace/build-cmake-gpu-no-rtc') {
timeout(time: max_time, unit: 'MINUTES') {
utils.init_git()
utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_cmake_no_rtc', false)
utils.docker_run('ubuntu_gpu_cu101', 'build_ubuntu_gpu_cmake_no_rtc', false)
utils.pack_lib(lib_name, mx_cmake_lib)
}
}
Expand Down Expand Up @@ -597,7 +597,7 @@ def compile_unix_clang10_cuda_werror(lib_name) {
ws('workspace/build-cpu-clang10') {
timeout(time: max_time, unit: 'MINUTES') {
utils.init_git()
utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_clang10_werror', false)
utils.docker_run('ubuntu_gpu_cu101', 'build_ubuntu_gpu_clang10_werror', false)
utils.pack_lib(lib_name, mx_lib)
}
}
Expand Down Expand Up @@ -820,7 +820,7 @@ def test_unix_python3_gpu(lib_name) {
ws('workspace/ut-python3-gpu') {
try {
utils.unpack_and_init(lib_name, mx_lib_cython)
python3_gpu_ut_cython('ubuntu_build_cuda')
python3_gpu_ut_cython('ubuntu_gpu_cu101')
utils.publish_test_coverage()
} finally {
utils.collect_test_results_unix('tests_gpu.xml', 'tests_python3_gpu.xml')
Expand All @@ -837,7 +837,7 @@ def test_unix_python3_quantize_gpu(lib_name) {
timeout(time: max_time, unit: 'MINUTES') {
try {
utils.unpack_and_init(lib_name, mx_lib)
utils.docker_run('ubuntu_build_cuda', 'unittest_ubuntu_python3_quantization_gpu', true)
utils.docker_run('ubuntu_gpu_cu101', 'unittest_ubuntu_python3_quantization_gpu', true)
utils.publish_test_coverage()
} finally {
utils.collect_test_results_unix('tests_quantization_gpu.xml', 'tests_python3_quantize_gpu.xml')
Expand Down Expand Up @@ -920,7 +920,7 @@ def test_unix_python3_mkldnn_gpu(lib_name) {
ws('workspace/ut-python3-mkldnn-gpu') {
try {
utils.unpack_and_init(lib_name, mx_mkldnn_lib)
python3_gpu_ut('ubuntu_build_cuda')
python3_gpu_ut('ubuntu_gpu_cu101')
utils.publish_test_coverage()
} finally {
utils.collect_test_results_unix('tests_gpu.xml', 'tests_python3_mkldnn_gpu.xml')
Expand All @@ -936,7 +936,7 @@ def test_unix_python3_mkldnn_nocudnn_gpu(lib_name) {
ws('workspace/ut-python3-mkldnn-gpu-nocudnn') {
try {
utils.unpack_and_init(lib_name, mx_mkldnn_lib)
python3_gpu_ut_nocudnn('ubuntu_build_cuda')
python3_gpu_ut_nocudnn('ubuntu_gpu_cu101')
utils.publish_test_coverage()
} finally {
utils.collect_test_results_unix('tests_gpu.xml', 'tests_python3_mkldnn_gpu_nocudnn.xml')
Expand Down Expand Up @@ -970,7 +970,7 @@ def test_unix_python3_integration_gpu(lib_name) {
ws('workspace/it-python-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
utils.unpack_and_init(lib_name, mx_lib)
utils.docker_run('ubuntu_build_cuda', 'integrationtest_ubuntu_gpu_python', true)
utils.docker_run('ubuntu_gpu_cu101', 'integrationtest_ubuntu_gpu_python', true)
utils.publish_test_coverage()
}
}
Expand All @@ -984,7 +984,7 @@ def test_unix_cpp_package_gpu(lib_name) {
ws('workspace/it-cpp-package') {
timeout(time: max_time, unit: 'MINUTES') {
utils.unpack_and_init(lib_name, mx_lib_cpp_examples_make)
utils.docker_run('ubuntu_build_cuda', 'integrationtest_ubuntu_gpu_cpp_package', true)
utils.docker_run('ubuntu_gpu_cu101', 'integrationtest_ubuntu_gpu_cpp_package', true)
utils.publish_test_coverage()
}
}
Expand All @@ -998,7 +998,7 @@ def test_unix_capi_cpp_package(lib_name) {
ws('workspace/it-capi-cpp-package') {
timeout(time: max_time, unit: 'MINUTES') {
utils.unpack_and_init(lib_name, mx_lib_cpp_capi_make)
utils.docker_run('ubuntu_build_cuda', 'integrationtest_ubuntu_gpu_capi_cpp_package', true)
utils.docker_run('ubuntu_gpu_cu101', 'integrationtest_ubuntu_gpu_capi_cpp_package', true)
utils.publish_test_coverage()
}
}
Expand Down Expand Up @@ -1040,7 +1040,7 @@ def test_unix_scala_gpu(lib_name) {
ws('workspace/ut-scala-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
utils.unpack_and_init(lib_name, mx_lib_make)
utils.docker_run('ubuntu_build_cuda', 'integrationtest_ubuntu_gpu_scala', true)
utils.docker_run('ubuntu_gpu_cu101', 'integrationtest_ubuntu_gpu_scala', true)
utils.publish_test_coverage()
}
}
Expand Down Expand Up @@ -1123,7 +1123,7 @@ def test_unix_cpp_gpu(lib_name) {
ws('workspace/ut-cpp-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
utils.unpack_and_init(lib_name, mx_cmake_lib)
utils.docker_run('ubuntu_build_cuda', 'unittest_cpp', true)
utils.docker_run('ubuntu_gpu_cu101', 'unittest_cpp', true)
utils.publish_test_coverage()
}
}
Expand Down Expand Up @@ -1151,7 +1151,7 @@ def test_unix_perl_gpu(lib_name) {
ws('workspace/ut-perl-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
utils.unpack_and_init(lib_name, mx_lib_make)
utils.docker_run('ubuntu_build_cuda', 'unittest_ubuntu_cpugpu_perl', true)
utils.docker_run('ubuntu_gpu_cu101', 'unittest_ubuntu_cpugpu_perl', true)
utils.publish_test_coverage()
}
}
Expand All @@ -1165,7 +1165,7 @@ def test_unix_r_gpu(lib_name) {
ws('workspace/ut-r-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
utils.unpack_and_init(lib_name, mx_lib)
utils.docker_run('ubuntu_build_cuda', 'unittest_ubuntu_gpu_R', true)
utils.docker_run('ubuntu_gpu_cu101', 'unittest_ubuntu_gpu_R', true)
utils.publish_test_coverage()
}
}
Expand Down Expand Up @@ -1233,7 +1233,7 @@ def test_unix_distributed_kvstore_gpu(lib_name) {
ws('workspace/it-dist-kvstore') {
timeout(time: max_time, unit: 'MINUTES') {
utils.unpack_and_init(lib_name, mx_lib)
utils.docker_run('ubuntu_build_cuda', 'integrationtest_ubuntu_gpu_dist_kvstore', true)
utils.docker_run('ubuntu_gpu_cu101', 'integrationtest_ubuntu_gpu_dist_kvstore', true)
utils.publish_test_coverage()
}
}
Expand Down

0 comments on commit e068021

Please sign in to comment.