Skip to content

Commit

Permalink
Merge pull request #16850 from JuliaLang/jb/mvfiles
Browse files Browse the repository at this point in the history
consolidate source files for submodules of Base
  • Loading branch information
JeffBezanson authored Jun 14, 2016
2 parents 3715e9e + a580fb3 commit 7f44ee7
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 76 deletions.
18 changes: 9 additions & 9 deletions base/Dates.jl → base/dates/Dates.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ module Dates

importall ..Base.Operators

include("dates/types.jl")
include("dates/periods.jl")
include("dates/accessors.jl")
include("dates/query.jl")
include("dates/arithmetic.jl")
include("dates/conversions.jl")
include("dates/ranges.jl")
include("dates/adjusters.jl")
include("dates/io.jl")
include("types.jl")
include("periods.jl")
include("accessors.jl")
include("query.jl")
include("arithmetic.jl")
include("conversions.jl")
include("ranges.jl")
include("adjusters.jl")
include("io.jl")

export Period, DatePeriod, TimePeriod,
Year, Month, Week, Day, Hour, Minute, Second, Millisecond,
Expand Down
File renamed without changes.
44 changes: 22 additions & 22 deletions base/libgit2.jl → base/libgit2/libgit2.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,28 @@ export with, GitRepo, GitConfig
const GITHUB_REGEX =
r"^(?:git@|git://|https://(?:[\w\.\+\-]+@)?)github.com[:/](([^/].+)/(.+?))(?:\.git)?$"i

include("libgit2/utils.jl")
include("libgit2/consts.jl")
include("libgit2/types.jl")
include("libgit2/error.jl")
include("libgit2/signature.jl")
include("libgit2/oid.jl")
include("libgit2/reference.jl")
include("libgit2/commit.jl")
include("libgit2/repository.jl")
include("libgit2/config.jl")
include("libgit2/walker.jl")
include("libgit2/remote.jl")
include("libgit2/strarray.jl")
include("libgit2/index.jl")
include("libgit2/merge.jl")
include("libgit2/tag.jl")
include("libgit2/blob.jl")
include("libgit2/diff.jl")
include("libgit2/rebase.jl")
include("libgit2/status.jl")
include("libgit2/tree.jl")
include("libgit2/callbacks.jl")
include("utils.jl")
include("consts.jl")
include("types.jl")
include("error.jl")
include("signature.jl")
include("oid.jl")
include("reference.jl")
include("commit.jl")
include("repository.jl")
include("config.jl")
include("walker.jl")
include("remote.jl")
include("strarray.jl")
include("index.jl")
include("merge.jl")
include("tag.jl")
include("blob.jl")
include("diff.jl")
include("rebase.jl")
include("status.jl")
include("tree.jl")
include("callbacks.jl")

using .Error

Expand Down
56 changes: 28 additions & 28 deletions base/linalg.jl → base/linalg/linalg.jl
Original file line number Diff line number Diff line change
Expand Up @@ -215,39 +215,39 @@ end
copy_oftype{T,N}(A::AbstractArray{T,N}, ::Type{T}) = copy(A)
copy_oftype{T,N,S}(A::AbstractArray{T,N}, ::Type{S}) = convert(AbstractArray{S,N}, A)

include("linalg/exceptions.jl")
include("linalg/generic.jl")
include("exceptions.jl")
include("generic.jl")

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

include("linalg/dense.jl")
include("linalg/tridiag.jl")
include("linalg/triangular.jl")
include("dense.jl")
include("tridiag.jl")
include("triangular.jl")

include("linalg/factorization.jl")
include("linalg/qr.jl")
include("linalg/hessenberg.jl")
include("linalg/lq.jl")
include("linalg/eigen.jl")
include("linalg/svd.jl")
include("linalg/schur.jl")
include("linalg/symmetric.jl")
include("linalg/cholesky.jl")
include("linalg/lu.jl")
include("linalg/bunchkaufman.jl")
include("linalg/diagonal.jl")
include("linalg/bidiag.jl")
include("linalg/uniformscaling.jl")
include("linalg/givens.jl")
include("linalg/special.jl")
include("linalg/bitarray.jl")
include("linalg/ldlt.jl")
include("factorization.jl")
include("qr.jl")
include("hessenberg.jl")
include("lq.jl")
include("eigen.jl")
include("svd.jl")
include("schur.jl")
include("symmetric.jl")
include("cholesky.jl")
include("lu.jl")
include("bunchkaufman.jl")
include("diagonal.jl")
include("bidiag.jl")
include("uniformscaling.jl")
include("givens.jl")
include("special.jl")
include("bitarray.jl")
include("ldlt.jl")

include("linalg/arpack.jl")
include("linalg/arnoldi.jl")
include("arpack.jl")
include("arnoldi.jl")

function __init__()
try
Expand Down
2 changes: 1 addition & 1 deletion base/pkg.jl → base/pkg/pkg.jl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function Base.showerror(io::IO, pkgerr::PkgError)
end

for file in split("dir types reqs cache read query resolve write entry git")
include("pkg/$file.jl")
include("$file.jl")
end
const cd = Dir.cd

Expand Down
16 changes: 8 additions & 8 deletions base/sparse.jl → base/sparse/sparse.jl
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ export AbstractSparseArray, AbstractSparseMatrix, AbstractSparseVector,
issparse, nonzeros, nzrange, rowvals, sparse, sparsevec, spdiagm, speye, spones,
sprand, sprandn, spzeros, symperm, nnz

include("sparse/abstractsparse.jl")
include("sparse/sparsematrix.jl")
include("sparse/sparsevector.jl")
include("sparse/csparse.jl")
include("abstractsparse.jl")
include("sparsematrix.jl")
include("sparsevector.jl")
include("csparse.jl")

include("sparse/linalg.jl")
include("linalg.jl")
if Base.USE_GPL_LIBS
include("sparse/umfpack.jl")
include("sparse/cholmod.jl")
include("sparse/spqr.jl")
include("umfpack.jl")
include("cholmod.jl")
include("spqr.jl")
end

end
File renamed without changes.
16 changes: 8 additions & 8 deletions base/sysimg.jl
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ include("iobuffer.jl")

# strings & printing
include("char.jl")
include("string.jl")
include("unicode.jl")
include("strings/strings.jl")
include("unicode/unicode.jl")
include("parse.jl")
include("shell.jl")
include("regex.jl")
Expand Down Expand Up @@ -160,7 +160,7 @@ importall .Filesystem
include("process.jl")
include("multimedia.jl")
importall .Multimedia
include("grisu.jl")
include("grisu/grisu.jl")
import .Grisu.print_shortest
include("methodshow.jl")

Expand Down Expand Up @@ -274,7 +274,7 @@ include("client.jl")
include("util.jl")

# dense linear algebra
include("linalg.jl")
include("linalg/linalg.jl")
importall .LinAlg
const = dot
const × = cross
Expand Down Expand Up @@ -302,10 +302,10 @@ include("fastmath.jl")
importall .FastMath

# libgit2 support
include("libgit2.jl")
include("libgit2/libgit2.jl")

# package manager
include("pkg.jl")
include("pkg/pkg.jl")
const Git = Pkg.Git

# Stack frames and traces
Expand All @@ -317,11 +317,11 @@ include("profile.jl")
importall .Profile

# dates
include("Dates.jl")
include("dates/Dates.jl")
import .Dates: Date, DateTime, now

# sparse matrices, vectors, and sparse linear algebra
include("sparse.jl")
include("sparse/sparse.jl")
importall .SparseArrays

# threads
Expand Down
File renamed without changes.

0 comments on commit 7f44ee7

Please sign in to comment.