From a222d336ca7be94f4418c75295344d8d2fe3cea0 Mon Sep 17 00:00:00 2001 From: luotao1 Date: Sat, 11 Aug 2018 23:59:29 +0800 Subject: [PATCH] modify the anakin_model download dir --- cmake/external/anakin.cmake | 5 +++++ paddle/fluid/inference/api/CMakeLists.txt | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/external/anakin.cmake b/cmake/external/anakin.cmake index 6ff54fe823..403873a510 100644 --- a/cmake/external/anakin.cmake +++ b/cmake/external/anakin.cmake @@ -11,6 +11,11 @@ set(ANAKIN_LIBRARY ${ANAKIN_INSTALL_DIR}) set(ANAKIN_SHARED_LIB ${ANAKIN_LIBRARY}/libanakin.so) set(ANAKIN_SABER_LIB ${ANAKIN_LIBRARY}/libanakin_saber_common.so) +# TODO(luotao): ANAKIN_MODLE_URL will move to demo ci later. +set(ANAKIN_MODLE_URL "http://paddle-inference-dist.bj.bcebos.com/mobilenet_v2.anakin.bin") +execute_process(COMMAND bash -c "mkdir -p ${ANAKIN_SOURCE_DIR}") +execute_process(COMMAND bash -c "cd ${ANAKIN_SOURCE_DIR}; wget -q --no-check-certificate ${ANAKIN_MODLE_URL}") + include_directories(${ANAKIN_INCLUDE}) include_directories(${ANAKIN_INCLUDE}/saber/) diff --git a/paddle/fluid/inference/api/CMakeLists.txt b/paddle/fluid/inference/api/CMakeLists.txt index 3bef785b10..83867e0a2c 100644 --- a/paddle/fluid/inference/api/CMakeLists.txt +++ b/paddle/fluid/inference/api/CMakeLists.txt @@ -70,11 +70,8 @@ if (WITH_ANAKIN) # only needed in CI anakin_target(inference_anakin_api) #anakin_target(inference_anakin_api_shared) if (WITH_TESTING) - # TODO(luotao): anakin_model will move to demo_ci later - set(ANAKIN_MODLE_URL "http://paddle-inference-dist.bj.bcebos.com/mobilenet_v2.anakin.bin") - execute_process(COMMAND bash -c "wget -q --no-check-certificate ${ANAKIN_MODLE_URL}") cc_test(inference_anakin_test SRCS api_anakin_engine_tester.cc - ARGS --model=${CMAKE_CURRENT_BINARY_DIR}/mobilenet_v2.anakin.bin + ARGS --model=${ANAKIN_SOURCE_DIR}/mobilenet_v2.anakin.bin DEPS inference_anakin_api dynload_cuda SERIAL) target_compile_options(inference_anakin_test BEFORE PUBLIC ${ANAKIN_COMPILE_EXTRA_FLAGS}) endif(WITH_TESTING) -- GitLab