From 781d8191dba5e85186fed10361323b3d9e7d1f8d Mon Sep 17 00:00:00 2001 From: Jiaying Zhao Date: Wed, 16 Oct 2019 20:21:08 +0800 Subject: [PATCH] Open merge_cl_to_so switch and delete -I(cl_path) build option. test=develop (#2206) --- mobile/src/framework/cl/cl_engine.h | 3 +-- mobile/tools/build.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mobile/src/framework/cl/cl_engine.h b/mobile/src/framework/cl/cl_engine.h index a395f011c2..2e21dd9e39 100644 --- a/mobile/src/framework/cl/cl_engine.h +++ b/mobile/src/framework/cl/cl_engine.h @@ -200,8 +200,7 @@ class CLEngine { bool BuildProgram(cl_program program, const std::string &options = "") { cl_int status; - std::string path = options + " -cl-fast-relaxed-math -I " + - CLEngine::Instance()->GetCLPath() + "/cl_kernel"; + std::string path = options + " -cl-fast-relaxed-math"; status = clBuildProgram(program, 0, 0, path.c_str(), 0, 0); diff --git a/mobile/tools/build.sh b/mobile/tools/build.sh index 4955bce54c..3606f66e75 100755 --- a/mobile/tools/build.sh +++ b/mobile/tools/build.sh @@ -3,7 +3,7 @@ NETS="" declare -a supportedNets=("googlenet" "mobilenet" "yolo" "squeezenet" "resnet" "mobilenetssd" "nlp" "mobilenetfssd" "genet" "super" "op") # merge cl to so -merge_cl_to_so=0 +merge_cl_to_so=1 opencl_kernels="opencl_kernels.cpp" cd ../src/operators/kernel/cl if [[ -f "${opencl_kernels}" ]]; then -- GitLab