pybind/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2026-05-13 09:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make changes to format_descriptor backwards-compat

Browse Source 
The format strings that are known at compile time are now accessible
via both ::value and ::format(), and format strings for everything
else is accessible via ::format(). This makes it backwards compatible.
This commit is contained in:
Ivan Smirnov
2016-06-26 12:42:34 +01:00
parent 4f164217e4
commit 5e71e17bdf
6 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/pybind11/common.h
View File

@@ -204,7 +204,7 @@ struct buffer_info {
void *ptr; // Pointer to the underlying storage
size_t itemsize; // Size of individual items in bytes
size_t size; // Total number of entries
std::string format; // For homogeneous buffers, this should be set to format_descriptor<T>::value()
std::string format; // For homogeneous buffers, this should be set to format_descriptor<T>::format()
size_t ndim; // Number of dimensions
std::vector<size_t> shape; // Shape of the tensor (1 entry per dimension)
std::vector<size_t> strides; // Number of entries between adjacent entries (for each per dimension)
@@ -349,18 +349,19 @@ PYBIND11_RUNTIME_EXCEPTION(reference_cast_error) /// Used internally
/// Format strings for basic number types
#define PYBIND11_DECL_FMT(t, v) template<> struct format_descriptor<t> \
{ static constexpr const char* value() { return v; } };
{ static constexpr const char* value = v; /* for backwards compatibility */ \
static constexpr const char* format() { return value; } }
template <typename T, typename SFINAE = void> struct format_descriptor { };
template <typename T> struct format_descriptor<T, typename std::enable_if<std::is_integral<T>::value>::type> {
static constexpr const char* value() { return format; }
static constexpr const char format[2] =
static constexpr const char value[2] =
{ "bBhHiIqQ"[detail::log2(sizeof(T))*2 + (std::is_unsigned<T>::value ? 1 : 0)], '\0' };
static constexpr const char* format() { return value; }
};
template <typename T> constexpr const char format_descriptor<
T, typename std::enable_if<std::is_integral<T>::value>::type>::format[2];
T, typename std::enable_if<std::is_integral<T>::value>::type>::value[2];
PYBIND11_DECL_FMT(float, "f");
PYBIND11_DECL_FMT(double, "d");

10
include/pybind11/eigen.h
View File

@@ -133,7 +133,7 @@ struct type_caster<Type, typename std::enable_if<is_eigen_dense<Type>::value &&
/* Size of one scalar */
sizeof(Scalar),
/* Python struct-style format descriptor */
format_descriptor<Scalar>::value(),
format_descriptor<Scalar>::format(),
/* Number of dimensions */
1,
/* Buffer dimensions */
@@ -148,7 +148,7 @@ struct type_caster<Type, typename std::enable_if<is_eigen_dense<Type>::value &&
/* Size of one scalar */
sizeof(Scalar),
/* Python struct-style format descriptor */
format_descriptor<Scalar>::value(),
format_descriptor<Scalar>::format(),
/* Number of dimensions */
isVector ? 1 : 2,
/* Buffer dimensions */
@@ -276,7 +276,7 @@ struct type_caster<Type, typename std::enable_if<is_eigen_sparse<Type>::value>::
// Size of one scalar
sizeof(Scalar),
// Python struct-style format descriptor
format_descriptor<Scalar>::value(),
format_descriptor<Scalar>::format(),
// Number of dimensions
1,
// Buffer dimensions
@@ -291,7 +291,7 @@ struct type_caster<Type, typename std::enable_if<is_eigen_sparse<Type>::value>::
// Size of one scalar
sizeof(StorageIndex),
// Python struct-style format descriptor
format_descriptor<StorageIndex>::value(),
format_descriptor<StorageIndex>::format(),
// Number of dimensions
1,
// Buffer dimensions
@@ -306,7 +306,7 @@ struct type_caster<Type, typename std::enable_if<is_eigen_sparse<Type>::value>::
// Size of one scalar
sizeof(StorageIndex),
// Python struct-style format descriptor
format_descriptor<StorageIndex>::value(),
format_descriptor<StorageIndex>::format(),
// Number of dimensions
1,
// Buffer dimensions

14
include/pybind11/numpy.h
View File

@@ -164,8 +164,8 @@ template <typename T> struct format_descriptor
!std::is_same<T, std::complex<float>>::value &&
!std::is_same<T, std::complex<double>>::value>::type>
{
static const char *value() {
return detail::npy_format_descriptor<T>::format_str();
static const char *format() {
return detail::npy_format_descriptor<T>::format();
}
};
@@ -231,8 +231,8 @@ template <typename T> struct npy_format_descriptor
return object(descr_(), true);
}
static const char* format_str() {
return format_str_();
static const char* format() {
return format_();
}
static void register_dtype(std::initializer_list<field_descriptor> fields) {
@@ -256,7 +256,7 @@ template <typename T> struct npy_format_descriptor
if (auto arr = (object) empty(int_(0), object(descr(), true)))
if (auto view = PyMemoryView_FromObject(arr.ptr()))
if (auto info = PyMemoryView_GET_BUFFER(view)) {
std::strncpy(format_str_(), info->format, 4096);
std::strncpy(format_(), info->format, 4096);
return;
}
pybind11_fail("NumPy: failed to extract buffer format");
@@ -264,7 +264,7 @@ template <typename T> struct npy_format_descriptor
private:
static inline PyObject*& descr_() { static PyObject *ptr = nullptr; return ptr; }
static inline char* format_str_() { static char s[4096]; return s; }
static inline char* format_() { static char s[4096]; return s; }
};
#define FIELD_DESCRIPTOR(Type, Field) \
@@ -480,7 +480,7 @@ struct vectorize_helper {
return cast(f(*((Args *) buffers[Index].ptr)...));
array result(buffer_info(nullptr, sizeof(Return),
format_descriptor<Return>::value(),
format_descriptor<Return>::format(),
ndim, shape, strides));
buffer_info buf = result.request();