fix CD and remove leftover from apache#15990 (apache#17551)

zheyuye · Feb 19, 2020 · ec84971 · ec84971
1 parent 68a37b9
commit ec84971
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 52 deletions.
diff --git a/cd/mxnet_lib/mxnet_lib_pipeline.groovy b/cd/mxnet_lib/mxnet_lib_pipeline.groovy
@@ -34,13 +34,6 @@ def get_pipeline(mxnet_variant, build_fn) {
 
       stage('Test') {
         def tests = [:]
-        tests["${mxnet_variant}: Python 2"] = {
-          stage("${mxnet_variant}: Python 2") {
-            timeout(time: max_time, unit: 'MINUTES') {
-              unittest_py2(mxnet_variant)
-            }
-          }
-        }
         tests["${mxnet_variant}: Python 3"] = {
           stage("${mxnet_variant}: Python 3") {
             timeout(time: max_time, unit: 'MINUTES') {
@@ -58,13 +51,6 @@ def get_pipeline(mxnet_variant, build_fn) {
               }
             }
           }
-          tests["${mxnet_variant}: Quantization Python 2"] = {
-            stage("${mxnet_variant}: Python 2") {
-              timeout(time: max_time, unit: 'MINUTES') {
-                test_gpu_quantization_py2(mxnet_variant)
-              }
-            }
-          }
         }
 
         parallel tests
@@ -119,30 +105,6 @@ def unittest_py3(mxnet_variant) {
   }
 }
 
-// Runs unit tests using python 2
-def unittest_py2(mxnet_variant) {
-  def node_label = get_jenkins_node_label(mxnet_variant)
-  node(node_label) {
-    ws("workspace/mxnet_${libtype}/${mxnet_variant}/${env.BUILD_NUMBER}") {
-      def image = get_environment(mxnet_variant)
-      def use_nvidia_docker = mxnet_variant.startsWith('cu')
-      ci_utils.unpack_and_init("mxnet_${mxnet_variant}", get_stash(mxnet_variant), false)
-      ci_utils.docker_run(image, "cd_unittest_ubuntu ${mxnet_variant} python", use_nvidia_docker)
-    }
-  }
-}
-
-// Tests quantization in P3 instance using Python 2
-def test_gpu_quantization_py2(mxnet_variant) {
-  node(NODE_LINUX_GPU_P3) {
-    ws("workspace/mxnet_${libtype}/${mxnet_variant}/${env.BUILD_NUMBER}") {
-      def image = get_environment(mxnet_variant)
-      ci_utils.unpack_and_init("mxnet_${mxnet_variant}", get_stash(mxnet_variant), false)
-      ci_utils.docker_run(image, "unittest_ubuntu_python2_quantization_gpu", true)
-    }
-  }
-}
-
 // Tests quantization in P3 instance using Python 3
 def test_gpu_quantization_py3(mxnet_variant) {
   node(NODE_LINUX_GPU_P3) {

diff --git a/cd/python/pypi/Jenkins_pipeline.groovy b/cd/python/pypi/Jenkins_pipeline.groovy
@@ -59,7 +59,6 @@ def test(mxnet_variant) {
     // test wheel file
     def environment = get_environment(mxnet_variant)
     def nvidia_docker = mxnet_variant.startsWith('cu')
-    ci_utils.docker_run(environment, "cd_integration_test_pypi python ${nvidia_docker}", nvidia_docker)
     ci_utils.docker_run(environment, "cd_integration_test_pypi python3 ${nvidia_docker}", nvidia_docker)
   }
 }

diff --git a/cd/python/pypi/pypi_package.sh b/cd/python/pypi/pypi_package.sh
@@ -22,11 +22,11 @@ set -ex
 export mxnet_variant=${1:?"Please specify the mxnet variant"}
 
 # Due to this PR: https://github.com/apache/incubator-mxnet/pull/14899
-# The setup.py expects that mkldnn_version.h be present in 
+# The setup.py expects that mkldnn_version.h be present in
 # mxnet-build/3rdparty/mkldnn/build/install/include
 # The artifact repository stores this file in the dependencies
 # and CD unpacks it to a directory called cd_misc
-# Nov. 2019 Update: With v1.1, MKL-DNN is renaming to DNNL. Hence changing the prefix of file name. 
+# Nov. 2019 Update: With v1.1, MKL-DNN is renaming to DNNL. Hence changing the prefix of file name.
 if [ -f "cd_misc/dnnl_version.h" ]; then
   mkdir -p 3rdparty/mkldnn/build/install/include
   cp cd_misc/dnnl_version.h 3rdparty/mkldnn/build/install/include/.
@@ -56,7 +56,7 @@ popd
 echo "Building python package with environment:"
 printenv
 echo "-----------------------------------------"
-pip install --user pypandoc
+pip3 install --user pypandoc
 
 # Build wheel file - placed in wheel_build/dist
-python setup.py bdist_wheel
+python3 setup.py bdist_wheel
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
@@ -1009,10 +1009,6 @@ cd_unittest_ubuntu() {
 
     local nose_cmd="nosetests-3.4"
 
-    if [[ ${python_cmd} = "python" ]]; then
-        nose_cmd="nosetests-2.7"
-    fi
-
     $nose_cmd $NOSE_TIMER_ARGUMENTS --verbose tests/python/unittest
     $nose_cmd $NOSE_TIMER_ARGUMENTS --verbose tests/python/quantization
 
@@ -1965,17 +1961,13 @@ cd_integration_test_pypi() {
     local test_conv_params=''
     local mnist_params=''
 
-    local pip_cmd='pip'
+    local pip_cmd='pip3'
 
     if [ "${gpu_enabled}" = "true" ]; then
         mnist_params="--gpu 0"
         test_conv_params="--gpu"
     fi
 
-    if [ "${python_cmd}" = "python3" ]; then
-        pip_cmd='pip3'
-    fi
-
     # install mxnet wheel package
     ${pip_cmd} install --user ./wheel_build/dist/*.whl