From b5f7886767c94a45e5fe33a8518fd945382bdec8 Mon Sep 17 00:00:00 2001 From: DefTruth <31974251+DefTruth@users.noreply.github.com> Date: Fri, 12 Aug 2022 15:04:53 +0800 Subject: [PATCH] [feature][win] enable paddle_inference in windows (#103) * [feature][win] enable paddle_inference in windows * [feature][win] enable paddle_inference in windows * [feature][win] enable paddle_inference in windows --- external/paddle_inference.cmake | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/external/paddle_inference.cmake b/external/paddle_inference.cmake index 897823f98..0cc395496 100644 --- a/external/paddle_inference.cmake +++ b/external/paddle_inference.cmake @@ -32,8 +32,8 @@ if(WIN32) set(PADDLEINFERENCE_COMPILE_LIB "${PADDLEINFERENCE_INSTALL_DIR}/paddle/lib/paddle_inference.lib" CACHE FILEPATH "paddle_inference compile library." FORCE) - set(DNNL_LIB "") - set(OMP_LIB "") + set(DNNL_LIB "${PADDLEINFERENCE_INSTALL_DIR}/third_party/install/mkldnn/lib/mkldnn.lib") + set(OMP_LIB "${PADDLEINFERENCE_INSTALL_DIR}/third_party/install/mklml/lib/libiomp5md.lib") elseif(APPLE) set(PADDLEINFERENCE_COMPILE_LIB "${PADDLEINFERENCE_INSTALL_DIR}/paddle/lib/libpaddle_inference.dylib" @@ -51,8 +51,11 @@ endif(WIN32) set(PADDLEINFERENCE_URL_BASE "https://bj.bcebos.com/paddle2onnx/libs/") set(PADDLEINFERENCE_VERSION "2.3.2") if(WIN32) - message(FATAL_ERROR "Paddle Backend doesn't support Windows now.") - set(PADDLEINFERENCE_FILE "paddle_inference-win-x64-${PADDLEINFERENCE_VERSION}.zip") + if (WITH_GPU) + set(PADDLEINFERENCE_FILE "paddle_inference-win-x64-gpu-${PADDLEINFERENCE_VERSION}.zip") + else() + set(PADDLEINFERENCE_FILE "paddle_inference-win-x64-${PADDLEINFERENCE_VERSION}.zip") + endif() elseif(APPLE) message(FATAL_ERROR "Paddle Backend doesn't support Mac OSX now.") if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64")