提交 0858a501 编写于 作者: Q qiaolongfei

Merge branch 'fix-inference-build-on-mac' of ssh://github.com/jacquesqiao/Paddle into fix-prefetch

...@@ -54,7 +54,7 @@ class PaddlePredictorImpl : public PaddlePredictor { ...@@ -54,7 +54,7 @@ class PaddlePredictorImpl : public PaddlePredictor {
~PaddlePredictorImpl() override{}; ~PaddlePredictorImpl() override{};
private: private:
bool InitShared(); bool InitShared() override;
bool SetFeed(const std::vector<PaddleTensor> &input_datas, bool SetFeed(const std::vector<PaddleTensor> &input_datas,
std::vector<paddle::framework::LoDTensor> *feeds); std::vector<paddle::framework::LoDTensor> *feeds);
bool GetFetch(const std::vector<paddle::framework::LoDTensor> &fetchs, bool GetFetch(const std::vector<paddle::framework::LoDTensor> &fetchs,
......
...@@ -105,7 +105,7 @@ function cmake_gen() { ...@@ -105,7 +105,7 @@ function cmake_gen() {
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF} -DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF}
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-DWITH_CONTRIB=ON -DWITH_CONTRIB=${WITH_CONTRIB:-ON}
======================================== ========================================
EOF EOF
# Disable UNITTEST_USE_VIRTUALENV in docker because # Disable UNITTEST_USE_VIRTUALENV in docker because
...@@ -132,7 +132,7 @@ EOF ...@@ -132,7 +132,7 @@ EOF
-DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake \ -DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake \
-DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF} \ -DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF} \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DWITH_CONTRIB=ON -DWITH_CONTRIB=${WITH_CONTRIB:-ON}
} }
function abort(){ function abort(){
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册