TastyPancakes/Flux.jl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

constructor deprecations

Browse Source
This commit is contained in:
Mike J Innes 2018-11-06 07:56:33 -05:00
parent 0c19dad700
commit a88b7528bf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cuda/cudnn.jl
View File

@ -20,7 +20,7 @@ function DropoutDesc(ρ::Real; seed::Integer=0)
s = Csize_t[0] s = Csize_t[0]
@check ccall((:cudnnCreateDropoutDescriptor,libcudnn), cudnnStatus_t, (Ptr{Ptr{Nothing}},), d) @check ccall((:cudnnCreateDropoutDescriptor,libcudnn), cudnnStatus_t, (Ptr{Ptr{Nothing}},), d)
@check ccall((:cudnnDropoutGetStatesSize,libcudnn),cudnnStatus_t,(Ptr{Nothing},Ptr{Csize_t}),handle(),s) @check ccall((:cudnnDropoutGetStatesSize,libcudnn),cudnnStatus_t,(Ptr{Nothing},Ptr{Csize_t}),handle(),s)
states = CuArray{UInt8}(s[]) # TODO: can we drop this when ρ=0? states = CuArray{UInt8}(undef, s[]) # TODO: can we drop this when ρ=0?
desc = DropoutDesc(d[], states) desc = DropoutDesc(d[], states)
@check ccall((:cudnnSetDropoutDescriptor,libcudnn),cudnnStatus_t,(Ptr{Nothing},Ptr{Nothing},Cfloat,Ptr{Nothing},Csize_t,Culonglong), @check ccall((:cudnnSetDropoutDescriptor,libcudnn),cudnnStatus_t,(Ptr{Nothing},Ptr{Nothing},Cfloat,Ptr{Nothing},Csize_t,Culonglong),
desc,handle(),ρ,states,length(states),seed) desc,handle(),ρ,states,length(states),seed)
@ -107,12 +107,12 @@ function rnnWorkspaceSize(r::RNNDesc, seqlen, xdesc)
return Int(size[]) return Int(size[])
end end
const workspace = [CuVector{UInt8}(1)] const workspace = [CuVector{UInt8}(undef, 1)]
getworkspace(bytes) = getworkspace(bytes) =
length(workspace[]) ≥ bytes ? length(workspace[]) ≥ bytes ?
workspace[] : workspace[] :
(workspace[] = CuVector{UInt8}(bytes)) (workspace[] = CuVector{UInt8}(undef, bytes))
getworkspace(r::RNNDesc, seqlen, xdesc) = getworkspace(r::RNNDesc, seqlen, xdesc) =
getworkspace(rnnWorkspaceSize(r, seqlen, xdesc)) getworkspace(rnnWorkspaceSize(r, seqlen, xdesc))
@ -174,7 +174,7 @@ function forward(rnn::RNNDesc{T}, x::CuArray{T}, h_::CuArray{T}, c_ = nothing, t
ydesc = xDesc(y) ydesc = xDesc(y)
workspace = getworkspace(rnn, seqLength, xdesc) workspace = getworkspace(rnn, seqLength, xdesc)
reserve = train == Val{true} ? reserve = train == Val{true} ?
CuVector{UInt8}(rnnTrainingReserveSize(rnn, seqLength, xdesc)) : CuVector{UInt8}(undef, rnnTrainingReserveSize(rnn, seqLength, xdesc)) :
nothing nothing
co = c == nothing ? c : similar(c) co = c == nothing ? c : similar(c)
cudnnRNNForward(rnn, seqLength, cudnnRNNForward(rnn, seqLength,