Skip to content

Allow specifying buffer type in ctor #486

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
pxl-th merged 2 commits into from
Sep 6, 2023
Merged

Allow specifying buffer type in ctor #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f66f07
Allow specifying buffer type in ctor
pxl-th Sep 6, 2023
c9b3fc9
Correction
pxl-th Sep 6, 2023
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
21 changes: 19 additions & 2 deletions src/array.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ mutable struct ROCArray{T, N, B} <: AbstractGPUArray{T, N}
dims::Dims{N}
offset::Int # Offset is in number of elements (not bytes).

function ROCArray{T, N, B}(
::UndefInitializer, dims::Dims{N},
) where {T, N, B <: Union{Mem.HIPBuffer, Mem.HostBuffer}}
@assert isbitstype(T) "ROCArray only supports bits types"
buf = B(prod(dims) * sizeof(T); stream=stream())
xs = new{T, N, B}(DataRef(_free_buf, buf), dims, 0)
finalizer(unsafe_finalize!, xs)
return xs
end

function ROCArray{T, N}(
buf::DataRef{B}, dims::Dims{N}; offset::Integer = 0,
) where {T, N, B <: Union{Mem.HIPBuffer, Mem.HostBuffer}}
Expand Down Expand Up @@ -40,8 +50,9 @@ const DenseROCMatrix{T} = DenseROCArray{T,2}
const DenseROCVecOrMat{T} = Union{DenseROCVector{T}, DenseROCMatrix{T}}

# strided arrays
const StridedSubROCArray{T,N,I<:Tuple{Vararg{Union{Base.RangeIndex, Base.ReshapedUnitRange,
Base.AbstractCartesianIndex}}}} = SubArray{T,N,<:ROCArray,I}
const StridedSubROCArray{T,N,I<:Tuple{Vararg{Union{
Base.RangeIndex, Base.ReshapedUnitRange, Base.AbstractCartesianIndex,
}}}} = SubArray{T,N,<:ROCArray,I}
const StridedROCArray{T,N} = Union{ROCArray{T,N}, StridedSubROCArray{T,N}}
const StridedROCVector{T} = StridedROCArray{T,1}
const StridedROCMatrix{T} = StridedROCArray{T,2}
Expand All @@ -61,6 +72,12 @@ function ROCArray{T,N}(::UndefInitializer, dims::Dims{N}) where {T,N}
ROCArray{T, N}(DataRef(_free_buf, buf), dims)
end

# buffer, type and dimensionality specified
ROCArray{T,N,B}(::UndefInitializer, dims::NTuple{N, Integer}) where {T,N,B} =
ROCArray{T,N,B}(undef, convert(Tuple{Vararg{Int}}, dims))
ROCArray{T,N,B}(::UndefInitializer, dims::Vararg{Integer, N}) where {T,N,B} =
ROCArray{T,N,B}(undef, convert(Tuple{Vararg{Int}}, dims))

# type and dimensionality specified
ROCArray{T,N}(::UndefInitializer, dims::NTuple{N, Integer}) where {T,N} =
ROCArray{T,N}(undef, convert(Tuple{Vararg{Int}}, dims))
Expand Down
10 changes: 10 additions & 0 deletions test/rocarray/base.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
@testset "Base" begin

@testset "Specifying buffer type" begin
B = AMDGPU.Runtime.Mem.HIPBuffer
x = ROCArray{Float32, 2, B}(undef, 16, 12)
@test size(x) == (16, 12)
@test x.buf[] isa B
x = ROCArray{Float32, 2, B}(undef, (16, 12))
@test size(x) == (16, 12)
@test x.buf[] isa B
end

@testset "ones/zeros" begin
x = @inferred AMDGPU.ones(4, 3)
@test x isa ROCArray
Expand Down