Skip to content
Merged
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
42 changes: 0 additions & 42 deletions .appveyor.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .cirrus.yml

This file was deleted.

6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
.DS_Store
*.jld
*.nc

# File generated by Pkg, the package manager, based on a corresponding Project.toml
# It records a fixed state of all packages used by the project. As such, it should not be
# committed for packages, but should be committed for applications that require a static
# environment.
Manifest.toml
19 changes: 0 additions & 19 deletions .travis.yml

This file was deleted.

2 changes: 0 additions & 2 deletions Manifest.toml

This file was deleted.

28 changes: 9 additions & 19 deletions src/float8.jl
Original file line number Diff line number Diff line change
Expand Up @@ -198,22 +198,12 @@ function prevfloat(x::T) where {T<:AbstractFloat8}
end
end

promote_rule(::Type{Float8}, ::Type{Float64}) = Float64
promote_rule(::Type{Float8}, ::Type{Float32}) = Float32
promote_rule(::Type{Float8}, ::Type{Float16}) = Float16

promote_rule(::Type{Float8}, ::Type{Int64}) = Float8
promote_rule(::Type{Float8}, ::Type{Int32}) = Float8
promote_rule(::Type{Float8}, ::Type{Int16}) = Float8

promote_rule(::Type{Float8}, ::Type{Bool}) = Float8

promote_rule(::Type{Float8_4}, ::Type{Float64}) = Float64
promote_rule(::Type{Float8_4}, ::Type{Float32}) = Float32
promote_rule(::Type{Float8_4}, ::Type{Float16}) = Float16

promote_rule(::Type{Float8_4}, ::Type{Int64}) = Float8
promote_rule(::Type{Float8_4}, ::Type{Int32}) = Float8
promote_rule(::Type{Float8_4}, ::Type{Int16}) = Float8

promote_rule(::Type{Float8_4}, ::Type{Bool}) = Float8
Base.promote_rule(::Type{Float8},::Type{Float16}) = Float16
Base.promote_rule(::Type{Float8},::Type{Float32}) = Float32
Base.promote_rule(::Type{Float8},::Type{Float64}) = Float64
Base.promote_rule(::Type{Float8},::Type{<:Integer}) = Float8

Base.promote_rule(::Type{Float8_4},::Type{Float16}) = Float16
Base.promote_rule(::Type{Float8_4},::Type{Float32}) = Float32
Base.promote_rule(::Type{Float8_4},::Type{Float64}) = Float64
Base.promote_rule(::Type{Float8_4},::Type{<:Integer}) = Float8_4
10 changes: 10 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -342,3 +342,13 @@ end
@test -zero(Float8) == sign(-zero(Float8))
@test -zero(Float8_4) == sign(-zero(Float8_4))
end

@testset "Promotion" begin
@test Float8(2)*Float16(2) == Float16(4)
@test Float8(2)*Float32(2) == Float32(4)
@test Float8(2)*Float64(2) == Float64(4)

@test true*Float8(2) == Float8(2)
@test false*Float8(2) == zero(Float8)
@test 2*Float8(2) == Float8(4)
end