Skip to content

Commit 81b7961

Browse files
lindahuatkelman
authored andcommitted
rename module Base.SparseMatrix to Base.Sparse, and export SparseVector
1 parent d0c2443 commit 81b7961

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

base/exports.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export
1818
BLAS,
1919
LAPACK,
2020
Serializer,
21-
SparseMatrix,
21+
Sparse,
2222
Docs,
2323
Markdown,
2424

@@ -103,6 +103,7 @@ export
103103
SharedArray,
104104
SharedMatrix,
105105
SharedVector,
106+
SparseVector,
106107
SparseMatrixCSC,
107108
StatStruct,
108109
StepRange,

base/sparse.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is a part of Julia. License is MIT: http://julialang.org/license
22

3-
module SparseMatrix
3+
module Sparse
44

55
using Base: Func, AddFun, SubFun, OrFun, ConjFun, IdFun
66
using Base.Sort: Forward

base/sparse/cholmod.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import Base.LinAlg: (\), A_mul_Bc, A_mul_Bt, Ac_ldiv_B, Ac_mul_B, At_ldiv_B, At_
99
cholfact, det, diag, ishermitian, isposdef,
1010
issym, ldltfact, logdet
1111

12-
import Base.SparseMatrix: sparse, nnz
12+
import Base.Sparse: sparse, nnz
1313

1414
export
1515
Dense,
1616
Factor,
1717
Sparse
1818

19-
using Base.SparseMatrix: AbstractSparseMatrix, SparseMatrixCSC, increment, indtype
19+
using Base.Sparse: AbstractSparseMatrix, SparseMatrixCSC, increment, indtype
2020

2121
#########
2222
# Setup #

base/sparse/spqr.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ const RTX_EQUALS_B = Int32(2) # solve R'*X=B or X = R'\B
3636
const RTX_EQUALS_ETB = Int32(3) # solve R'*X=E'*B or X = R'\(E'*B)
3737

3838

39-
using Base.SparseMatrix: SparseMatrixCSC
40-
using Base.SparseMatrix.CHOLMOD: C_Dense, C_Sparse, Dense, ITypes, Sparse, VTypes, common
39+
using Base.Sparse: SparseMatrixCSC
40+
using Base.Sparse.CHOLMOD: C_Dense, C_Sparse, Dense, ITypes, Sparse, VTypes, common
4141

4242
import Base: size
4343
import Base.LinAlg: qrfact
44-
import Base.SparseMatrix.CHOLMOD: convert, free!
44+
import Base.Sparse.CHOLMOD: convert, free!
4545

4646

4747

@@ -143,4 +143,4 @@ function (\){T}(F::Factorization{T}, B::StridedVecOrMat{T})
143143
convert(typeof(B), solve(RETX_EQUALS_B, F, QtB))
144144
end
145145

146-
end # module
146+
end # module

base/sparse/umfpack.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export UmfpackLU
77
import Base: (\), Ac_ldiv_B, At_ldiv_B, findnz, getindex, show, size
88
import Base.LinAlg: A_ldiv_B!, Ac_ldiv_B!, At_ldiv_B!, Factorization, det, lufact
99

10-
importall Base.SparseMatrix
11-
import Base.SparseMatrix: increment, increment!, decrement, decrement!, nnz
10+
importall Base.Sparse
11+
import Base.Sparse: increment, increment!, decrement, decrement!, nnz
1212

1313
include("umfpack_h.jl")
1414
type MatrixIllConditionedException <: Exception

base/sysimg.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ include("statistics.jl")
267267

268268
# sparse matrices and sparse linear algebra
269269
include("sparse.jl")
270-
importall .SparseMatrix
270+
importall .Sparse
271271

272272
# signal processing
273273
if USE_GPL_LIBS

0 commit comments

Comments
 (0)