Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 10 additions & 7 deletions src/Wrap/PyArray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -627,14 +627,17 @@ Base.IndexStyle(::Type{PyArray{T,N,M,L,R}}) where {T,N,M,L,R} =

Base.unsafe_convert(::Type{Ptr{T}}, x::PyArray{T,N,M,L,T}) where {T,N,M,L} = x.ptr

Base.elsize(::Type{PyArray{T,N,M,L,T}}) where {T,N,M,L} = sizeof(T)
# Setting this to 1 means strides will be interpreted as bytes not elements
Base.elsize(::Type{PyArray{T,N,M,L,T}}) where {T,N,M,L} = 1

Base.strides(x::PyArray{T,N,M,L,R}) where {T,N,M,L,R} =
if all(mod.(x.strides, sizeof(R)) .== 0)
div.(x.strides, sizeof(R))
else
error("strides are not a multiple of element size")
end
Base.strides(x::PyArray{T,N,M,L,R}) where {T,N,M,L,R} = x.strides

@static if isdefined(Base, :is_strided)
Base.is_strided(::Type{<:PyArray{T,N,M,L,T}}) where {T,N,M,L} = true
Base.is_vec_strided(::Type{<:PyArray{T,N,M,L,T}}) where {T,N,M,L} = L
Base.is_ptr_loadable(::Type{<:PyArray{T,N,M,L,T}}) where {T,N,M,L} = true
Base.is_ptr_storable(::Type{<:PyArray{T,N,M,L,T}}) where {T,N,M,L} = M
end

function Base.showarg(io::IO, x::PyArray{T,N}, toplevel::Bool) where {T,N}
toplevel || print(io, "::")
Expand Down
12 changes: 6 additions & 6 deletions test/Wrap.jl
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
@test Base.IndexStyle(z) === Base.IndexCartesian()
end
@testset "strides" begin
@test strides(y) === (1,)
@test strides(z) === (1,)
@test strides(y) === (4,)
@test strides(z) === (4,)
end
@testset "elsize" begin
@test Base.elsize(y) === sizeof(Cint)
@test Base.elsize(z) === sizeof(Cint)
@test Base.elsize(PyArray{Cint,1,true,true,Cint}) === sizeof(Cint)
@test Base.elsize(PyArray{Cint,1,false,false,Cint}) === sizeof(Cint)
@test Base.elsize(y) === 1
@test Base.elsize(z) === 1
@test Base.elsize(PyArray{Cint,1,true,true,Cint}) === 1
@test Base.elsize(PyArray{Cint,1,false,false,Cint}) === 1
@test_throws Exception elsize(PyArray{Cint,1,true,false,Cchar})
end
@testset "getindex" begin
Expand Down
Loading