From 04cefeacc5d96f80a17fee498ef365ec230273ad Mon Sep 17 00:00:00 2001 From: Wilber Date: Thu, 19 Nov 2020 18:27:32 +0800 Subject: [PATCH] Disable windows gpu static lib. (#28741) --- paddle/fluid/inference/CMakeLists.txt | 7 ++++++- paddle/fluid/inference/api/demo_ci/run.sh | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/paddle/fluid/inference/CMakeLists.txt b/paddle/fluid/inference/CMakeLists.txt index 6d35d3395ba..056eb6e2ae4 100644 --- a/paddle/fluid/inference/CMakeLists.txt +++ b/paddle/fluid/inference/CMakeLists.txt @@ -44,7 +44,12 @@ add_subdirectory(api) set(STATIC_INFERENCE_API paddle_inference_api analysis_predictor zero_copy_tensor reset_tensor_array analysis_config paddle_pass_builder activation_functions ${mkldnn_quantizer_cfg}) -create_static_lib(paddle_fluid ${fluid_modules} ${STATIC_INFERENCE_API}) +#TODO(wilber, T8T9): Do we still need to support windows gpu static library? +if(WIN32 AND WITH_GPU) + cc_library(paddle_fluid DEPS ${fluid_modules} ${STATIC_INFERENCE_API}) +else() + create_static_lib(paddle_fluid ${fluid_modules} ${STATIC_INFERENCE_API}) +endif() if(NOT APPLE) # TODO(liuyiqu: Temporarily disable the link flag because it is not support on Mac. diff --git a/paddle/fluid/inference/api/demo_ci/run.sh b/paddle/fluid/inference/api/demo_ci/run.sh index 6d283ca56cb..e11a5b9c337 100755 --- a/paddle/fluid/inference/api/demo_ci/run.sh +++ b/paddle/fluid/inference/api/demo_ci/run.sh @@ -1,4 +1,19 @@ #!/bin/bash + +# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + set -x PADDLE_ROOT=$1 TURN_ON_MKL=$2 # use MKL or Openblas @@ -68,6 +83,10 @@ rm -rf * for WITH_STATIC_LIB in ON OFF; do if [ $(echo `uname` | grep "Win") != "" ]; then + # TODO(wilber, T8T9): Do we still need to support windows gpu static library + if [ $TEST_GPU_CPU == ON ] && [ $WITH_STATIC_LIB == ON ]; then + return 0 + fi # -----simple_on_word2vec on windows----- cmake .. -G "Visual Studio 14 2015" -A x64 -DPADDLE_LIB=${inference_install_dir} \ -DWITH_MKL=$TURN_ON_MKL \ -- GitLab