diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6f900a4d144fa06dbbe8f4f8312bed5923b8b33..01dc646326738ad64f5c58ab587348ef6bb9ae6d 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,13 +13,17 @@ check:prebuilt: - lite stage: ci script: - #- pip3 install pre-commit - #- alias python=python3 - rm -rf ~/.pip - pip install pre-commit - pre-commit install + + # merge the latest code + - git config --global user.email "you@example.com" + - git config --global user.name "Your Name" + - git fetch origin incubate/lite + - git merge --no-ff origin/incubate/lite + - ./paddle/fluid/lite/tools/build.sh check_style - #- ./paddle/fluid/lite/tools/build.sh check_need_ci cache: key: check_style paths: @@ -37,10 +41,15 @@ build:server: - /root/.ccache script: - apt install ccache - - export http_proxy=http://172.19.57.45:3128 - - export https_proxy=http://172.19.57.45:3128 - #- export http_proxy=http://agent.baidu.com:8118 - #- export https_proxy=http://agent.baidu.com:8118 + - export http_proxy=$CI_PROXY + - export https_proxy=$CI_PROXY + + # merge the latest code + - git config --global user.email "you@example.com" + - git config --global user.name "Your Name" + - git fetch origin incubate/lite + - git merge --no-ff origin/incubate/lite + - mkdir -p build - cd build - ../paddle/fluid/lite/tools/build.sh cmake_x86 @@ -67,8 +76,15 @@ build:mobile: - /root/.ccache script: - apt install ccache - - export http_proxy=http://172.19.57.45:3128 - - export https_proxy=http://172.19.57.45:3128 + - export http_proxy=$CI_PROXY + - export https_proxy=$CI_PROXY + + # merge the latest code + - git config --global user.email "you@example.com" + - git config --global user.name "Your Name" + - git fetch origin incubate/lite + - git merge --no-ff origin/incubate/lite + - ./paddle/fluid/lite/tools/build.sh build_test_arm dependencies: - build:server diff --git a/paddle/fluid/lite/kernels/arm/pool_compute_test.cc b/paddle/fluid/lite/kernels/arm/pool_compute_test.cc index 844976b963b547d7458f73bec4777281f26bc52a..70995d10bd8c5de5bd0a594a66ea326e6cff6f55 100644 --- a/paddle/fluid/lite/kernels/arm/pool_compute_test.cc +++ b/paddle/fluid/lite/kernels/arm/pool_compute_test.cc @@ -261,8 +261,8 @@ TEST(pool_arm, compute) { } TEST(pool, retrive_op) { - auto pool = - KernelRegistry::Global().Create("pool"); + auto pool = KernelRegistry::Global().Create( + "pool2d"); ASSERT_FALSE(pool.empty()); ASSERT_TRUE(pool.front()); }