Skip to content
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.

Sign up for GitHub

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

update the version of pybind, test=develop #28284

Merged
merged 2 commits into from
Oct 30, 2020
Merged

update the version of pybind, test=develop #28284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e206bc
update version pybind to v2.4.3, test=develop
Shixiaowei02 Oct 29, 2020
3d681c6
update unittests, test=develop
Shixiaowei02 Oct 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cmake/external/pybind11.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include(ExternalProject)
set(PYBIND_PREFIX_DIR ${THIRD_PARTY_PATH}/pybind)
set(PYBIND_SOURCE_DIR ${THIRD_PARTY_PATH}/pybind/src/extern_pybind)
SET(PYBIND_REPOSITORY ${GIT_URL}/pybind/pybind11.git)
SET(PYBIND_TAG v2.2.4)
SET(PYBIND_TAG v2.4.3)

cache_third_party(extern_pybind
REPOSITORY ${PYBIND_REPOSITORY}
Expand All @@ -34,7 +34,6 @@ ExternalProject_Add(
"${PYBIND_DOWNLOAD_CMD}"
PREFIX ${PYBIND_PREFIX_DIR}
SOURCE_DIR ${PYBIND_SOURCE_DIR}
UPDATE_COMMAND ""
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
Expand Down
4 changes: 2 additions & 2 deletions paddle/fluid/pybind/tensor_py.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ struct npy_format_descriptor<paddle::platform::float16> {
// https://docs.python.org/3/library/struct.html#format-characters.
return "e";
}
static PYBIND11_DESCR name() { return _("float16"); }
static constexpr auto name = _("float16");
};

// Note: Since bfloat16 is not a builtin type in C++ and in numpy,
Expand All @@ -75,7 +75,7 @@ struct npy_format_descriptor<paddle::platform::bfloat16> {
// https://docs.python.org/3/library/struct.html#format-characters.
return "H";
}
static PYBIND11_DESCR name() { return _("bfloat16"); }
static constexpr auto name = _("bfloat16");
};

} // namespace detail
Expand Down
7 changes: 6 additions & 1 deletion python/paddle/fluid/executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,6 +1261,11 @@ def _run_program(self, program, feed, fetch_list, feed_var_name,
"Executor requires Program as its Parameter. But you passed in %s"
% (type(program)))

if not isinstance(fetch_var_name, str):
raise TypeError(
"The name of fetch variable requires string as its Parameter. But you passed in %s"
% (type(fetch_var_name)))

if use_program_cache:
cache_key = _get_strong_program_cache_key(program, feed, fetch_list)
cached_program = self._get_program_cache(cache_key)
Expand Down Expand Up @@ -1311,7 +1316,7 @@ def _run_program(self, program, feed, fetch_list, feed_var_name,

if not use_program_cache:
self._default_executor.run(program.desc, scope, 0, True, True,
fetch_var_name)
[fetch_var_name])
else:
self._default_executor.run_prepared_ctx(ctx, scope, False, False,
False)
Expand Down
10 changes: 2 additions & 8 deletions python/paddle/fluid/tests/unittests/test_feed_data_check_shape_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,8 @@ def test(self):
self._test_feed_lod_tensor(use_cuda, use_parallel_executor)

# Test exception message when feeding with error
if six.PY2:
in_shape_tuple = (long(-1), long(3), long(4), long(8))
error_shape_list = [
long(self.data_batch_size), long(3), long(4), long(5)
]
else:
in_shape_tuple = (-1, 3, 4, 8)
error_shape_list = [self.data_batch_size, 3, 4, 5]
in_shape_tuple = (-1, 3, 4, 8)
error_shape_list = [self.data_batch_size, 3, 4, 5]

with self.assertRaises(ValueError) as shape_mismatch_err:
self._test_feed_data_shape_mismatch(use_cuda,
Expand Down
27 changes: 3 additions & 24 deletions python/paddle/fluid/tests/unittests/test_var_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,18 +430,7 @@ def test_tensor_str(self):
paddle.set_printoptions(4, 100, 3)
a_str = str(a)

if six.PY2:
expected = '''Tensor(shape=[10L, 20L], dtype=float32, place=CPUPlace, stop_gradient=True,
[[0.2727, 0.5489, 0.8655, ..., 0.2916, 0.8525, 0.9000],
[0.3806, 0.8996, 0.0928, ..., 0.9535, 0.8378, 0.6409],
[0.1484, 0.4038, 0.8294, ..., 0.0148, 0.6520, 0.4250],
...,
[0.3426, 0.1909, 0.7240, ..., 0.4218, 0.2676, 0.5679],
[0.5561, 0.2081, 0.0676, ..., 0.9778, 0.3302, 0.9559],
[0.2665, 0.8483, 0.5389, ..., 0.4956, 0.6862, 0.9178]])'''

else:
expected = '''Tensor(shape=[10, 20], dtype=float32, place=CPUPlace, stop_gradient=True,
expected = '''Tensor(shape=[10, 20], dtype=float32, place=CPUPlace, stop_gradient=True,
[[0.2727, 0.5489, 0.8655, ..., 0.2916, 0.8525, 0.9000],
[0.3806, 0.8996, 0.0928, ..., 0.9535, 0.8378, 0.6409],
[0.1484, 0.4038, 0.8294, ..., 0.0148, 0.6520, 0.4250],
Expand All @@ -458,12 +447,7 @@ def test_tensor_str2(self):
a = paddle.to_tensor([[1.5111111, 1.0], [0, 0]])
a_str = str(a)

if six.PY2:
expected = '''Tensor(shape=[2L, 2L], dtype=float32, place=CPUPlace, stop_gradient=True,
[[1.5111, 1. ],
[0. , 0. ]])'''
else:
expected = '''Tensor(shape=[2, 2], dtype=float32, place=CPUPlace, stop_gradient=True,
expected = '''Tensor(shape=[2, 2], dtype=float32, place=CPUPlace, stop_gradient=True,
[[1.5111, 1. ],
[0. , 0. ]])'''

Expand All @@ -475,12 +459,7 @@ def test_tensor_str3(self):
a = paddle.to_tensor([[-1.5111111, 1.0], [0, -0.5]])
a_str = str(a)

if six.PY2:
expected = '''Tensor(shape=[2L, 2L], dtype=float32, place=CPUPlace, stop_gradient=True,
[[-1.5111, 1. ],
[ 0. , -0.5000]])'''
else:
expected = '''Tensor(shape=[2, 2], dtype=float32, place=CPUPlace, stop_gradient=True,
expected = '''Tensor(shape=[2, 2], dtype=float32, place=CPUPlace, stop_gradient=True,
[[-1.5111, 1. ],
[ 0. , -0.5000]])'''

Expand Down