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

paddle/contrib/inference/paddle_inference_api_impl.h

@@ -54,7 +54,7 @@ class PaddlePredictorImpl : public PaddlePredictor {
   ~PaddlePredictorImpl() override{};
 
  private:
-  bool InitShared();
+  bool InitShared() override;
   bool SetFeed(const std::vector<PaddleTensor> &input_datas,
                std::vector<paddle::framework::LoDTensor> *feeds);
   bool GetFetch(const std::vector<paddle::framework::LoDTensor> &fetchs,

paddle/scripts/paddle_build.sh

@@ -105,7 +105,7 @@ function cmake_gen() {
         -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
         -DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF}
         -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-        -DWITH_CONTRIB=ON
+        -DWITH_CONTRIB=${WITH_CONTRIB:-ON}
     ========================================
 EOF
     # Disable UNITTEST_USE_VIRTUALENV in docker because
@@ -132,7 +132,7 @@ EOF
         -DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake \
         -DWITH_FLUID_ONLY=${WITH_FLUID_ONLY:-OFF} \
         -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-        -DWITH_CONTRIB=ON
+        -DWITH_CONTRIB=${WITH_CONTRIB:-ON}
 }
 
 function abort(){