Skip to content

Commit 968d3a2

Browse files
haampieandreasnoack
authored andcommitted
Drop 0.5 support (#152)
* Remove 0.5 from the Travis tests * Remove unsupported version checks * Update the requirements
1 parent 19f10ba commit 968d3a2

File tree

4 files changed

+3
-14
lines changed

4 files changed

+3
-14
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ language: julia
22
os:
33
- linux
44
julia:
5-
- 0.5
65
- 0.6
76
- nightly
87
matrix:

REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
julia 0.5
1+
julia 0.6
22

33
UnicodePlots
44
RecipesBase

benchmark/setup-florida.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
#Benchmark iterative methods against matrices from the University of Florida
44
#sparse collection
55

6-
VERSION v"0.4" || error("Julia 0.4 required")
7-
86
#Root URL to the matrix collection
97
UFL_URL_ROOT = "http://www.cise.ufl.edu/research/sparse/matrices"
108
#Plain text file containing list of matrices

src/svdl.jl

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -480,11 +480,7 @@ function harmonicrestart!{T,Tr}(A, L::PartialFactorization{T,Tr},
480480

481481

482482
#Construct broken arrow matrix
483-
if VERSION < v"0.5.0-"
484-
BA = [diagm(F0[:S]) ρ']
485-
else #slicing behavior changed in 0.5
486-
BA = [diagm(F0[:S]) ρ]
487-
end
483+
BA = [diagm(F0[:S]) ρ]
488484
F2 = svdfact!(BA, thin=false)
489485

490486
#Take k largest triplets
@@ -520,11 +516,7 @@ function harmonicrestart!{T,Tr}(A, L::PartialFactorization{T,Tr},
520516
Q = L.Q*Q
521517
P = L.P*view(U,:,1:k)
522518

523-
if VERSION < v"0.5.0-"
524-
R = view(R,1:k+1,1:k) + view(R,:,k+1)*Mend
525-
else
526-
R = view(R,1:k+1,1:k) + view(R,:,k+1)*Mend'
527-
end
519+
R = view(R,1:k+1,1:k) + view(R,:,k+1)*Mend'
528520

529521
f = A*view(Q,:,k+1)
530522
f -= P*(P'f)

0 commit comments

Comments
 (0)