Skip to content

remove Manifest #1657

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
merged 3 commits into from
Jul 10, 2021
Merged

remove Manifest #1657

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a55f9c5
remove Manifest
CarloLucibello Jul 10, 2021
f28343f
gitignore manifest
CarloLucibello Jul 10, 2021
0be6765
fix ctc_gpu
CarloLucibello Jul 10, 2021
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
13 changes: 7 additions & 6 deletions src/losses/ctc-gpu.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,15 @@ end
function ctc_alpha(ŷ::CuArray, y)
ŷ = logsoftmax(ŷ)
blank = size(ŷ, 1)
z′ = fill(blank, 2 * length(y) + 1)
z′[eachindex(y) .* 2] = y
ycu = cu(y)
z′ = CUDA.fill(blank, 2 * length(y) + 1)
z′[eachindex(y) .* 2] .= ycu
T = size(ŷ, 2)
U′ = 2*length(y) + 1
alphas = CUDA.fill(log(zero(ŷ[1])), U′,T)
nRepeats = count_repeats(y)
alphas = CUDA.fill(log(zero(eltype(ŷ))), U′,T)
nRepeats = count_repeats(cpu(y))
nThreads = min(U′, MAX_THREADS)
@cuda blocks=1 threads=nThreads compute_alpha_kernel(ŷ, length(y), T, nRepeats, CuArray(y), CuArray(z′), alphas, blank)
@cuda blocks=1 threads=nThreads compute_alpha_kernel(ŷ, length(y), T, nRepeats, ycu, z′, alphas, blank)
return (loss=-1 * logsumexp(alphas[end-1:end]), alpha=alphas, z′=z′, yhat=ŷ, nRepeats=nRepeats)
end

Expand All @@ -221,7 +222,7 @@ function ∇ctc_loss(ŷ::CuArray, y, out)
loss, alphas, z′, ŷ, nRepeats = out
U′, T = size(alphas)
blank = size(ŷ, 1)
typed_zero = zero(first(ŷ))
typed_zero = zero(eltype(ŷ))
betas = CUDA.fill(log(typed_zero), U′, T)
output = CUDA.fill(log(typed_zero), U′, T)
nThreads = min(U′, MAX_THREADS)
Expand Down
1 change: 1 addition & 0 deletions test/outputsize.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
@test outputsize(m, (10,); padbatch=true) == (2, 1)
@test outputsize(m, (10, 30)) == (2, 30)

@info "Don't mind the following error, it's for testing purpose."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

m = Chain(Dense(10, 8, σ), Dense(8, 4), Dense(5, 2))
@test_throws DimensionMismatch outputsize(m, (10,))

Expand Down
3 changes: 2 additions & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Flux
using Flux.Data
using Flux: OneHotArray, OneHotMatrix, OneHotVector
using Test
using Random, Statistics, LinearAlgebra
using IterTools: ncycle
Expand Down Expand Up @@ -50,7 +51,7 @@ end
end
end

@static if VERSION == v"1.5"
@static if VERSION == v"1.6"
using Documenter
@testset "Docs" begin
DocMeta.setdocmeta!(Flux, :DocTestSetup, :(using Flux); recursive=true)
Expand Down