fix mac build

tensor-tang · tensor-tang · commit d4691cedec21 · 2018-07-18T18:14:56.000+08:00
diff --git a/paddle/fluid/inference/api/api_impl.cc b/paddle/fluid/inference/api/api_impl.cc
@@ -66,6 +66,7 @@ bool NativePaddlePredictor::Init(
   if (parent_scope) {
     scope_ = parent_scope;
     sub_scope_ = &(parent_scope->NewScope());
+    PADDLE_ENFORCE_NOT_NULL(sub_scope_, "create sub scope fail");
   } else {
     paddle::framework::InitDevices(false);
     scope_.reset(new paddle::framework::Scope());
@@ -102,7 +103,6 @@ bool NativePaddlePredictor::Init(
 
 NativePaddlePredictor::~NativePaddlePredictor() {
   if (sub_scope_) {
-    PADDLE_ENFORCE_NOT_NULL(scope_, "Should have parent scope!");
     scope_->DeleteScope(sub_scope_);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ bool NativePaddlePredictor::Init(`
`66`	`66`	`if (parent_scope) {`
`67`	`67`	`scope_ = parent_scope;`
`68`	`68`	`sub_scope_ = &(parent_scope->NewScope());`
	`69`	`+ PADDLE_ENFORCE_NOT_NULL(sub_scope_, "create sub scope fail");`
`69`	`70`	`} else {`
`70`	`71`	`paddle::framework::InitDevices(false);`
`71`	`72`	`scope_.reset(new paddle::framework::Scope());`
`@@ -102,7 +103,6 @@ bool NativePaddlePredictor::Init(`
`102`	`103`
`103`	`104`	`NativePaddlePredictor::~NativePaddlePredictor() {`
`104`	`105`	`if (sub_scope_) {`
`105`		`- PADDLE_ENFORCE_NOT_NULL(scope_, "Should have parent scope!");`
`106`	`106`	`scope_->DeleteScope(sub_scope_);`
`107`	`107`	`}`
`108`	`108`	`}`