Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
xerus
xerus
Commits
8cddbe6e
Commit
8cddbe6e
authored
Mar 06, 2020
by
Philipp Trunschke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix in python buffer protocol
parent
27f5b6c8
Pipeline
#1890
failed with stages
in 16 minutes and 2 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
src/xerus/python/tensor.cpp
src/xerus/python/tensor.cpp
+5
-5
No files found.
src/xerus/python/tensor.cpp
View file @
8cddbe6e
...
...
@@ -5,10 +5,9 @@ std::vector<size_t> strides_from_dimensions_and_item_size(const std::vector<size
const
size_t
ndim
=
_dimensions
.
size
();
std
::
vector
<
size_t
>
strides
(
ndim
,
0
);
if
(
ndim
>
0
)
{
strides
[
ndim
-
1
]
=
_item_size
;
strides
[
0
]
=
_item_size
;
for
(
size_t
i
=
0
;
i
<
ndim
-
1
;
++
i
)
{
size_t
rev_i
=
ndim
-
1
-
i
;
strides
[
rev_i
-
1
]
=
_dimensions
[
rev_i
]
*
strides
[
rev_i
];
strides
[
i
+
1
]
=
strides
[
i
]
*
_dimensions
[
i
];
}
}
return
strides
;
...
...
@@ -64,7 +63,7 @@ void expose_tensor(module& m) {
if
(
info
.
format
!=
format_descriptor
<
double
>::
format
())
{
throw
std
::
runtime_error
(
"Incompatible format: expected a double array!"
);
}
if
(
info
.
itemsize
!=
sizeof
(
double
))
{
if
(
info
.
itemsize
!=
sizeof
(
value_t
))
{
throw
std
::
runtime_error
(
"Incompatible size"
);
}
if
(
info
.
shape
.
size
()
==
1
and
info
.
shape
[
0
]
==
0
)
{
...
...
@@ -74,11 +73,12 @@ void expose_tensor(module& m) {
std
::
vector
<
size_t
>
dims
(
info
.
shape
.
begin
(),
info
.
shape
.
end
());
std
::
vector
<
size_t
>
strides
(
info
.
strides
.
begin
(),
info
.
strides
.
end
());
if
(
strides
!=
strides_from_dimensions_and_item_size
(
dims
,
info
.
itemsize
))
{
/* std::cerr << "Incompatible strides: " << strides << " (got) vs " << strides_from_dimensions_and_item_size(dims, info.itemsize) << " (expected)" << std::endl; */
throw
std
::
runtime_error
(
"Incompatible strides"
);
}
Tensor
result
(
dims
,
Tensor
::
Representation
::
Dense
,
Tensor
::
Initialisation
::
None
);
misc
::
copy
(
result
.
get_unsanitized_
dense
_d
ata
(),
static_cast
<
double
*>
(
info
.
ptr
),
result
.
size
)
;
*
(
result
.
dense
D
ata
)
=
info
.
ptr
;
return
result
;
})
...
...
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