Skip to content

Commit

Permalink
Merge pull request PaddlePaddle#48 from jiweibo/lite_engine
Browse files Browse the repository at this point in the history
fix build error test=develop
  • Loading branch information
Shixiaowei02 authored Jan 6, 2020
2 parents e6a767f + 1f9ca1b commit c39ca7b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion cmake/external/lite.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.


if (NOT LITE_SOURCE_DIR OR NOT LITE_BINARY_DIR)
include(ExternalProject)
set(LITE_PROJECT extern_lite)
Expand Down
7 changes: 4 additions & 3 deletions paddle/scripts/paddle_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ function cmake_base() {
WITH_DISTRIBUTE=${WITH_DISTRIBUTE:-ON}
WITH_AVX=${WITH_AVX:-ON}
INFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR:-~/.cache/inference_demo}
WITH_LITE=OFF
else
INFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR:-/root/.cache/inference_demo}
fi
Expand Down Expand Up @@ -203,6 +204,7 @@ function cmake_base() {
-DPY_VERSION=${PY_VERSION:-2.7}
-DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX:-/paddle/build}
-DWITH_GRPC=${grpc_flag}
-DWITH_LITE=${WITH_LITE:-ON}
========================================
EOF
# Disable UNITTEST_USE_VIRTUALENV in docker because
Expand Down Expand Up @@ -234,9 +236,8 @@ EOF
-DINFERENCE_DEMO_INSTALL_DIR=${INFERENCE_DEMO_INSTALL_DIR} \
-DPY_VERSION=${PY_VERSION:-2.7} \
-DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX:-/paddle/build} \
-DON_INFER=ON \
-DWITH_LITE=ON \
-DWITH_GRPC=${grpc_flag}
-DWITH_GRPC=${grpc_flag} \
-DWITH_LITE=${WITH_LITE:-ON}

}

Expand Down

0 comments on commit c39ca7b

Please sign in to comment.