From f08e3122af470d2783188670c0f25c1324a0defc Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Fri, 24 Jan 2020 03:08:31 +0000 Subject: [PATCH 1/5] Fix numpy decorator --- ci/docker/install/docs_requirements | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/docker/install/docs_requirements b/ci/docker/install/docs_requirements index f78dca2bc655..c0b5efaba810 100644 --- a/ci/docker/install/docs_requirements +++ b/ci/docker/install/docs_requirements @@ -22,6 +22,7 @@ beautifulsoup4==4.6.3 breathe==4.10.0 cpplint==1.3.0 CommonMark==0.5.4 +decorator==4.4.0 h5py==2.8.0rc1 mock==2.0.0 nose==1.3.7 @@ -31,6 +32,6 @@ pylint==2.3.1; python_version >= '3.0' pypandoc==1.4 recommonmark==0.4.0 requests<2.19.0,>=2.18.4 -scipy==1.0.1 +scipy==1.2.1 six==1.11.0 sphinx==1.5.6 From 6319961b92606c095fe4de62da7e969dc44cfa70 Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Fri, 24 Jan 2020 03:08:39 +0000 Subject: [PATCH 2/5] Workaround https://github.com/pytest-dev/pytest/issues/5903 --- ci/docker/install/ubuntu_onnx.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/docker/install/ubuntu_onnx.sh b/ci/docker/install/ubuntu_onnx.sh index 0dad3f9ee431..4f83126366c8 100755 --- a/ci/docker/install/ubuntu_onnx.sh +++ b/ci/docker/install/ubuntu_onnx.sh @@ -31,5 +31,5 @@ apt-get update || true apt-get install -y libprotobuf-dev protobuf-compiler echo "Installing pytest, pytest-cov, protobuf, Pillow, ONNX and tabulate ..." -pip2 install pytest==3.4.0 pytest-cov==2.5.1 protobuf==3.5.2 onnx==1.3.0 Pillow==5.0.0 tabulate==0.7.5 -pip3 install pytest==3.4.0 pytest-cov==2.5.1 protobuf==3.5.2 onnx==1.3.0 Pillow==5.0.0 tabulate==0.7.5 +pip2 install pytest==3.4.0 pytest-cov==2.5.1 protobuf==3.5.2 onnx==1.3.0 Pillow==5.0.0 tabulate==0.7.5 attrs==19.1.0 +pip3 install pytest==3.4.0 pytest-cov==2.5.1 protobuf==3.5.2 onnx==1.3.0 Pillow==5.0.0 tabulate==0.7.5 attrs==19.1.0 From f4f8079183986829c28b4c0b8fa2287456022dbe Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Fri, 24 Jan 2020 03:08:53 +0000 Subject: [PATCH 3/5] Disable pylint warnings --- tools/caffe_converter/caffe_proto_utils.py | 2 +- tools/caffe_converter/convert_mean.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/caffe_converter/caffe_proto_utils.py b/tools/caffe_converter/caffe_proto_utils.py index 8d6183457637..54cd952d4443 100644 --- a/tools/caffe_converter/caffe_proto_utils.py +++ b/tools/caffe_converter/caffe_proto_utils.py @@ -196,7 +196,7 @@ def read_caffe_mean(caffe_mean_file): mean_blob.ParseFromString(f.read()) img_mean_np = np.array(mean_blob.data) - img_mean_np = img_mean_np.reshape(mean_blob.channels, mean_blob.height, mean_blob.width) + img_mean_np = img_mean_np.reshape(mean_blob.channels, mean_blob.height, mean_blob.width) # pylint: disable=too-many-function-args # swap channels from Caffe BGR to RGB img_mean_np[[0, 2], :, :] = img_mean_np[[2, 0], :, :] diff --git a/tools/caffe_converter/convert_mean.py b/tools/caffe_converter/convert_mean.py index 1a3df71d3e54..1debfe5a2ef3 100644 --- a/tools/caffe_converter/convert_mean.py +++ b/tools/caffe_converter/convert_mean.py @@ -42,7 +42,7 @@ def convert_mean(binaryproto_fname, output=None): mean_blob.ParseFromString(f.read()) img_mean_np = np.array(mean_blob.data) - img_mean_np = img_mean_np.reshape( + img_mean_np = img_mean_np.reshape( # pylint: disable=too-many-function-args mean_blob.channels, mean_blob.height, mean_blob.width ) # swap channels from Caffe BGR to RGB From 01c15532b6078de96b1de1e96e8c43788927953a Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Mon, 23 Dec 2019 12:31:13 +0800 Subject: [PATCH 4/5] Fix Edge build --- ci/docker/Dockerfile.build.android_armv7 | 2 +- ci/docker/Dockerfile.build.android_armv8 | 4 ++-- ci/docker/Dockerfile.build.armv6 | 2 +- ci/docker/Dockerfile.build.armv7 | 2 +- ci/docker/Dockerfile.build.armv8 | 2 +- ci/docker/Dockerfile.build.jetson | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/docker/Dockerfile.build.android_armv7 b/ci/docker/Dockerfile.build.android_armv7 index a2e98cd2efe1..2c923a015b63 100644 --- a/ci/docker/Dockerfile.build.android_armv7 +++ b/ci/docker/Dockerfile.build.android_armv7 @@ -18,7 +18,7 @@ # # Dockerfile to build MXNet for Android ARMv7 -FROM mxnetcipinned/dockcross-base:11262018 +FROM dockcross/base MAINTAINER Pedro Larroy "pllarroy@amazon.com" # The cross-compiling emulator diff --git a/ci/docker/Dockerfile.build.android_armv8 b/ci/docker/Dockerfile.build.android_armv8 index f7de86763457..ca62288129bb 100644 --- a/ci/docker/Dockerfile.build.android_armv8 +++ b/ci/docker/Dockerfile.build.android_armv8 @@ -18,7 +18,7 @@ # # Dockerfile to build MXNet for Android ARM64/ARMv8 -FROM mxnetcipinned/dockcross-base:11262018 +FROM dockcross/base MAINTAINER Pedro Larroy "pllarroy@amazon.com" RUN apt-get update && apt-get install -y \ @@ -82,4 +82,4 @@ RUN /work/ubuntu_adduser.sh COPY runtime_functions.sh /work/ -WORKDIR /work/build \ No newline at end of file +WORKDIR /work/build diff --git a/ci/docker/Dockerfile.build.armv6 b/ci/docker/Dockerfile.build.armv6 index 60e223b7a60f..e6a7ffe758b9 100644 --- a/ci/docker/Dockerfile.build.armv6 +++ b/ci/docker/Dockerfile.build.armv6 @@ -18,7 +18,7 @@ # # Dockerfile to build MXNet for ARMv6 -FROM mxnetcipinned/dockcross-linux-armv6:11262018 +FROM dockcross/linux-armv6 ENV ARCH armv6l ENV HOSTCC gcc diff --git a/ci/docker/Dockerfile.build.armv7 b/ci/docker/Dockerfile.build.armv7 index 0b557d5839e9..bad9ab214050 100644 --- a/ci/docker/Dockerfile.build.armv7 +++ b/ci/docker/Dockerfile.build.armv7 @@ -18,7 +18,7 @@ # # Dockerfile to build MXNet for Android ARMv7 -FROM mxnetcipinned/dockcross-linux-armv7:11262018 +FROM dockcross/linux-armv7 ENV ARCH armv7l ENV HOSTCC gcc diff --git a/ci/docker/Dockerfile.build.armv8 b/ci/docker/Dockerfile.build.armv8 index ef9c95865590..bd2373180f0b 100644 --- a/ci/docker/Dockerfile.build.armv8 +++ b/ci/docker/Dockerfile.build.armv8 @@ -18,7 +18,7 @@ # # Dockerfile to build MXNet for ARM64/ARMv8 -FROM mxnetcipinned/dockcross-linux-arm64:11262018 +FROM dockcross/linux-arm64 ENV ARCH aarch64 ENV HOSTCC gcc diff --git a/ci/docker/Dockerfile.build.jetson b/ci/docker/Dockerfile.build.jetson index 07097887f87d..e31ee43a93d8 100644 --- a/ci/docker/Dockerfile.build.jetson +++ b/ci/docker/Dockerfile.build.jetson @@ -22,7 +22,7 @@ FROM nvidia/cuda:9.0-cudnn7-devel as cudabuilder -FROM mxnetcipinned/dockcross-linux-arm64:11262018 +FROM dockcross/linux-arm64 ENV ARCH aarch64 ENV HOSTCC gcc From 847c9ec92526d1b64fba3e0e2db7617fa193fa3d Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Fri, 24 Jan 2020 03:13:56 +0000 Subject: [PATCH 5/5] Fix numpy decorator on Centos --- ci/docker/install/centos7_python.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/docker/install/centos7_python.sh b/ci/docker/install/centos7_python.sh index 8521cde1acca..686cf14e2e3b 100755 --- a/ci/docker/install/centos7_python.sh +++ b/ci/docker/install/centos7_python.sh @@ -31,5 +31,5 @@ curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py" python2.7 get-pip.py python3.6 get-pip.py -pip2 install nose pylint numpy nose-timer requests h5py scipy==1.0.1 -pip3 install nose pylint numpy nose-timer requests h5py scipy==1.0.1 +pip2 install nose pylint numpy nose-timer requests h5py scipy==1.2.1 decorator==4.4.0 +pip3 install nose pylint numpy nose-timer requests h5py scipy==1.2.1 decorator==4.4.0