From 65d2179aaf77d598e14cace35d4af28c3e845c1f Mon Sep 17 00:00:00 2001 From: superjomn Date: Mon, 13 May 2019 21:18:40 +0800 Subject: [PATCH] disable lite by default test=develop --- CMakeLists.txt | 2 +- paddle/fluid/lite/api/light_api_test.cc | 12 ++++++------ paddle/fluid/lite/core/CMakeLists.txt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d0a5bdc46d0..1a0b0b36861 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,7 @@ option(WITH_FAST_MATH "Make use of fast math library, might affect the precisi option(WITH_DGC "Use DGC(Deep Gradient Compression) or not" ON) # for lite, both server and mobile framework. -option(WITH_LITE "Enable lite framework" ON) +option(WITH_LITE "Enable lite framework" OFF) option(LITE_WITH_CUDA "Enable CUDA in lite mode" OFF) option(LITE_WITH_X86 "Enable X86 in lite mode" ON) option(LITE_WITH_LIGHT_WEIGHT_FRAMEWORK "Enable light-weight framework" OFF) diff --git a/paddle/fluid/lite/api/light_api_test.cc b/paddle/fluid/lite/api/light_api_test.cc index 6dd596bbee5..ad0d87cf00b 100644 --- a/paddle/fluid/lite/api/light_api_test.cc +++ b/paddle/fluid/lite/api/light_api_test.cc @@ -26,7 +26,7 @@ TEST(LightAPI, load) { predictor.Build(FLAGS_optimized_model); auto* input_tensor = predictor.GetInput(0); - input_tensor->Resize(DDimLite(std::vector({100, 100}))); + input_tensor->Resize(DDim(std::vector({100, 100}))); auto* data = input_tensor->mutable_data(); for (int i = 0; i < 100 * 100; i++) { data[i] = i; @@ -39,13 +39,13 @@ TEST(LightAPI, load) { } // namespace paddle USE_LITE_OP(mul); -// USE_LITE_OP(fc); -// USE_LITE_OP(scale); +USE_LITE_OP(fc); +USE_LITE_OP(scale); USE_LITE_OP(feed); USE_LITE_OP(fetch); USE_LITE_OP(io_copy); -// USE_LITE_KERNEL(fc, kHost, kFloat, kNCHW, def); -// USE_LITE_KERNEL(mul, kHost, kFloat, kNCHW, def); -// USE_LITE_KERNEL(scale, kHost, kFloat, kNCHW, def); +USE_LITE_KERNEL(fc, kHost, kFloat, kNCHW, def); +USE_LITE_KERNEL(mul, kHost, kFloat, kNCHW, def); +USE_LITE_KERNEL(scale, kHost, kFloat, kNCHW, def); USE_LITE_KERNEL(feed, kHost, kAny, kAny, def); USE_LITE_KERNEL(fetch, kHost, kAny, kAny, def); diff --git a/paddle/fluid/lite/core/CMakeLists.txt b/paddle/fluid/lite/core/CMakeLists.txt index e5b118aa66a..f6c30068446 100644 --- a/paddle/fluid/lite/core/CMakeLists.txt +++ b/paddle/fluid/lite/core/CMakeLists.txt @@ -1,4 +1,4 @@ -cc_library(lite_gtest_main SRCS lite_gtest_main.cc) +cc_library(lite_gtest_main SRCS lite_gtest_main.cc DEPS gtest) cc_library(memory_lite SRCS memory.cc DEPS target_wrapper_lite target_wrapper_host) cc_library(target_wrapper_lite SRCS target_wrapper.cc) -- GitLab