Skip to content

Commit

Permalink
travis: update gonum and go versions
Browse files Browse the repository at this point in the history
  • Loading branch information
kortschak committed Aug 27, 2020
1 parent fd4cb4d commit fee23fd
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -9,8 +9,8 @@ language: go

# Versions of go that are explicitly supported by gonum plus go tip.
go:
- 1.15.x
- 1.14.x
- 1.13.x
- master

env:
Expand All @@ -21,9 +21,9 @@ matrix:
fast_finish: true
exclude:
- os: windows
go: 1.13.x
go: 1.14.x
- os: windows
go: 1.13.x
go: 1.14.x
- os: windows
go: master
allow_failures:
Expand Down
4 changes: 2 additions & 2 deletions go.mod
@@ -1,6 +1,6 @@
module gonum.org/v1/exp

go 1.13
go 1.14

require (
github.com/ajstarks/svgo v0.0.0-20181006003313-6ce6a3bcf6cd // indirect
Expand All @@ -10,7 +10,7 @@ require (
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56
golang.org/x/image v0.0.0-20190802002840-cff245a6509b // indirect
golang.org/x/tools v0.0.0-20190816200558-6889da9d5479 // indirect
gonum.org/v1/gonum v0.7.0
gonum.org/v1/gonum v0.8.1
gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e // indirect
gonum.org/v1/plot v0.0.0-20190615073203-9aa86143727f
)
2 changes: 2 additions & 0 deletions go.sum
Expand Up @@ -62,6 +62,8 @@ gonum.org/v1/gonum v0.0.0-20190817114100-b0ff1e7714e8 h1:leVCaxzg7mSVR4FZPXALS2Q
gonum.org/v1/gonum v0.0.0-20190817114100-b0ff1e7714e8/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU=
gonum.org/v1/gonum v0.7.0 h1:Hdks0L0hgznZLG9nzXb8vZ0rRvqNvAcgAp84y7Mwkgw=
gonum.org/v1/gonum v0.7.0/go.mod h1:L02bwd0sqlsvRv41G7wGWFCsVNZFv/k1xzGIxeANHGM=
gonum.org/v1/gonum v0.8.1 h1:wGtP3yGpc5mCLOLeTeBdjeui9oZSz5De0eOjMLC/QuQ=
gonum.org/v1/gonum v0.8.1/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e h1:jRyg0XfpwWlhEV8mDfdNGBeSJM2fuyh9Yjrnd8kF2Ts=
gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
Expand Down
6 changes: 3 additions & 3 deletions linsolve/bicg.go
Expand Up @@ -41,9 +41,9 @@ func (b *BiCG) Init(x, residual *mat.VecDense) {
panic("bicg: vector length mismatch")
}

b.x.CloneVec(x)
b.r.CloneVec(residual)
b.rt.CloneVec(&b.r)
b.x.CloneFromVec(x)
b.r.CloneFromVec(residual)
b.rt.CloneFromVec(&b.r)

b.p.Reset()
b.p.ReuseAsVec(dim)
Expand Down
6 changes: 3 additions & 3 deletions linsolve/bicgstab.go
Expand Up @@ -45,9 +45,9 @@ func (b *BiCGStab) Init(x, residual *mat.VecDense) {
panic("bicgstab: vector length mismatch")
}

b.x.CloneVec(x)
b.r.CloneVec(residual)
b.rt.CloneVec(&b.r)
b.x.CloneFromVec(x)
b.r.CloneFromVec(residual)
b.rt.CloneFromVec(&b.r)

b.p.Reset()
b.p.ReuseAsVec(dim)
Expand Down
4 changes: 2 additions & 2 deletions linsolve/cg.go
Expand Up @@ -41,8 +41,8 @@ func (cg *CG) Init(x, residual *mat.VecDense) {
panic("cg: vector length mismatch")
}

cg.x.CloneVec(x)
cg.r.CloneVec(residual)
cg.x.CloneFromVec(x)
cg.r.CloneFromVec(residual)

cg.p.Reset()
cg.p.ReuseAsVec(dim)
Expand Down
2 changes: 1 addition & 1 deletion linsolve/gmres.go
Expand Up @@ -93,7 +93,7 @@ func (g *GMRES) Init(x, residual *mat.VecDense) {
}
}

g.x.CloneVec(x)
g.x.CloneFromVec(x)
g.y.Reset()
g.y.ReuseAsVec(g.m + 1)
g.s.Reset()
Expand Down
4 changes: 2 additions & 2 deletions linsolve/iterative.go
Expand Up @@ -176,7 +176,7 @@ func Iterative(a MulVecToer, b *mat.VecDense, m Method, settings *Settings) (*Re
rInit := mat.NewVecDense(n, nil)
if s.InitX != nil {
// Initial x is provided.
ctx.X.CloneVec(s.InitX)
ctx.X.CloneFromVec(s.InitX)
computeResidual(rInit, a, b, ctx.X, &stats)
} else {
// Initial x is the zero vector.
Expand Down Expand Up @@ -255,7 +255,7 @@ func NoPreconditioner(dst *mat.VecDense, trans bool, rhs mat.Vector) error {
if dst.Len() != rhs.Len() {
panic("linsolve: mismatched vector length")
}
dst.CloneVec(rhs)
dst.CloneFromVec(rhs)
return nil
}

Expand Down

0 comments on commit fee23fd

Please sign in to comment.