Merge pull request #231 from haampie/fix-upgrade-issues

haampie · web-flow · commit bb9553cc6964 · 2018-12-02T21:09:36.000+01:00
Upgrades / maintenance
diff --git a/.codecov.yml b/.codecov.yml
@@ -0,0 +1 @@
+comment: off
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: julia
 os:
   - linux
 julia:
-  - 0.7
   - 1.0
   - nightly
 matrix:
@@ -11,5 +10,15 @@ matrix:
 notifications:
   email: false
 after_success:
-  - julia -e 'using Pkg; Pkg.add("Coverage"); cd(Pkg.dir("IterativeSolvers")); using Coverage; Coveralls.submit(process_folder());'
-  - julia -e 'using Pkg; Pkg.add("Documenter"); cd(Pkg.dir("IterativeSolvers")); include(joinpath("docs", "make.jl"))'
+  - julia --project=coverage/ -e 'using Pkg; Pkg.instantiate()'
+  - julia --project=coverage/ coverage/coverage.jl
+
+jobs:
+  include:
+    - stage: "Documentation"
+      julia: 1.0
+      os: linux
+      script:
+        - julia --project=docs/ -e 'using Pkg; Pkg.instantiate(); Pkg.develop(PackageSpec(path=pwd()))'
+        - julia --project=docs/ docs/make.jl
+      after_success: skip
diff --git a/Manifest.toml b/Manifest.toml
@@ -33,9 +33,9 @@ uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [[RecipesBase]]
 deps = ["Random", "Test"]
-git-tree-sha1 = "b18c3d875ad6805e3db59c4e81f206f04df71d66"
+git-tree-sha1 = "0b3cb370ee4dc00f47f1193101600949f3dcf884"
 uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
-version = "0.5.0"
+version = "0.6.0"
 
 [[Serialization]]
 uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
diff --git a/Project.toml b/Project.toml
@@ -1,5 +1,6 @@
 name = "IterativeSolvers"
 uuid = "42fd0dbc-a981-5370-80f2-aaf504508153"
+version = "0.8.0"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -8,11 +9,6 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
-[compat]
-LinearMaps = "2.0.0"
-RecipesBase = "< 0.6"
-julia = ">= 0.7"
-
 [extras]
 LinearMaps = "7a12625a-238d-50fd-b39a-03d52299707e"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
diff --git a/README.md b/README.md
@@ -13,13 +13,8 @@
 
 ## Installing
 
-To install the package, use the following command inside Julia's REPL:
+To install the package, open the package manager in the REPL via ] and run
+
 ```julia
-Pkg.add("IterativeSolvers")
+pkg> add IterativeSolvers
 ```
-
-## Status
-
-- [Issue #1](https://github.com/JuliaMath/IterativeSolvers.jl/issues/1) documents the implementation roadmap for iterative solvers.
-
-- The interfaces between the various algorithms are still in flux, but aim to be consistent.
diff --git a/REQUIRE b/REQUIRE
@@ -1,3 +1,3 @@
-julia 0.7-beta
+julia 1.0
 
-RecipesBase 0.3.1 0.6.0-
+RecipesBase 0.6.0
diff --git a/coverage/Project.toml b/coverage/Project.toml
@@ -0,0 +1,2 @@
+[deps]
+Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037"
diff --git a/coverage/coverage.jl b/coverage/coverage.jl
@@ -0,0 +1,8 @@
+get(ENV, "TRAVIS_OS_NAME", "")       == "linux" || exit()
+get(ENV, "TRAVIS_JULIA_VERSION", "") == "1.0"   || exit()
+
+using Coverage
+
+cd(joinpath(dirname(@__FILE__), "..")) do
+    Codecov.submit(Codecov.process_folder())
+end
diff --git a/docs/Project.toml b/docs/Project.toml
@@ -0,0 +1,5 @@
+[deps]
+Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+
+[compat]
+Documenter = "~0.20"
diff --git a/docs/make.jl b/docs/make.jl
@@ -34,11 +34,4 @@ makedocs(
 	]
 )
 
-deploydocs(
-	repo = "github.com/JuliaMath/IterativeSolvers.jl.git",
-	target = "build",
-	osname = "linux",
-	julia  = "0.7",
-	deps = nothing,
-	make = nothing,
-)
+deploydocs(repo = "github.com/JuliaMath/IterativeSolvers.jl.git")
diff --git a/docs/src/linear_systems/cg.md b/docs/src/linear_systems/cg.md
@@ -9,6 +9,24 @@ cg
 cg!
 ```
 
+## On the GPU
+
+The method should work fine on the GPU. As a minimal working example, consider:
+
+```julia
+using LinearAlgebra, CuArrays, IterativeSolvers
+
+n = 100
+A = cu(rand(n, n))
+A = A + A' + 2*n*I
+b = cu(rand(n))
+x = cg(A, b)
+```
+
+!!! note
+    Make sure that all state vectors are stored on the GPU. CG will *not* copy the right-hand side to the GPU if the provided initial guess `x` is stored on the GPU.
+
+
 ## Implementation details
 
 The current implementation follows a rather standard approach. Note that preconditioned CG (or PCG) is slightly different from ordinary CG, because the former must compute the residual explicitly, while it is available as byproduct in the latter. Our implementation of CG ensures the minimal number of vector operations.
diff --git a/src/cg.jl b/src/cg.jl
@@ -116,7 +116,7 @@ end
 function cg_iterator!(x, A, b, Pl = Identity();
     tol = sqrt(eps(real(eltype(b)))),
     maxiter::Int = size(A, 2),
-    statevars::CGStateVariables = CGStateVariables{eltype(x),typeof(x)}(zero(x), similar(x), similar(x)),
+    statevars::CGStateVariables = CGStateVariables(zero(x), similar(x), similar(x)),
     initially_zero::Bool = false
 )
     u = statevars.u
@@ -202,7 +202,7 @@ function cg!(x, A, b;
     tol = sqrt(eps(real(eltype(b)))),
     maxiter::Int = size(A, 2),
     log::Bool = false,
-    statevars::CGStateVariables = CGStateVariables{eltype(x), typeof(x)}(zero(x), similar(x), similar(x)),
+    statevars::CGStateVariables = CGStateVariables(zero(x), similar(x), similar(x)),
     verbose::Bool = false,
     Pl = Identity(),
     kwargs...
diff --git a/src/common.jl b/src/common.jl
@@ -12,9 +12,15 @@ Adivtype(A, b) = typeof(one(eltype(b))/one(eltype(A)))
 
 """
     zerox(A, b)
-Build a zeros vector `Vector{T}`, where `T` is `Adivtype(A,b)`.
+
+Build a zeros vector similar to `b` of eltype `Adivtype(A,b)`.
 """
-zerox(A, b) = zeros(Adivtype(A, b), size(A, 2))
+function zerox(A, b)
+    T = Adivtype(A, b)
+    x = similar(b, T, size(A, 2))
+    fill!(x, zero(T))
+    return x
+end
 
 """
 No-op preconditioner
diff --git a/test/cg.jl b/test/cg.jl
@@ -83,4 +83,13 @@ end
     end
 end
 
+@testset "CG with a view" begin
+    A = rand(10, 10)
+    A = A + A' + 100I
+    x = view(rand(10, 2), :, 1)
+    b = rand(10)
+    x, hist = cg!(x, A, b, log = true)
+    @test hist.isconverged
+end
+
 end
diff --git a/test/history.jl b/test/history.jl
@@ -36,8 +36,8 @@ using Test
 
         for data in plots
             @test length(data) == 1
-            @test data[1].d[:label] == "resnorm"
-            @test data[1].d[:seriestype] == :line
+            @test data[1].plotattributes[:label] == "resnorm"
+            @test data[1].plotattributes[:seriestype] == :line
         end
     end
 
@@ -54,7 +54,7 @@ using Test
 
         for data in plots
             @test length(data) == 2
-            @test data[2].d[:linecolor] == :white
+            @test data[2].plotattributes[:linecolor] == :white
         end
     end
 
@@ -71,7 +71,7 @@ using Test
 
         for data in plots
             @test length(data) == 2
-            @test data[2].d[:linecolor] == :red
+            @test data[2].plotattributes[:linecolor] == :red
         end
     end
 end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[deps]`
	`2`	`+Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037"`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,4 @@ makedocs(`
`34`	`34`	`]`
`35`	`35`	`)`
`36`	`36`
`37`		`-deploydocs(`
`38`		`- repo = "github.com/JuliaMath/IterativeSolvers.jl.git",`
`39`		`- target = "build",`
`40`		`- osname = "linux",`
`41`		`- julia = "0.7",`
`42`		`- deps = nothing,`
`43`		`- make = nothing,`
`44`		`-)`
	`37`	`+deploydocs(repo = "github.com/JuliaMath/IterativeSolvers.jl.git")`