This is an automated email from the ASF dual-hosted git repository. skm pushed a commit to branch v1.6.x in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.6.x by this push: new fb3fea4 [CI][v1.6.x] Fix failing CI pipelines (#18597) fb3fea4 is described below commit fb3fea441f24a874219549e33a2ac0b0da3e8015 Author: Chaitanya Prakash Bapat <chai.ba...@gmail.com> AuthorDate: Tue Jun 30 18:37:22 2020 -0700 [CI][v1.6.x] Fix failing CI pipelines (#18597) * add the missing build_ubuntu_gpu_cuda101_cudnn7_mkldnn_cpp_test in runtime_functions.sh * Revert "add the missing build_ubuntu_gpu_cuda101_cudnn7_mkldnn_cpp_test in runtime_functions.sh" This reverts commit de173b05a393c2b21075b02f276b6fb6e5312530. * Revert "[CI][1.6.x] fix centos 7 url to unblock centos-cpu & gpu pipeline (#18560)" This reverts commit d2713482f9a6a45f1274df87bd34d784a94756ed. * fix centos 7 url to unblock centos-cpu & gpu pipeline * skip quantized conv flaky case (#16866) * Fix quantized concat when inputs are mixed int8 and uint8 Change-Id: I4da04bf4502425134a466823fb5f73da2d7a419b * skip flaky test * trigger ci * Trigger empty commit * [v1.7.x] update jetson dockerfile to support CUDA 10.0 (#18339) * update dockerfile for jetson * add toolchain files * update build_jetson function * update ubuntu_julia.sh * update FindCUDAToolkit.cmake * Update centos7_python.sh * revert changes on ubuntu_julia.sh * disable TVM for gpu build * Disable TVM_OP on GPU builds Co-authored-by: Wei Chu <wei...@amazon.com> Co-authored-by: Leonard Lausen <leon...@lausen.nl> * add setuptools to ci/docker/install/requirements * add missing build_ubuntu_gpu_cuda101_cudnn7_mkldnn_cpp_test * add setuptool to docker & cpp-test build syntax error * remove erroneously added cpp tests in 1.6.x * py3 to p2 Co-authored-by: Xinyu Chen <xinyu1.c...@intel.com> Co-authored-by: waytrue17 <52505574+waytru...@users.noreply.github.com> Co-authored-by: Wei Chu <wei...@amazon.com> Co-authored-by: Leonard Lausen <leon...@lausen.nl> --- ci/docker/Dockerfile.build.jetson | 5 +++++ ci/docker/install/requirements | 1 + ci/jenkins/Jenkins_steps.groovy | 13 ------------- ci/jenkins/Jenkinsfile_unix_gpu | 5 +---- 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/ci/docker/Dockerfile.build.jetson b/ci/docker/Dockerfile.build.jetson index 93fe5e0..45a0572 100644 --- a/ci/docker/Dockerfile.build.jetson +++ b/ci/docker/Dockerfile.build.jetson @@ -37,6 +37,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ unzip \ python3 \ python3-pip \ + python \ + python-pip \ awscli \ crossbuild-essential-arm64 \ && rm -rf /var/lib/apt/lists/* @@ -78,5 +80,8 @@ ARG GROUP_ID=0 COPY install/ubuntu_adduser.sh /work/ RUN /work/ubuntu_adduser.sh +COPY install/requirements /work/ +RUN python -m pip install -r /work/requirements + COPY runtime_functions.sh /work/ WORKDIR /work/mxnet diff --git a/ci/docker/install/requirements b/ci/docker/install/requirements index 5f9f28c..ada25d2 100644 --- a/ci/docker/install/requirements +++ b/ci/docker/install/requirements @@ -32,4 +32,5 @@ pylint==2.3.1; python_version >= '3.0' astroid==2.3.3; python_version >= '3.0' requests<2.19.0,>=2.18.4 scipy==1.2.1 +setuptools six==1.11.0 diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 5345c78..c5e3fab 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -261,19 +261,6 @@ def compile_unix_full_gpu() { }] } -def compile_unix_full_gpu_mkldnn_cpp_test() { - return ['GPU: CUDA10.1+cuDNN7+MKLDNN+CPPTEST': { - node(NODE_LINUX_CPU) { - ws('workspace/build-gpu-mkldnn-cpp') { - timeout(time: max_time, unit: 'MINUTES') { - utils.init_git() - utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_cuda101_cudnn7_mkldnn_cpp_test', false) - utils.pack_lib('gpu_mkldnn_cpp_test', mx_lib_cpp_capi) - } - } - } - }] -} def compile_unix_cmake_mkldnn_gpu() { return ['GPU: CMake MKLDNN': { diff --git a/ci/jenkins/Jenkinsfile_unix_gpu b/ci/jenkins/Jenkinsfile_unix_gpu index e3ff319..bc4a74e 100644 --- a/ci/jenkins/Jenkinsfile_unix_gpu +++ b/ci/jenkins/Jenkinsfile_unix_gpu @@ -41,8 +41,7 @@ core_logic: { custom_steps.compile_unix_cmake_gpu(), custom_steps.compile_unix_tensorrt_gpu(), custom_steps.compile_unix_int64_gpu(), - custom_steps.compile_unix_cmake_gpu_no_rtc(), - custom_steps.compile_unix_full_gpu_mkldnn_cpp_test() + custom_steps.compile_unix_cmake_gpu_no_rtc() ]) utils.parallel_stage('Tests', [ @@ -63,8 +62,6 @@ core_logic: { custom_steps.test_unix_scala_gpu(), custom_steps.test_unix_distributed_kvstore_gpu(), custom_steps.test_static_python_gpu(), - custom_steps.test_static_python_gpu_cmake(), - custom_steps.test_unix_capi_cpp_package(), // Disabled due to: https://github.com/apache/incubator-mxnet/issues/11407 //custom_steps.test_unix_caffe_gpu()