diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7771b24872fc7bac9b0a02c12b103b005da12dbe..cb4ecf259883455ccc7c8529c048e76d7536da04 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,9 +76,8 @@ build:mobile_android: cache: key: mobile_thirdparty paths: - - $MOBILE_LITE_CACHE0 - - $MOBILE_LITE_CACHE1 - - $MOBILE_LITE_CACHE2 + - build.lite.android.armv8.gcc/third_party + - build.lite.android.armv7.gcc/third_party - ~/.ccache - $CI_PROJECT_DIR/build_mobile_ccache script: @@ -97,9 +96,9 @@ build:mobile_armlinux: cache: key: mobile_thirdparty paths: - - $MOBILE_LITE_CACHE0 - - $MOBILE_LITE_CACHE1 - - $MOBILE_LITE_CACHE2 + - build.lite.armlinux.armv8.gcc + - build.lite.armlinux.armv7.gcc + - build.lite.armlinux.armv7hf.gcc - ~/.ccache - $CI_PROJECT_DIR/build_mobile_ccache2 script: @@ -126,9 +125,7 @@ build:mobile_model_mobilenetv1: cache: key: mobile_thirdparty paths: - - $MOBILE_LITE_CACHE0 - - $MOBILE_LITE_CACHE1 - - $MOBILE_LITE_CACHE2 + - build.lite.android.armv8.gcc - ~/.ccache - $CI_PROJECT_DIR/build_mobile_model_mobilenetv1 @@ -148,9 +145,7 @@ build:mobile_model_mobilenetv2: cache: key: mobile_thirdparty paths: - - $MOBILE_LITE_CACHE0 - - $MOBILE_LITE_CACHE1 - - $MOBILE_LITE_CACHE2 + - build.lite.android.armv8.gcc - ~/.ccache - $CI_PROJECT_DIR/build_mobile_model_mobilenetv2 @@ -170,9 +165,7 @@ build:mobile_model_resnet50: cache: key: mobile_thirdparty paths: - - $MOBILE_LITE_CACHE0 - - $MOBILE_LITE_CACHE1 - - $MOBILE_LITE_CACHE2 + - build.lite.android.armv8.gcc - ~/.ccache - $CI_PROJECT_DIR/build_mobile_model_resnet50 diff --git a/paddle/fluid/lite/tools/build.sh b/paddle/fluid/lite/tools/build.sh index 927668be25ff1b7ca24f3bed77fe3522326a5e81..a4b75f7ef0d5c982e03b1715fee2f73c3a901fbf 100755 --- a/paddle/fluid/lite/tools/build.sh +++ b/paddle/fluid/lite/tools/build.sh @@ -238,7 +238,7 @@ function test_arm { echo "android do not need armv7hf" return 0 fi - + # TODO(yuanshuai): enable armv7 on android if [[ ${abi} == "armv7" ]]; then echo "skip android v7 test yet" @@ -260,10 +260,10 @@ function prepare_emulator { adb devices | grep emulator | cut -f1 | while read line; do adb -s $line emu kill; done # start android armv8 and armv7 emulators first echo n | avdmanager create avd -f -n paddle-armv8 -k "system-images;android-24;google_apis;arm64-v8a" - echo -ne '\n' | ${ANDROID_HOME}/emulator/emulator -avd paddle-armv8 -noaudio -no-window -gpu off -verbose -port ${port_armv8} & + echo -ne '\n' | ${ANDROID_HOME}/emulator/emulator -avd paddle-armv8 -noaudio -no-window -gpu off -port ${port_armv8} & sleep 1m echo n | avdmanager create avd -f -n paddle-armv7 -k "system-images;android-24;google_apis;armeabi-v7a" - echo -ne '\n' | ${ANDROID_HOME}/emulator/emulator -avd paddle-armv7 -noaudio -no-window -gpu off -verbose -port ${port_armv7} & + echo -ne '\n' | ${ANDROID_HOME}/emulator/emulator -avd paddle-armv7 -noaudio -no-window -gpu off -port ${port_armv7} & sleep 1m }