Skip to content
Browse files

Some blas/lapack related cosmetic cleanups as part of #1248

  • Loading branch information...
1 parent f7f4a16 commit 35ca1862ff6cb2247acd4ffdd41fe3265999a4fc @ViralBShah ViralBShah committed Sep 22, 2012
Showing with 84 additions and 84 deletions.
  1. +2 −2 base/Makefile
  2. +17 −17 base/{linalg_blas.jl → blas.jl}
  3. +1 −1 base/export.jl
  4. +1 −1 base/factorizations.jl
  5. +46 −46 base/lapack.jl
  6. +13 −13 base/linalg.jl
  7. +1 −1 base/linalg_dense.jl
  8. +2 −2 base/start_image.jl
  9. +1 −1 base/sysimg.jl
View
4 base/Makefile
@@ -15,8 +15,8 @@ os_detect.jl: ../src/os_detect.h
$(QUIET_PERL) ${CC} -E -P -DJULIA ../src/os_detect.h | perl -p -e 's/\\n/\n/g' > $@
build_h.jl: ../Make.inc
- @echo "_jl_libblas_name = \"$(LIBBLASNAME)\"" > $@
- @echo "_jl_liblapack_name = \"$(LIBLAPACKNAME)\"" >> $@
+ @echo "libblas_name = \"$(LIBBLASNAME)\"" > $@
+ @echo "liblapack_name = \"$(LIBLAPACKNAME)\"" >> $@
clean:
rm -f *# *~
View
34 base/linalg_blas.jl → base/blas.jl
@@ -1,14 +1,14 @@
typealias LapackScalar Union(Float64,Float32,Complex128,Complex64)
-module BLAS
+module Blas
import Base.*
# SUBROUTINE DCOPY(N,DX,INCX,DY,INCY)
for (fname, elty) in ((:dcopy_,:Float64), (:scopy_,:Float32),
(:zcopy_,:Complex128), (:ccopy_,:Complex64))
@eval begin
function copy!(n::Integer, DX::Union(Ptr{$elty},Array{$elty}), incx::Integer, DY::Union(Ptr{$elty},Array{$elty}), incy::Integer)
- ccall(dlsym(Base._jl_libblas, $(string(fname))), Void,
+ ccall(dlsym(Base.libblas, $(string(fname))), Void,
(Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32}),
&n, DX, &incx, DY, &incy)
DY
@@ -23,7 +23,7 @@ end
for (fname, elty) in ((:ddot_,:Float64), (:sdot_,:Float32))
@eval begin
function dot(n::Integer, DX::Union(Ptr{$elty},Array{$elty}), incx::Integer, DY::Union(Ptr{$elty},Array{$elty}), incy::Integer)
- ccall(dlsym(Base._jl_libblas, $(string(fname))), $elty,
+ ccall(dlsym(Base.libblas, $(string(fname))), $elty,
(Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32}),
&n, DX, &incx, DY, &incy)
end
@@ -37,7 +37,7 @@ for (fname, elty, ret_type) in ((:dnrm2_,:Float64,:Float64),
(:scnrm2_,:Complex64,:Float32))
@eval begin
function nrm2(n::Integer, X::Union(Ptr{$elty},Array{$elty}), incx::Integer)
- ccall(dlsym(Base._jl_libblas, $(string(fname))), $ret_type,
+ ccall(dlsym(Base.libblas, $(string(fname))), $ret_type,
(Ptr{Int32}, Ptr{$elty}, Ptr{Int32}),
&n, X, &incx)
end
@@ -57,7 +57,7 @@ for (fname, elty) in ((:daxpy_,:Float64), (:saxpy_,:Float32),
function axpy!(n::Integer, a::($elty),
DX::Union(Ptr{$elty},Array{$elty}), incx::Integer,
DY::Union(Ptr{$elty},Array{$elty}), incy::Integer)
- ccall(dlsym(Base._jl_libblas, $(string(fname))), Void,
+ ccall(dlsym(Base.libblas, $(string(fname))), Void,
(Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32}),
&n, &a, DX, &incx, DY, &incy)
DY
@@ -83,7 +83,7 @@ for (fname, elty) in ((:dsyrk_,:Float64), (:ssyrk_,:Float32),
nn = size(A, trans == 'N' ? 1 : 2)
if nn != n error("syrk!: dimension mismatch") end
k = size(A, trans == 'N' ? 2 : 1)
- ccall(dlsym(Base._jl_libblas, $(string(fname))), Void,
+ ccall(dlsym(Base.libblas, $(string(fname))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32}),
&uplo, &trans, &n, &k, &alpha, A, &stride(A,2), &beta, C, &stride(C,2))
@@ -93,7 +93,7 @@ for (fname, elty) in ((:dsyrk_,:Float64), (:ssyrk_,:Float32),
n = size(A, trans == 'N' ? 1 : 2)
k = size(A, trans == 'N' ? 2 : 1)
C = Array($elty, (n, n))
- ccall(dlsym(Base._jl_libblas, $(string(fname))), Void,
+ ccall(dlsym(Base.libblas, $(string(fname))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32}),
&uplo, &trans, &n, &k, &alpha, A, &stride(A,2), &0., C, &stride(C,2))
@@ -119,7 +119,7 @@ for (fname, elty) in ((:zherk_,:Complex128), (:cherk_,:Complex64))
nn = size(A, trans == 'N' ? 1 : 2)
if nn != n error("syrk!: dimension mismatch") end
k = size(A, trans == 'N' ? 2 : 1)
- ccall(dlsym(Base._jl_libblas, $(string(fname))), Void,
+ ccall(dlsym(Base.libblas, $(string(fname))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32}),
&uplo, &trans, &n, &k, &alpha, A, &stride(A,2), &beta, C, &stride(C,2))
@@ -129,7 +129,7 @@ for (fname, elty) in ((:zherk_,:Complex128), (:cherk_,:Complex64))
n = size(A, trans == 'N' ? 1 : 2)
k = size(A, trans == 'N' ? 2 : 1)
C = Array($elty, (n, n))
- ccall(dlsym(Base._jl_libblas, $(string(fname))), Void,
+ ccall(dlsym(Base.libblas, $(string(fname))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32}),
&uplo, &trans, &n, &k, &alpha, A, &stride(A,2), &0., C, &stride(C,2))
@@ -153,7 +153,7 @@ for (fname, elty) in ((:dgbmv_,:Float64), (:sgbmv_,:Float32),
function gbmv!(trans, m::Integer, kl::Integer, ku::Integer,
alpha::($elty), A::StridedMatrix{$elty}, x::StridedVector{$elty},
beta::($elty), y::StridedVector{$elty})
- ccall(dlsym(Base._jl_libblas, $(string(fname))), Void,
+ ccall(dlsym(Base.libblas, $(string(fname))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{$elty}, Ptr{Int32}),
@@ -165,7 +165,7 @@ for (fname, elty) in ((:dgbmv_,:Float64), (:sgbmv_,:Float32),
alpha::($elty), A::StridedMatrix{$elty}, x::StridedVector{$elty})
n = stride(A,2)
y = Array($elty, n)
- ccall(dlsym(Base._jl_libblas, $(string(fname))), Void,
+ ccall(dlsym(Base.libblas, $(string(fname))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{$elty}, Ptr{Int32}),
@@ -192,7 +192,7 @@ for (fname, elty) in ((:dsbmv_,:Float64), (:ssbmv_,:Float32),
function sbmv!(uplo, k::Integer,
alpha::($elty), A::StridedMatrix{$elty}, x::StridedVector{$elty},
beta::($elty), y::StridedVector{$elty})
- ccall(dlsym(Base._jl_libblas, $(string(fname))), Void,
+ ccall(dlsym(Base.libblas, $(string(fname))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32}),
&uplo, &size(A,2), &k, &alpha, A, &stride(A,2), x, &stride(x,1), &beta, y, &stride(y,1))
@@ -202,7 +202,7 @@ for (fname, elty) in ((:dsbmv_,:Float64), (:ssbmv_,:Float32),
x::StridedVector{$elty})
n = size(A,2)
y = Array($elty, n)
- ccall(dlsym(Base._jl_libblas, $(string(fname))), Void,
+ ccall(dlsym(Base.libblas, $(string(fname))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32}),
&uplo, &size(A,2), &k, &alpha, A, &stride(A,2), x, &stride(x,1), &0., y, &1)
@@ -228,7 +228,7 @@ for (fname, elty) in ((:dgemm_,:Float64), (:sgemm_,:Float32),
k = size(A, transA == 'N' ? 2 : 1)
n = size(B, transB == 'N' ? 2 : 1)
if m != size(C,1) || n != size(C,2) error("gemm!: mismatched dimensions") end
- ccall(dlsym(Base._jl_libblas, $(string(fname))), Void,
+ ccall(dlsym(Base.libblas, $(string(fname))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{$elty}, Ptr{Int32}),
@@ -242,7 +242,7 @@ for (fname, elty) in ((:dgemm_,:Float64), (:sgemm_,:Float32),
if k != size(B, transB == 'N' ? 1 : 2) error("gemm!: mismatched dimensions") end
n = size(B, transB == 'N' ? 2 : 1)
C = Array($elty, (m, n))
- ccall(dlsym(Base._jl_libblas, $(string(fname))), Void,
+ ccall(dlsym(Base.libblas, $(string(fname))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{$elty}, Ptr{Int32}),
@@ -266,7 +266,7 @@ for (fname, elty) in ((:dgemv_,:Float64), (:sgemv_,:Float32),
@eval begin
function gemv!(trans, alpha::($elty), A::StridedMatrix{$elty},
X::StridedVector{$elty}, beta::($elty), Y::StridedVector{$elty})
- ccall(dlsym(Base._jl_libblas, $(string(fname))), Void,
+ ccall(dlsym(Base.libblas, $(string(fname))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32}),
&trans, &size(A,1), &size(A,2), &alpha, A, &stride(A,2),
@@ -275,7 +275,7 @@ for (fname, elty) in ((:dgemv_,:Float64), (:sgemv_,:Float32),
end
function gemv!(trans, alpha::($elty), A::StridedMatrix{$elty}, X::StridedVector{$elty})
Y = Array($elty, size(A,1))
- ccall(dlsym(Base._jl_libblas, $(string(fname))), Void,
+ ccall(dlsym(Base.libblas, $(string(fname))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32}),
&trans, &size(A,1), &size(A,2), &alpha, A, &stride(A,2),
View
2 base/export.jl
@@ -7,7 +7,7 @@ export
FFTW,
DSP,
Lapack,
- BLAS,
+ Blas,
# Types
AbstractMatrix,
View
2 base/factorizations.jl
@@ -3,7 +3,7 @@ abstract Factorization{T}
## LD for BunchKaufman, LR for CholeskyDense, LU for LUDense and
## define size methods for Factorization types using it.
-## merge symmetrize with _jl_copy_upper_to_lower in linalg_blas.jl
+## merge symmetrize with _jl_copy_upper_to_lower in blas.jl
## maybe another function makehermitian and use conj for complex
function symmetrize!(A::AbstractMatrix, upper::Bool)
m, n = size(A)
View
92 base/lapack.jl
@@ -42,7 +42,7 @@ for (gbtrf, gbtrs, elty) in
n = size(AB, 2)
mnmn = min(m, n)
ipiv = Array(Int32, mnmn)
- ccall(dlsym(Base._jl_liblapack, $(string(gbtrf))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gbtrf))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32}),
&m, &n, &kl, &ku, AB, &stride(AB,2), ipiv, info)
@@ -63,7 +63,7 @@ for (gbtrf, gbtrs, elty) in
info = Array(Int32, 1)
n = size(AB,2)
if m != n || m != size(B,1) throw(LapackDimMisMatch("gbtrs!")) end
- ccall(dlsym(Base._jl_liblapack, $(string(gbtrs))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gbtrs))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32}),
&trans, &n, &kl, &ku, &size(B,2), AB, &stride(AB,2), ipiv,
@@ -95,7 +95,7 @@ for (gebal, gebak, elty) in
ihi = Array(Int32, 1)
ilo = Array(Int32, 1)
scale = Array($elty, n)
- ccall(dlsym(Base.Base._jl_liblapack, $(string(gebal))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gebal))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32}),
&job, &n, A, &stride(A,2), ilo, ihi, scale, info)
@@ -114,7 +114,7 @@ for (gebal, gebak, elty) in
chkstride1(V)
chksquare(V)
info = Array(Int32, 1)
- ccall(dlsym(Base.Base._jl_liblapack, $(string(gebak))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gebak))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&job, &side, &size(V,1), &ilo, &ihi, scale, &n, V, &stride(V,2), info)
@@ -157,7 +157,7 @@ for (gebrd, gelqf, geqlf, geqrf, geqp3, gerqf, getrf, elty) in
lwork = int32(-1)
info = Array(Int32, 1)
for i in 1:2
- ccall(dlsym(Base._jl_liblapack, $(string(gebrd))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gebrd))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{$elty}, Ptr{$elty}, Ptr{$elty},
Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
@@ -184,7 +184,7 @@ for (gebrd, gelqf, geqlf, geqrf, geqp3, gerqf, getrf, elty) in
lwork = int32(-1)
work = Array($elty, (1,))
for i in 1:2 # first call returns lwork as work[1]
- ccall(dlsym(Base._jl_liblapack, $(string(gelqf))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gelqf))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&m, &n, A, &lda, tau, work, &lwork, info)
@@ -211,7 +211,7 @@ for (gebrd, gelqf, geqlf, geqrf, geqp3, gerqf, getrf, elty) in
lwork = int32(-1)
work = Array($elty, (1,))
for i in 1:2 # first call returns lwork as work[1]
- ccall(dlsym(Base._jl_liblapack, $(string(geqlf))), Void,
+ ccall(dlsym(Base.liblapack, $(string(geqlf))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&m, &n, A, &lda, tau, work, &lwork, info)
@@ -242,13 +242,13 @@ for (gebrd, gelqf, geqlf, geqrf, geqp3, gerqf, getrf, elty) in
if cmplx rwork = Array(Rtyp, 2n) end
for i in 1:2
if cmplx
- ccall(dlsym(Base._jl_liblapack, $(string(geqp3))), Void,
+ ccall(dlsym(Base.liblapack, $(string(geqp3))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32},
Ptr{Rtyp}, Ptr{Int32}),
&m, &n, A, &stride(A,2), jpvt, tau, work, &lwork, rwork, info)
else
- ccall(dlsym(Base._jl_liblapack, $(string(geqp3))), Void,
+ ccall(dlsym(Base.liblapack, $(string(geqp3))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32},
Ptr{Int32}),
@@ -279,7 +279,7 @@ for (gebrd, gelqf, geqlf, geqrf, geqp3, gerqf, getrf, elty) in
lwork = int32(-1)
info = Array(Int32, 1)
for i in 1:2 # first call returns lwork as work[1]
- ccall(dlsym(Base._jl_liblapack, $(string(geqrf))), Void,
+ ccall(dlsym(Base.liblapack, $(string(geqrf))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&m, &n, A, &stride(A,2), tau, work, &lwork, info)
@@ -304,7 +304,7 @@ for (gebrd, gelqf, geqlf, geqrf, geqp3, gerqf, getrf, elty) in
lwork = int32(-1)
work = Array($elty, 1)
for i in 1:2 # first call returns lwork as work[1]
- ccall(dlsym(Base._jl_liblapack, $(string(gerqf))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gerqf))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&m, &n, A, &stride(A,2), tau, work, &lwork, info)
@@ -328,7 +328,7 @@ for (gebrd, gelqf, geqlf, geqrf, geqp3, gerqf, getrf, elty) in
m, n = size(A)
lda = stride(A, 2)
ipiv = Array(Int32, n)
- ccall(dlsym(Base._jl_liblapack, $(string(getrf))), Void,
+ ccall(dlsym(Base.liblapack, $(string(getrf))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{$elty},
Ptr{Int32}, Ptr{Int32}, Ptr{Int32}),
&m, &n, A, &lda, ipiv, info)
@@ -358,7 +358,7 @@ for (gels, gesv, getrs, getri, elty) in
work = Array($elty, 1)
lwork = int32(-1)
for i in 1:2
- ccall(dlsym(Base._jl_liblapack, $(string(gels))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gels))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
@@ -388,7 +388,7 @@ for (gels, gesv, getrs, getri, elty) in
if size(B,1) != n throw(LapackDimMisMatch("gesv!")) end
ipiv = Array(Int32, n)
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(gesv))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gesv))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&n, &size(B,2), A, &stride(A,2), ipiv, B, &stride(B,2), info)
@@ -408,7 +408,7 @@ for (gels, gesv, getrs, getri, elty) in
if m != n || size(B, 1) != m error("getrs!: dimension mismatch") end
nrhs = size(B, 2)
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(getrs))), Void,
+ ccall(dlsym(Base.liblapack, $(string(getrs))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&trans, &n, &size(B,2), A, &stride(A,2), ipiv, B, &stride(B,2), info)
@@ -430,7 +430,7 @@ for (gels, gesv, getrs, getri, elty) in
lwork = -1
work = Array($elty, 1)
for i in 1:2
- ccall(dlsym(Base._jl_liblapack, $(string(getri))), Void,
+ ccall(dlsym(Base.liblapack, $(string(getri))), Void,
(Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&n, A, &lda, ipiv, work, &lwork, info)
@@ -482,15 +482,15 @@ for (geev, gesvd, gesdd, elty) in
info = Array(Int32, 1)
for i = 1:2
if cmplx
- ccall(dlsym(Base._jl_liblapack, $(string(geev))), Void,
+ ccall(dlsym(Base.liblapack, $(string(geev))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{$elty},
Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{Rtyp}, Ptr{Int32}),
&jobvl, &jobvr, &n, A, &stride(A,2), W, VL, &n, VR, &n,
work, &lwork, rwork, info)
else
- ccall(dlsym(Base._jl_liblapack, $(string(geev))), Void,
+ ccall(dlsym(Base.liblapack, $(string(geev))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{$elty},
Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{$elty},
Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{$elty},
@@ -545,15 +545,15 @@ for (geev, gesvd, gesdd, elty) in
info = Array(Int32, 1)
for i = 1:2
if cmplx
- ccall(dlsym(Base._jl_liblapack, $(string(gesdd))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gesdd))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty},
Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{Rtyp}, Ptr{Int32}, Ptr{Int32}),
&job, &m, &n, A, &stride(A,2), S, U, &m, VT, &n,
work, &lwork, rwork, iwork, info)
else
- ccall(dlsym(Base._jl_liblapack, $(string(gesdd))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gesdd))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty},
Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
@@ -592,15 +592,15 @@ for (geev, gesvd, gesdd, elty) in
info = Array(Int32, 1)
for i in 1:2
if cmplx
- ccall(dlsym(Base._jl_liblapack, $(string(gesvd))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gesvd))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty},
Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{$elty},
Ptr{Int32}, Ptr{Rtyp}, Ptr{Int32}),
&jobu, &jobvt, &m, &n, A, &stride(A,2), S, U, &m, VT, &n,
work, &lwork, rwork, info)
else
- ccall(dlsym(Base._jl_liblapack, $(string(gesvd))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gesvd))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty},
Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{$elty},
@@ -642,7 +642,7 @@ for (gtsv, gttrf, gttrs, elty) in
end
if n != size(B,1) throw(LapackDimMisMatch("gtsv!")) end
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(gtsv))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gtsv))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{$elty},
Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&n, &size(B,2), dl, d, du, B, &stride(B,2), info)
@@ -663,7 +663,7 @@ for (gtsv, gttrf, gttrs, elty) in
du2 = Array($elty, n-2)
ipiv = Array(Int32, n)
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(gttrf))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gttrf))), Void,
(Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{$elty}, Ptr{$elty},
Ptr{Int32}, Ptr{Int32}),
&n, dl, d, du, du2, ipiv, info)
@@ -685,7 +685,7 @@ for (gtsv, gttrf, gttrs, elty) in
if length(dl) != n - 1 || length(du) != n - 1 throw(LapackDimMisMatch("gttrs!")) end
if n != size(B,1) throw(LapackDimMisMatch("gttrs!")) end
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(gttrs))), Void,
+ ccall(dlsym(Base.liblapack, $(string(gttrs))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{$elty}, Ptr{$elty}, Ptr{$elty},
Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
@@ -714,7 +714,7 @@ for (orglq, orgqr, ormlq, ormqr, elty) in
lwork = int32(-1)
info = Array(Int32, 1)
for i in 1:2
- ccall(dlsym(Base._jl_liblapack, $(string(orglq))), Void,
+ ccall(dlsym(Base.liblapack, $(string(orglq))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty},
Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&size(A,1), &size(A,2), &k, A, &stride(A,2), tau, work, &lwork, info)
@@ -737,7 +737,7 @@ for (orglq, orgqr, ormlq, ormqr, elty) in
lwork = int32(-1)
info = Array(Int32, 1)
for i in 1:2
- ccall(dlsym(Base._jl_liblapack, $(string(orgqr))), Void,
+ ccall(dlsym(Base.liblapack, $(string(orgqr))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty},
Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&size(A,1), &size(A,2), &k, A, &stride(A,2), tau, work, &lwork, info)
@@ -765,7 +765,7 @@ for (orglq, orgqr, ormlq, ormqr, elty) in
lwork = int32(-1)
info = Array(Int32, 1)
for i in 1:2
- ccall(dlsym(Base._jl_liblapack, $(string(ormlq))), Void,
+ ccall(dlsym(Base.liblapack, $(string(ormlq))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
@@ -795,7 +795,7 @@ for (orglq, orgqr, ormlq, ormqr, elty) in
lwork = int32(-1)
info = Array(Int32, 1)
for i in 1:2
- ccall(dlsym(Base._jl_liblapack, $(string(ormqr))), Void,
+ ccall(dlsym(Base.liblapack, $(string(ormqr))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
@@ -834,7 +834,7 @@ for (posv, potrf, potri, potrs, elty) in
n = size(A,1)
if size(B,1) != n throw(LapackDimMisMatch("posv!")) end
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(posv))), Void,
+ ccall(dlsym(Base.liblapack, $(string(posv))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&uplo, &n, &size(B,2), A, &stride(A,2), B, &stride(B,2), info)
@@ -853,7 +853,7 @@ for (posv, potrf, potri, potrs, elty) in
chkstride1(A)
chksquare(A)
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(potrf))), Void,
+ ccall(dlsym(Base.liblapack, $(string(potrf))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&uplo, &size(A,1), A, &stride(A,2), info)
if info[1] < 0 throw(LapackException(info[1])) end
@@ -870,7 +870,7 @@ for (posv, potrf, potri, potrs, elty) in
function potri!(uplo::LapackChar, A::StridedMatrix{$elty})
chkstride1(A)
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(potri))), Void,
+ ccall(dlsym(Base.liblapack, $(string(potri))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&uplo, &size(A,1), A, &stride(A,2), info)
if info[1] < 0 throw(LapackException(info[1])) end
@@ -888,7 +888,7 @@ for (posv, potrf, potri, potrs, elty) in
n = size(A,2)
if size(B,1) != n error("potrs!: dimension mismatch") end
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(potrs))), Void,
+ ccall(dlsym(Base.liblapack, $(string(potrs))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&uplo, &n, &size(B,2), A, &stride(A,2), B, &stride(B,2), info)
@@ -917,7 +917,7 @@ for (ptsv, pttrf, pttrs, elty) in
n = length(D)
if length(E) != n - 1 || n != size(B,1) throw(LapackDimMismatch("ptsv!")) end
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(ptsv))), Void,
+ ccall(dlsym(Base.liblapack, $(string(ptsv))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty},
Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&n, &size(B,2), D, E, B, &stride(B,2), info)
@@ -933,7 +933,7 @@ for (ptsv, pttrf, pttrs, elty) in
n = length(D)
if length(E) != (n-1) throw(LapackDimMisMatch("pttrf!")) end
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(pttrf))), Void,
+ ccall(dlsym(Base.liblapack, $(string(pttrf))), Void,
(Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{Int32}),
&n, D, E, info)
if info[1] != 0 throw(LapackException(info[1])) end
@@ -949,7 +949,7 @@ for (ptsv, pttrf, pttrs, elty) in
n = length(D)
if length(E) != (n-1) || size(B,1) != n throw(LapackDimMisMatch("pttrs!")) end
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(pttrs))), Void,
+ ccall(dlsym(Base.liblapack, $(string(pttrs))), Void,
(Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty},
Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&n, &size(B,2), D, E, B, &stride(B,2), info)
@@ -978,7 +978,7 @@ for (trtri, trtrs, elty) in
if m != n error("trtri!: dimension mismatch") end
lda = stride(A, 2)
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $trtri), Void,
+ ccall(dlsym(Base.liblapack, $trtri), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{Int32}),
&uplo, &diag, &n, A, &lda, info)
@@ -998,7 +998,7 @@ for (trtri, trtrs, elty) in
n = size(A,2)
if size(B,1) != n throw(LapackDimMisMatch("trtrs!")) end
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(trtrs))), Void,
+ ccall(dlsym(Base.liblapack, $(string(trtrs))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&uplo, &trans, &diag, &n, &size(B,2), A, &stride(A,2),
@@ -1023,7 +1023,7 @@ for (stev, elty) in
Zmat = Array($elty, (n, job != 'N' ? n : 0))
work = Array($elty, max(1, 2n-2))
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(stev))), Void,
+ ccall(dlsym(Base.liblapack, $(string(stev))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{$elty}, Ptr{$elty}, Ptr{$elty},
Ptr{Int32}, Ptr{$elty}, Ptr{Int32}),
&job, &n, dv, ev, Zmat, &n, work, info)
@@ -1054,7 +1054,7 @@ for (syconv, syev, sysv, sytrf, sytri, sytrs, elty) in
n = size(A,1)
work = Array($elty, n)
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(syconv))), Void,
+ ccall(dlsym(Base.liblapack, $(string(syconv))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{Int32}, Ptr{$elty}, Ptr{Int32}),
&uplo, &'C', &n, A, &stride(A,2), ipiv, work, info)
@@ -1082,12 +1082,12 @@ for (syconv, syev, sysv, sytrf, sytri, sytrs, elty) in
info = Array(Int32, 1)
for i in 1:2
if cmplx
- ccall(dlsym(Base._jl_liblapack, $(string(syev))), Void,
+ ccall(dlsym(Base.liblapack, $(string(syev))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{Rtyp}, Ptr{$elty}, Ptr{Int32}, Ptr{Rtyp}, Ptr{Int32}),
&jobz, &uplo, &n, A, &stride(A,2), W, work, &lwork, rwork, info)
else
- ccall(dlsym(Base._jl_liblapack, $(string(syev))), Void,
+ ccall(dlsym(Base.liblapack, $(string(syev))), Void,
(Ptr{Uint8}, Ptr{Uint8}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{Rtyp}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&jobz, &uplo, &n, A, &stride(A,2), W, work, &lwork, info)
@@ -1118,7 +1118,7 @@ for (syconv, syev, sysv, sytrf, sytri, sytrs, elty) in
lwork = int32(-1)
info = Array(Int32, 1)
for i in 1:2
- ccall(dlsym(Base._jl_liblapack, $(string(sysv))), Void,
+ ccall(dlsym(Base.liblapack, $(string(sysv))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32},
Ptr{$elty}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&uplo, &n, &size(B,2), A, &stride(A,2), ipiv, B, &stride(B,2),
@@ -1147,7 +1147,7 @@ for (syconv, syev, sysv, sytrf, sytri, sytrs, elty) in
lwork = int32(-1)
info = Array(Int32, 1)
for i in 1:2
- ccall(dlsym(Base._jl_liblapack, $(string(sytrf))), Void,
+ ccall(dlsym(Base.liblapack, $(string(sytrf))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&uplo, &n, A, &stride(A,2), ipiv, work, &lwork, info)
@@ -1174,7 +1174,7 @@ for (syconv, syev, sysv, sytrf, sytri, sytrs, elty) in
lwork = int32(-1)
info = Array(Int32, 1)
for i in 1:2
- ccall(dlsym(Base._jl_liblapack, $(string(sytri))), Void,
+ ccall(dlsym(Base.liblapack, $(string(sytri))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&uplo, &n, A, &stride(A,2), ipiv, work, &lwork, info)
@@ -1201,7 +1201,7 @@ for (syconv, syev, sysv, sytrf, sytri, sytrs, elty) in
n = size(A,1)
if n != size(B,1) throw(LapackDimMismatch("sytrs!")) end
info = Array(Int32, 1)
- ccall(dlsym(Base._jl_liblapack, $(string(sytrs))), Void,
+ ccall(dlsym(Base.liblapack, $(string(sytrs))), Void,
(Ptr{Uint8}, Ptr{Int32}, Ptr{Int32}, Ptr{$elty}, Ptr{Int32},
Ptr{Int32}, Ptr{$elty}, Ptr{Int32}, Ptr{Int32}),
&uplo, &n, &size(B,2), A, &stride(A,2), ipiv, B, &stride(B,2), info)
View
26 base/linalg.jl
@@ -23,7 +23,7 @@ function axpy{TA<:Number, T<:LapackScalar}(alpha::TA, x::Array{T}, y::Array{T})
if length(x) != length(y)
error("Inputs should be of the same length")
end
- BLAS.axpy!(length(x), convert(T, alpha), x, 1, y, 1)
+ Blas.axpy!(length(x), convert(T, alpha), x, 1, y, 1)
return y
end
@@ -34,13 +34,13 @@ function axpy{TA<:Number, T<:LapackScalar, TI<:Integer}(alpha::TA, x::Array{T},
if min(rx) < 1 || max(rx) > length(x) || min(ry) < 1 || max(ry) > length(y)
throw(BoundsError())
end
- BLAS.axpy!(length(rx), convert(T, alpha), pointer(x)+(first(rx)-1)*sizeof(T), step(rx), pointer(y)+(first(ry)-1)*sizeof(T), step(ry))
+ Blas.axpy!(length(rx), convert(T, alpha), pointer(x)+(first(rx)-1)*sizeof(T), step(rx), pointer(y)+(first(ry)-1)*sizeof(T), step(ry))
return y
end
function copy_to{T<:LapackScalar}(dest::Ptr{T}, src::Ptr{T}, n::Integer)
if n < 200
- BLAS.copy!(n, src, 1, dest, 1)
+ Blas.copy!(n, src, 1, dest, 1)
else
ccall(:memcpy, Ptr{Void}, (Ptr{Void}, Ptr{Void}, Uint), dest, src, n*sizeof(T))
end
@@ -53,7 +53,7 @@ function copy_to{T<:LapackScalar}(dest::Array{T}, src::Array{T})
throw(BoundsError())
end
if n < 200
- BLAS.copy!(n, src, 1, dest, 1)
+ Blas.copy!(n, src, 1, dest, 1)
else
ccall(:memcpy, Ptr{Void}, (Ptr{Void}, Ptr{Void}, Uint), dest, src, n*sizeof(T))
end
@@ -67,31 +67,31 @@ function copy_to{T<:LapackScalar,TI<:Integer}(dest::Array{T}, rdest::Union(Range
if length(rdest) != length(rsrc)
error("Ranges must be of the same length")
end
- BLAS.copy!(length(rsrc), pointer(src)+(first(rsrc)-1)*sizeof(T), step(rsrc),
+ Blas.copy!(length(rsrc), pointer(src)+(first(rsrc)-1)*sizeof(T), step(rsrc),
pointer(dest)+(first(rdest)-1)*sizeof(T), step(rdest))
return dest
end
function dot{T<:Union(Vector{Float64}, Vector{Float32})}(x::T, y::T)
length(x) != length(y) ? error("Inputs should be of same length") : true
- BLAS.dot(length(x), x, 1, y, 1)
+ Blas.dot(length(x), x, 1, y, 1)
end
function dot{T<:Union(Float64, Float32), TI<:Integer}(x::Vector{T}, rx::Union(Range1{TI},Range{TI}), y::Vector{T}, ry::Union(Range1{TI},Range{TI}))
length(rx) != length(ry) ? error("Ranges should be of same length") : true
if min(rx) < 1 || max(rx) > length(x) || min(ry) < 1 || max(ry) > length(y)
throw(BoundsError())
end
- BLAS.dot(length(rx), pointer(x)+(first(rx)-1)*sizeof(T), step(rx), pointer(y)+(first(ry)-1)*sizeof(T), step(ry))
+ Blas.dot(length(rx), pointer(x)+(first(rx)-1)*sizeof(T), step(rx), pointer(y)+(first(ry)-1)*sizeof(T), step(ry))
end
-norm{T<:LapackScalar}(x::Vector{T}) = BLAS.nrm2(length(x), x, 1)
+norm{T<:LapackScalar}(x::Vector{T}) = Blas.nrm2(length(x), x, 1)
function norm{T<:LapackScalar, TI<:Integer}(x::Vector{T}, rx::Union(Range1{TI},Range{TI}))
if min(rx) < 1 || max(rx) > length(x)
throw(BoundsError())
end
- BLAS.nrm2(length(rx), pointer(x)+(first(rx)-1)*sizeof(T), step(rx))
+ Blas.nrm2(length(rx), pointer(x)+(first(rx)-1)*sizeof(T), step(rx))
end
@@ -189,7 +189,7 @@ function _jl_syrk{T<:LapackScalar}(tA, A::StridedMatrix{T})
return _jl_generic_matmatmul(tA, tAt, A, A)
end
- _jl_copy_upper_to_lower(BLAS.syrk('U', tA, one(T), A))
+ _jl_copy_upper_to_lower(Blas.syrk('U', tA, one(T), A))
end
function _jl_copy_upper_to_lower_conj(A::StridedMatrix)
@@ -221,7 +221,7 @@ function _jl_herk{T<:LapackScalar}(tA, A::StridedMatrix{T})
# Result array does not need to be initialized as long as beta==0
# C = Array(T, mA, mA)
- _jl_copy_upper_to_lower_conj(BLAS.herk('U', tA, one(T), A))
+ _jl_copy_upper_to_lower_conj(Blas.herk('U', tA, one(T), A))
end
@@ -251,7 +251,7 @@ function _jl_gemm{T<:LapackScalar}(C::StridedMatrix{T}, tA, tB,
return _jl_generic_matmatmul(C, tA, tB, A, B)
end
- BLAS.gemm!(tA, tB, one(T), A, B, zero(T), C)
+ Blas.gemm!(tA, tB, one(T), A, B, zero(T), C)
end
function (*){T<:LapackScalar}(A::StridedMatrix{T},
@@ -290,7 +290,7 @@ function _jl_gemv{T<:LapackScalar}(y::StridedVector{T},
if nA != length(x); error("*: argument shapes do not match"); end
if mA != length(y); error("*: output size is incorrect"); end
- BLAS.gemv!(tA, one(T), A, x, zero(T), y)
+ Blas.gemv!(tA, one(T), A, x, zero(T), y)
end
triu(M::AbstractMatrix) = triu(M,0)
View
2 base/linalg_dense.jl
@@ -17,7 +17,7 @@ end
cross(a::Vector, b::Vector) =
[a[2]*b[3]-a[3]*b[2], a[3]*b[1]-a[1]*b[3], a[1]*b[2]-a[2]*b[1]]
-# linalg_blas.jl defines matmul for floats; other integer and mixed precision
+# blas.jl defines matmul for floats; other integer and mixed precision
# cases are handled here
lapack_size(t::Char, M::StridedVecOrMat) = (t == 'N') ? (size(M, 1), size(M, 2)) : (size(M,2), size(M, 1))
View
4 base/start_image.jl
@@ -14,8 +14,8 @@ _jl_librandom = dlopen("librandom");
@windows_only _jl_advapi32 = dlopen("Advapi32")
# Optional libraries
-const _jl_libblas = dlopen(_jl_libblas_name)
-const _jl_liblapack = (_jl_libblas_name == _jl_liblapack_name) ? _jl_libblas : dlopen(_jl_liblapack_name)
+const libblas = dlopen(libblas_name)
+const liblapack = (libblas_name == liblapack_name) ? libblas : dlopen(liblapack_name)
const libfftw = dlopen("libfftw3_threads")
const libfftwf = dlopen("libfftw3f_threads")
View
2 base/sysimg.jl
@@ -128,7 +128,7 @@ include("deepcopy.jl")
include("build_h.jl")
# linear algebra
-include("linalg_blas.jl")
+include("blas.jl")
include("linalg.jl")
include("linalg_dense.jl")
include("lapack.jl")

1 comment on commit 35ca186

@dmbates
The Julia Language member

Thanks for doing this, Viral.

Please sign in to comment.
Something went wrong with that request. Please try again.