Skip to content

Commit

Permalink
fix info
Browse files Browse the repository at this point in the history
  • Loading branch information
matbesancon committed Feb 18, 2021
1 parent ebc85d1 commit a9c2e69
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions benchmark/setup-florida.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@

#Benchmark iterative methods against matrices from the University of Florida
#sparse collection
using Pkg

#Root URL to the matrix collection
UFL_URL_ROOT = "http://www.cise.ufl.edu/research/sparse/matrices"
const UFL_URL_ROOT = "http://www.cise.ufl.edu/research/sparse/matrices"
#Plain text file containing list of matrices
MASTERLIST = "matrices.txt"
const MASTERLIST = "matrices.txt"
#Download UFL collection to this directory
BASEDIR = "florida"
const BASEDIR = "florida"

# 1. Read in master list of matrices from BASEDIR/MASTERLIST
# If absent, generate this file. Requires Gumbo.jl
Pkg.installed("Gumbo")==nothing || using Gumbo
Pkg.installed("Gumbo") === nothing || using Gumbo

isdir(BASEDIR) || mkdir(BASEDIR)
if !isfile(joinpath(BASEDIR, MASTERLIST))
Pkg.installed("Gumbo")===nothing && error("Parsing list from UFL website requires Gumbo.jl")
Expand Down Expand Up @@ -61,11 +63,9 @@ for (group, matrix) in matrices
isdir(groupdir) || mkdir(groupdir)

if !isfile(joinpath(groupdir, matrix*".mat"))
info("Downloading $group/$matrix.mat")
@info("Downloading $group/$matrix.mat")
download(joinpath(UFL_URL_ROOT, "..", "mat", group, matrix*".mat"),
joinpath(BASEDIR, group, matrix*".mat"))
end
end
info("Downloaded $(length(matrices)) matrices")


@info("Downloaded $(length(matrices)) matrices")
2 changes: 1 addition & 1 deletion src/svdl.jl
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ function svdl_method!(log::ConvergenceHistory, A, l::Int=min(6, size(A,1)); k::I
extend!(log, A, L, k)
if verbose
elapsedtime = round((time_ns()-T0)*1e-9, digits=3)
info("Iteration $iter: $elapsedtime seconds")
@info("Iteration $iter: $elapsedtime seconds")
end

conv = isconverged(L, F, l, tol, reltol, log, verbose)
Expand Down

0 comments on commit a9c2e69

Please sign in to comment.