Skip to content

Fix tensor_py.h #17195

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

Merged
sneaxiy merged 2 commits into from
May 6, 2019
Merged

Fix tensor_py.h #17195

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
286e0d8
fix tensor_py,test=develop
sneaxiy May 5, 2019
ebf2d2e
change class name,test=develop
sneaxiy May 5, 2019
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
35 changes: 18 additions & 17 deletions paddle/fluid/pybind/tensor_py.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,14 +431,14 @@ inline void PyCUDAPinnedTensorSetFromArray(
namespace details {

template <typename T>
constexpr bool IsValidDTypeToPyArray() {
return false;
}

#define DECLARE_VALID_DTYPE_TO_PY_ARRAY(type) \
template <> \
constexpr bool IsValidDTypeToPyArray<type>() { \
return true; \
struct ValidDTypeToPyArrayChecker {
static constexpr bool kValue = false;
};

#define DECLARE_VALID_DTYPE_TO_PY_ARRAY(type) \
template <> \
struct ValidDTypeToPyArrayChecker<type> { \
static constexpr bool kValue = true; \
}

DECLARE_VALID_DTYPE_TO_PY_ARRAY(platform::float16);
Expand All @@ -452,15 +452,16 @@ DECLARE_VALID_DTYPE_TO_PY_ARRAY(int64_t);

inline std::string TensorDTypeToPyDTypeStr(
framework::proto::VarType::Type type) {
#define TENSOR_DTYPE_TO_PY_DTYPE(T, proto_type) \
if (type == proto_type) { \
if (std::is_same<T, platform::float16>::value) { \
return "e"; \
} else { \
PADDLE_ENFORCE(IsValidDTypeToPyArray<T>, \
"This type of tensor cannot be expose to Python"); \
return py::format_descriptor<T>::format(); \
} \
#define TENSOR_DTYPE_TO_PY_DTYPE(T, proto_type) \
if (type == proto_type) { \
if (std::is_same<T, platform::float16>::value) { \
return "e"; \
} else { \
constexpr auto kIsValidDType = ValidDTypeToPyArrayChecker<T>::kValue; \
PADDLE_ENFORCE(kIsValidDType, \
"This type of tensor cannot be expose to Python"); \
return py::format_descriptor<T>::format(); \
} \
}

_ForEachDataType_(TENSOR_DTYPE_TO_PY_DTYPE);
Expand Down