From 3345f5b90f9613ff481cc78233fb424af14dc619 Mon Sep 17 00:00:00 2001 From: Liangliang He Date: Fri, 14 Jun 2019 15:36:02 +0800 Subject: [PATCH] Fix unxepected ccache miss --- .gitlab-ci.yml | 7 +++++++ CMakeLists.txt | 4 +++- mace/core/quantize.h | 1 - 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fdf8f75f..9cad515c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,16 @@ stages: + - prepare - linting - build - test - extra +setenv: + stage: prepare + script: + - export CCACHE_NOHASHDIR=1 + - export CCACHE_BASEDIR=${CI_PROJECT_DIR} + cpplint: stage: linting script: diff --git a/CMakeLists.txt b/CMakeLists.txt index b4a6dbba..1e0963e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,9 @@ if(MACE_ENABLE_OPT_SIZE) endif(MACE_ENABLE_OPT_SIZE) # flags apply only to mace code (third_party excluded) -set(MACE_CODE_CC_FLAGS "${MACE_CODE_CC_FLAGS} -Wall -Werror") +# -Wno-error=unused-command-line-argument: official Android toolchain contains +# unsupported argument and will break ccache preprocessor +set(MACE_CODE_CC_FLAGS "${MACE_CODE_CC_FLAGS} -Wall -Werror -Wno-error=unused-command-line-argument") set(MACE_CODE_CC_FLAGS "${MACE_CODE_CC_FLAGS} -std=c++11 -D_GLIBCXX_USE_C99_MATH_TR1") if(IOS) diff --git a/mace/core/quantize.h b/mace/core/quantize.h index 00fb3db9..c7b6666d 100644 --- a/mace/core/quantize.h +++ b/mace/core/quantize.h @@ -100,7 +100,6 @@ inline void QuantizeMultiplier(double multiplier, ++*shift; } *output_multiplier = static_cast(qint); - MACE_CHECK(*output_multiplier <= std::numeric_limits::max()); } inline void GetOutputMultiplierAndShift( -- GitLab