Skip to content

Revert "Fix a few naming conflicts in LinAlg/BLAS. Fixes #14268." #22374

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 2 commits into from
Jun 16, 2017
Merged

Revert "Fix a few naming conflicts in LinAlg/BLAS. Fixes #14268." #22374

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
a61bd2e
Revert "Fix a few naming conflicts in LinAlg/BLAS. Fixes #14268."
andreasnoack Jun 14, 2017
f03cf0f
Add test to make sure that dot(Matrix,Matrix) throws for all types
andreasnoack Jun 14, 2017
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
4 changes: 3 additions & 1 deletion base/linalg/blas.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

module BLAS

import ..axpy!
import Base: copy!
import Base.LinAlg: axpy!, dot

export
# Level 1
asum,
axpy!,
blascopy!,
dot,
dotc,
dotu,
scal!,
Expand Down
1 change: 0 additions & 1 deletion base/linalg/linalg.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ include("exceptions.jl")
include("generic.jl")

include("blas.jl")
import .BLAS: gemv! # consider renaming gemv! in matmul
include("matmul.jl")
include("lapack.jl")

Expand Down
11 changes: 6 additions & 5 deletions test/linalg/matmul.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,15 @@ end
# issue #6450
@test dot(Any[1.0,2.0], Any[3.5,4.5]) === 12.5

for elty in (Float32,Float64,Complex64,Complex128)
x = convert(Vector{elty},[1.0,2.0,3.0])
y = convert(Vector{elty},[3.5,4.5,5.5])
@testset "dot" for elty in (Float32, Float64, Complex64, Complex128)
x = convert(Vector{elty},[1.0, 2.0, 3.0])
y = convert(Vector{elty},[3.5, 4.5, 5.5])
@test_throws DimensionMismatch dot(x, 1:2, y, 1:3)
@test_throws BoundsError dot(x, 1:4, y, 1:4)
@test_throws BoundsError dot(x, 1:3, y, 2:4)
@test dot(x,1:2,y,1:2) == convert(elty,12.5)
@test x.'*y == convert(elty,29.0)
@test dot(x, 1:2,y, 1:2) == convert(elty, 12.5)
@test x.'*y == convert(elty, 29.0)
@test_throws MethodError dot(rand(elty, 2, 2), randn(elty, 2, 2))
end

vecdot_(x,y) = invoke(vecdot, Tuple{Any,Any}, x,y) # generic vecdot
Expand Down