logitcrossentropy tweaks

This commit is contained in:
Mike J Innes 2017-10-17 17:58:32 +01:00
parent 4aa7741ba9
commit 23674b2555

View File

@ -7,8 +7,8 @@ crossentropy(ŷ::AbstractVecOrMat, y::AbstractVecOrMat) =
@deprecate logloss(x, y) crossentropy(x, y)
function logitcrossentropy(logŷ, y::AbstractMatrix, w)
logŷ = logŷ .-maximum(logŷ,1)
ypred = logŷ .- log.( sum( exp.( logŷ),1))
-sum(y .* w .* ypred)
function logitcrossentropy(logŷ::AbstractVecOrMat, y::AbstractVecOrMat)
logŷ = logŷ .- maximum(logŷ, 1)
ypred = logŷ .- log.(sum(exp.(logŷ), 1))
-sum(y .* ypred) / size(y, 2)
end