cleanup, get rid of blas_int function

pwl · Jun 2, 2015 · 0650f98 · 0650f98
1 parent c1e1993
commit 0650f98
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 120 deletions.
diff --git a/base/linalg.jl b/base/linalg.jl
@@ -157,10 +157,8 @@ typealias BlasComplex Union(Complex128,Complex64)
 
 if USE_BLAS64
  typealias BlasInt Int64
- blas_int(x) = Int64(x)
 else
  typealias BlasInt Int32
- blas_int(x) = Int32(x)
 end
 
 #Check that stride of matrix/vector is 1

diff --git a/base/linalg/arnoldi.jl b/base/linalg/arnoldi.jl
@@ -33,7 +33,7 @@ function eigs(A, B;
  warn("Adjusting ncv from $ncv to $ncvmin")
  ncv = ncvmin
  end
- ncv = blas_int(min(ncv, n))
+ ncv = BlasInt(min(ncv, n))
  if isgeneral && !isposdef(B)
  throw(PosDefException(0))
  end

diff --git a/base/linalg/arpack.jl b/base/linalg/arpack.jl
@@ -2,7 +2,7 @@
 
 module ARPACK
 
-import ..LinAlg: BlasInt, blas_int, ARPACKException
+import ..LinAlg: BlasInt, ARPACKException
 
 ## aupd and eupd wrappers
 
@@ -32,9 +32,9 @@ function aupd_wrapper(T, matvecA::Function, matvecB::Function, solveSI::Function
  ipntr = zeros(BlasInt, (sym && !cmplx) ? 11 : 14)
  ido = zeros(BlasInt, 1)
 
- iparam[1] = blas_int(1) # ishifts
- iparam[3] = blas_int(maxiter) # maxiter
- iparam[7] = blas_int(mode) # mode
+ iparam[1] = BlasInt(1) # ishifts
+ iparam[3] = BlasInt(maxiter) # maxiter
+ iparam[7] = BlasInt(mode) # mode
 
  zernm1 = 0:(n-1)
 

diff --git a/base/linalg/blas.jl b/base/linalg/blas.jl
@@ -58,7 +58,7 @@ export
 
 const libblas = Base.libblas_name
 
-import ..LinAlg: BlasReal, BlasComplex, BlasFloat, BlasInt, blas_int, DimensionMismatch, chksquare, axpy!
+import ..LinAlg: BlasReal, BlasComplex, BlasFloat, BlasInt, DimensionMismatch, chksquare, axpy!
 
 # Level 1
 ## copy