From 384099e58214bcebb74f529bbba936917659bf45 Mon Sep 17 00:00:00 2001 From: Liangliang He Date: Wed, 8 May 2019 12:17:36 +0800 Subject: [PATCH] Fix cpplint --- docker/mace-dev-lite/Dockerfile | 3 +++ docker/mace-dev/Dockerfile | 4 ++-- tools/cpplint.sh | 12 +++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/docker/mace-dev-lite/Dockerfile b/docker/mace-dev-lite/Dockerfile index 12741bff..2d641707 100644 --- a/docker/mace-dev-lite/Dockerfile +++ b/docker/mace-dev-lite/Dockerfile @@ -139,3 +139,6 @@ RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \ onnx==1.3.0 \ onnx-tf==1.2.0 + +RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \ + cpplint==1.4.4 diff --git a/docker/mace-dev/Dockerfile b/docker/mace-dev/Dockerfile index e5296ca3..af136e4d 100644 --- a/docker/mace-dev/Dockerfile +++ b/docker/mace-dev/Dockerfile @@ -63,9 +63,9 @@ RUN cd /opt && \ tar xf gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz && \ rm -rf gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz -# Mirror of https://cnbj1.fds.api.xiaomi.com/mace/third-party/gcc-linaro/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz +# Mirror of https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/aarch64-linux-gnu/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz RUN cd /opt && \ - wget -q https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/aarch64-linux-gnu/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz && \ + wget -q https://cnbj1.fds.api.xiaomi.com/mace/third-party/gcc-linaro/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz && \ tar xf gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz && \ rm -rf gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz diff --git a/tools/cpplint.sh b/tools/cpplint.sh index 00412980..ef8e1c3c 100755 --- a/tools/cpplint.sh +++ b/tools/cpplint.sh @@ -2,10 +2,8 @@ set -e -curl -o cpplint.py https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py -python cpplint.py --linelength=80 --counting=detailed $(find mace -name "*.h" -or -name "*.cc") -python cpplint.py --linelength=80 --counting=detailed --root=include $(find include -name "*.h" -or -name "*.cc") -python cpplint.py --linelength=80 --counting=detailed --root=test/ccutils $(find test/ccutils -name "*.h" -or -name "*.cc") -python cpplint.py --linelength=80 --counting=detailed --root=test/ccunit $(find test/ccunit -name "*.h" -or -name "*.cc") -python cpplint.py --linelength=80 --counting=detailed --root=test/ccbenchmark $(find test/ccbenchmark -name "*.h" -or -name "*.cc") -rm cpplint.py +cpplint --linelength=80 --counting=detailed $(find mace -name "*.h" -or -name "*.cc") +cpplint --linelength=80 --counting=detailed --root=include $(find include -name "*.h" -or -name "*.cc") +cpplint --linelength=80 --counting=detailed --root=test/ccutils $(find test/ccutils -name "*.h" -or -name "*.cc") +cpplint --linelength=80 --counting=detailed --root=test/ccunit $(find test/ccunit -name "*.h" -or -name "*.cc") +cpplint --linelength=80 --counting=detailed --root=test/ccbenchmark $(find test/ccbenchmark -name "*.h" -or -name "*.cc") -- GitLab