Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gaoqiong
pybind11
Commits
8f2f7cd6
Commit
8f2f7cd6
authored
Jul 17, 2016
by
Ivan Smirnov
Browse files
Various cleanup
parent
8fa09cb8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
include/pybind11/numpy.h
include/pybind11/numpy.h
+3
-5
No files found.
include/pybind11/numpy.h
View file @
8f2f7cd6
...
...
@@ -138,21 +138,19 @@ public:
// constructor seems to then consume them, so we don't need to strip them ourselves
auto
numpy_internal
=
module
::
import
(
"numpy.core._internal"
);
auto
dtype_from_fmt
=
(
object
)
numpy_internal
.
attr
(
"_dtype_from_pep3118"
);
auto
dtype
=
dtype_from_fmt
(
pybind11
::
str
(
info
.
format
));
auto
dtype2
=
strip_padding_fields
(
dtype
);
auto
dtype
=
strip_padding_fields
(
dtype_from_fmt
(
pybind11
::
str
(
info
.
format
)));
object
tmp
(
api
.
PyArray_NewFromDescr_
(
api
.
PyArray_Type_
,
dtype
2
.
release
().
ptr
(),
(
int
)
info
.
ndim
,
(
Py_intptr_t
*
)
&
info
.
shape
[
0
],
api
.
PyArray_Type_
,
dtype
.
release
().
ptr
(),
(
int
)
info
.
ndim
,
(
Py_intptr_t
*
)
&
info
.
shape
[
0
],
(
Py_intptr_t
*
)
&
info
.
strides
[
0
],
info
.
ptr
,
0
,
nullptr
),
false
);
if
(
!
tmp
)
pybind11_fail
(
"NumPy: unable to create array!"
);
if
(
info
.
ptr
)
tmp
=
object
(
api
.
PyArray_NewCopy_
(
tmp
.
ptr
(),
-
1
/* any order */
),
false
);
m_ptr
=
tmp
.
release
().
ptr
();
auto
d
=
(
object
)
this
->
attr
(
"dtype"
);
}
//
protected:
protected:
static
API
&
lookup_api
()
{
static
API
api
=
API
::
lookup
();
return
api
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment