-
Notifications
You must be signed in to change notification settings - Fork 5.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make PyBind support C++ exception #4396
Merged
reyoung
merged 5 commits into
PaddlePaddle:develop
from
reyoung:feature/make_python_catch_enforce_not_met
Sep 27, 2017
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
67cdd5b
Make PyBind support C++ exception
reyoung 49697d9
Merge branch 'develop' of github.com:baidu/Paddle into feature/make_p…
reyoung d5935e0
Merge branch 'develop' of github.com:baidu/Paddle into feature/make_p…
reyoung 680c202
Merge branch 'develop' of github.com:baidu/Paddle into feature/make_p…
reyoung ba4b029
Follow comments, check exception message
reyoung File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
if(WITH_PYTHON) | ||
cc_library(paddle_pybind SHARED | ||
SRCS pybind.cc protobuf.cc | ||
SRCS pybind.cc exception.cc protobuf.cc | ||
DEPS pybind python backward | ||
${GLOB_OP_LIB}) | ||
endif(WITH_PYTHON) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. */ | ||
|
||
#include "paddle/pybind/exception.h" | ||
|
||
namespace paddle { | ||
namespace pybind { | ||
|
||
void BindException(pybind11::module& m) { | ||
static pybind11::exception<platform::EnforceNotMet> exc(m, "EnforceNotMet"); | ||
pybind11::register_exception_translator([](std::exception_ptr p) { | ||
try { | ||
if (p) std::rethrow_exception(p); | ||
} catch (const platform::EnforceNotMet& e) { | ||
exc(e.what()); | ||
} | ||
}); | ||
|
||
m.def("__unittest_throw_exception__", [] { PADDLE_THROW("test exception"); }); | ||
} | ||
|
||
} // namespace pybind | ||
} // namespace paddle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. */ | ||
|
||
#pragma once | ||
#include "paddle/platform/enforce.h" | ||
#include "pybind11/pybind11.h" | ||
namespace paddle { | ||
namespace pybind { | ||
|
||
extern void BindException(pybind11::module& m); | ||
} // namespace pybind | ||
} // namespace paddle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import paddle.v2.framework.core as core | ||
import unittest | ||
|
||
|
||
class TestException(unittest.TestCase): | ||
def test_exception(self): | ||
ex = None | ||
try: | ||
core.__unittest_throw_exception__() | ||
except core.EnforceNotMet as ex: | ||
self.assertIn("test exception", ex.message) | ||
|
||
self.assertIsNotNone(ex) | ||
|
||
|
||
if __name__ == "__main__": | ||
unittest.main() |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this
extern
required?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
extern
is not necessary but useful for code reading.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok~