Skip to content

Commit 9806a37

Browse files
authored
Merge pull request #305 from FourierFlows/ncc/ncc/drop-julia-1.5
Drop support for Julia v1.5
2 parents d4b2933 + 9f1b6f2 commit 9806a37

File tree

7 files changed

+27
-45
lines changed

7 files changed

+27
-45
lines changed

.buildkite/pipeline.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,13 @@ env:
33
SECRET_CODECOV_TOKEN: "dty9SvGuECi846Hf4XqD7M6nqh3G5uRWhNvJTGqRrYbGkV0PN6Ovorh9tdDrwm03VB2JNlIODSxo+QukbaO1ZWeX3pKq03eQbmBCeNpIfyZyTCTB5oGXYbDhCQlA6fjvGlrahqtos9s7BNo6rHVlp82Js60Tm5cmq5Vc8NHsD61EMcKMbl8l8oAo05tzWstC6MiloAItgPjmV9b4lR0qR/CFdUzzRelbq7FGsbus3k1qG4fkVD71vIwPoVhcubaNel1m2Pav5Z/tCdoqlpZZcLStIoJ+6tGCM2z9up6VC6dEvjxFRL4wlW0mfBW67foAxdqw24MIMlig4B1GAMsKxg==;U2FsdGVkX19vDkbG1AsXwiK4Lfblf3+qPNPAcrI+kEocuwv2lTsrOALqTT31uWxBSouatQsKuMlmL3++hD/ztQ=="
44

55
steps:
6-
- label: "🦔 Julia 1.5"
7-
plugins:
8-
- JuliaCI/julia#v1:
9-
version: 1.5
10-
- JuliaCI/julia-test#v1: ~
11-
- JuliaCI/julia-coverage#v1:
12-
codecov: true
13-
agents:
14-
queue: "juliagpu"
15-
cuda: "*"
16-
if: build.message !~ /\[skip tests\]/
17-
timeout_in_minutes: 60
18-
196
- label: "🦓 Julia 1.6"
207
plugins:
218
- JuliaCI/julia#v1:
229
version: 1.6
2310
- JuliaCI/julia-test#v1: ~
11+
- JuliaCI/julia-coverage#v1:
12+
codecov: true
2413
agents:
2514
queue: "juliagpu"
2615
cuda: "*"

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ authors = ["Gregory L. Wagner <wagner.greg@gmail.com>", "Navid C. Constantinou <
66
description = "Tools for building fast, hackable, pseudospectral partial differential equation solvers on periodic domains."
77
documentation = "https://fourierflows.github.io/FourierFlowsDocumentation/stable/"
88
repository = "https://github.com/FourierFlows/FourierFlows.jl"
9-
version = "0.7.2"
9+
version = "0.8.0"
1010

1111
[deps]
1212
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
@@ -26,7 +26,7 @@ FFTW = "^1"
2626
Interpolations = "^0.12, ^0.13"
2727
JLD2 = "^0.1, ^0.2, ^0.3, ^0.4"
2828
Reexport = "^0.2, ^1"
29-
julia = "^1.5"
29+
julia = "^1.6"
3030

3131
[extras]
3232
Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037"

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<img alt="latest docs" src="https://img.shields.io/badge/documentation-in%20development-orange">
1515
</a>
1616
<a href="https://codecov.io/gh/FourierFlows/FourierFlows.jl">
17-
<img src="https://codecov.io/gh/FourierFlows/FourierFlows.jl/branch/master/graph/badge.svg" title="codecov">
17+
<img src="https://codecov.io/gh/FourierFlows/FourierFlows.jl/branch/main/graph/badge.svg?token=BrgeSmKJHD"/>
1818
</a>
1919
<a href="https://github.com/SciML/ColPrac">
2020
<img alt="ColPrac: Contributor's Guide on Collaborative Practices for Community Packages" src="https://img.shields.io/badge/ColPrac-Contributor's%20Guide-blueviolet">
@@ -45,7 +45,9 @@ julia> Pkg.add("FourierFlows")
4545
julia> Pkg.instantiate()
4646
```
4747

48-
The most recent version of FourierFlows.jl requires Julia v1.5 or later.
48+
The most recent version of FourierFlows.jl requires Julia v1.6 or later.
49+
50+
The latest version that works with Julia v1.5 is FourierFlows.jl v0.7.2.
4951

5052
The latest version that is compatible with Julia v1.0.5 (the current long-term-release) is FourierFlows.jl v0.4.5.
5153

@@ -102,8 +104,7 @@ and [Navid C. Constantinou][] (@navidcy).
102104

103105
The code is citable via [zenodo](https://zenodo.org). Please cite as:
104106

105-
> Navid C. Constantinou & Gregory L. Wagner. (2021). FourierFlows/FourierFlows.jl: FourierFlows v0.7.2 (Version v0.7.2). Zenodo. [http://doi.org/10.5281/zenodo.1161724](http://doi.org/10.5281/zenodo.1161724)
106-
107+
> Navid C. Constantinou & Gregory L. Wagner. (2021). FourierFlows/FourierFlows.jl: FourierFlows v0.8.0 (Version v0.8.0). Zenodo. [http://doi.org/10.5281/zenodo.1161724](http://doi.org/10.5281/zenodo.1161724)
107108
108109

109110
## Contributing

appveyor.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
environment:
22
matrix:
3-
- julia_version: 1.5
43
- julia_version: 1.6
54
- julia_version: nightly
65

@@ -16,7 +15,7 @@ matrix:
1615

1716
branches:
1817
only:
19-
- master
18+
- main
2019

2120
notifications:
2221
- provider: Email
@@ -34,9 +33,3 @@ build_script:
3433
test_script:
3534
- echo "%JL_TEST_SCRIPT%"
3635
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
37-
38-
# # Uncomment to support code coverage upload. Should only be enabled for packages
39-
# # which would have coverage gaps without running on Windows
40-
# on_success:
41-
# - echo "%JL_CODECOV_SCRIPT%"
42-
# - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"

docs/make.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ makedocs(
8181
withenv("GITHUB_REPOSITORY" => "FourierFlows/FourierFlowsDocumentation") do
8282
deploydocs( repo = "github.com/FourierFlows/FourierFlowsDocumentation.git",
8383
versions = ["stable" => "v^", "v#.#.#", "dev" => "dev"],
84-
push_preview = true,
84+
push_preview = false,
8585
devbranch = "main"
8686
)
8787
end

docs/src/installation_instructions.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,28 @@ instantiate/build all the required dependencies
66

77
```julia
88
julia>]
9-
(v1.5) pkg> add FourierFlows
10-
(v1.5) pkg> instantiate
9+
(v1.6) pkg> add FourierFlows
10+
(v1.6) pkg> instantiate
1111
```
1212

1313
We recommend installing FourierFlows.jl with the built-in Julia package manager, because
1414
this installs a stable, tagged release. Later on, you can update FourierFlows.jl to the
1515
latest tagged release again via the package manager by typing
1616

1717
```julia
18-
(v1.5) pkg> update FourierFlows
18+
(v1.6) pkg> update FourierFlows
1919
```
2020

2121
Note that some releases might induce breaking changes to certain modules. If after anything
2222
happens or your code stops working, please open an [issue](https://github.com/FourierFlows/FourierFlows.jl/issues)
2323
or start a [discussion](https://github.com/FourierFlows/FourierFlows.jl/discussions). We're
2424
more than happy to help with getting your simulations up and running.
2525

26-
!!! warn "Use Julia 1.5 or newer"
27-
The latest FourierFlows.jl requires at least Julia v1.5 to run.
26+
!!! warn "Use Julia 1.6 or newer"
27+
The latest FourierFlows.jl requires at least Julia v1.6 to run.
2828
Installing FourierFlows with an older version of Julia will install an older version
2929
of FourierFlows.jl (the latest version compatible with your version of Julia).
30-
30+
31+
Last version that works with Julia v1.5 is FourierFlows.jl v0.7.2.
32+
3133
Last version compatible with Julia v1.0.5 (the current long-term-release): FourierFlows.jl v0.4.5

test/runtests.jl

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -352,24 +352,21 @@ for dev in devices
352352
prob1 = FourierFlows.Problem(prob.eqn, "RK4", prob.clock.dt, prob.grid, prob.vars, params1, dev)
353353
prob2 = FourierFlows.Problem(prob.eqn, "RK4", prob.clock.dt, prob.grid, prob.vars, params2, dev)
354354
prob = prob1 # prob2 is only useful for testing params show() method
355+
355356
get_sol(prob) = prob.sol
356357
diag = Diagnostic(get_sol, prob)
357358

358359
@test repr(prob1.params) == "Parameters\n ├───── parameter: κ1 -> Float64\n ├───── parameter: κ2 -> Float64\n └───── parameter: func -> Function\n"
359360
@test repr(prob2.params) == "Parameters\n ├───── parameter: κ1 -> Float64\n ├───── parameter: func -> Function\n └───── parameter: κ2 -> Float64\n"
360-
if VERSION < v"1.6"
361-
@test repr(prob.vars) == "Variables\n ├───── variable: c -> 128-element " * string(ArrayType(dev)) * "{Float64,1}\n ├───── variable: cx -> 128-element " * string(ArrayType(dev)) * "{Float64,1}\n ├───── variable: ch -> 65-element " * string(ArrayType(dev)) * "{Complex{Float64},1}\n └───── variable: cxh -> 65-element " * string(ArrayType(dev)) * "{Complex{Float64},1}\n"
362-
@test repr(prob.eqn) == "Equation\n ├──────── linear coefficients: L\n │ ├───type: Int64\n │ └───size: (65,)\n ├───────────── nonlinear term: calcN!()\n └─── type of state vector sol: Complex{Float64}"
361+
362+
if dev == CPU()
363+
@test repr(prob.vars) == "Variables\n ├───── variable: c -> 128-element Vector{Float64}\n ├───── variable: cx -> 128-element Vector{Float64}\n ├───── variable: ch -> 65-element Vector{ComplexF64}\n └───── variable: cxh -> 65-element Vector{ComplexF64}\n"
364+
@test repr(diag) == "Diagnostic\n ├─── calc: get_sol\n ├─── prob: FourierFlows.Problem{DataType, Vector{ComplexF64}, Float64, Vector{Int64}}\n ├─── data: 101-element Vector{Vector{ComplexF64}}\n ├────── t: 101-element Vector{Float64}\n ├── steps: 101-element Vector{Int64}\n ├─── freq: 1\n └────── i: 1"
363365
else
364-
if dev == CPU()
365-
@test repr(prob.vars) == "Variables\n ├───── variable: c -> 128-element Vector{Float64}\n ├───── variable: cx -> 128-element Vector{Float64}\n ├───── variable: ch -> 65-element Vector{ComplexF64}\n └───── variable: cxh -> 65-element Vector{ComplexF64}\n"
366-
@test repr(diag) == "Diagnostic\n ├─── calc: get_sol\n ├─── prob: FourierFlows.Problem{DataType, Vector{ComplexF64}, Float64, Vector{Int64}}\n ├─── data: 101-element Vector{Vector{ComplexF64}}\n ├────── t: 101-element Vector{Float64}\n ├── steps: 101-element Vector{Int64}\n ├─── freq: 1\n └────── i: 1"
367-
else
368-
@test repr(prob.vars) == "Variables\n ├───── variable: c -> 128-element " * string(ArrayType(dev)) * "{Float64, 1, CUDA.Mem.DeviceBuffer}\n ├───── variable: cx -> 128-element " * string(ArrayType(dev)) * "{Float64, 1, CUDA.Mem.DeviceBuffer}\n ├───── variable: ch -> 65-element " * string(ArrayType(dev)) * "{ComplexF64, 1, CUDA.Mem.DeviceBuffer}\n └───── variable: cxh -> 65-element " * string(ArrayType(dev)) * "{ComplexF64, 1, CUDA.Mem.DeviceBuffer}\n"
369-
@test repr(diag) == "Diagnostic\n ├─── calc: get_sol\n ├─── prob: FourierFlows.Problem{DataType, " * string(ArrayType(dev)) * "{ComplexF64, 1, CUDA.Mem.DeviceBuffer}, Float64, " * string(ArrayType(dev)) * "{Int64, 1, CUDA.Mem.DeviceBuffer}}\n ├─── data: 101-element Vector{" * string(ArrayType(dev)) * "{ComplexF64, 1, CUDA.Mem.DeviceBuffer}}\n ├────── t: 101-element Vector{Float64}\n ├── steps: 101-element Vector{Int64}\n ├─── freq: 1\n └────── i: 1"
370-
end
371-
@test repr(prob.eqn) == "Equation\n ├──────── linear coefficients: L\n │ ├───type: Int64\n │ └───size: (65,)\n ├───────────── nonlinear term: calcN!()\n └─── type of state vector sol: ComplexF64"
366+
@test repr(prob.vars) == "Variables\n ├───── variable: c -> 128-element " * string(ArrayType(dev)) * "{Float64, 1, CUDA.Mem.DeviceBuffer}\n ├───── variable: cx -> 128-element " * string(ArrayType(dev)) * "{Float64, 1, CUDA.Mem.DeviceBuffer}\n ├───── variable: ch -> 65-element " * string(ArrayType(dev)) * "{ComplexF64, 1, CUDA.Mem.DeviceBuffer}\n └───── variable: cxh -> 65-element " * string(ArrayType(dev)) * "{ComplexF64, 1, CUDA.Mem.DeviceBuffer}\n"
367+
@test repr(diag) == "Diagnostic\n ├─── calc: get_sol\n ├─── prob: FourierFlows.Problem{DataType, " * string(ArrayType(dev)) * "{ComplexF64, 1, CUDA.Mem.DeviceBuffer}, Float64, " * string(ArrayType(dev)) * "{Int64, 1, CUDA.Mem.DeviceBuffer}}\n ├─── data: 101-element Vector{" * string(ArrayType(dev)) * "{ComplexF64, 1, CUDA.Mem.DeviceBuffer}}\n ├────── t: 101-element Vector{Float64}\n ├── steps: 101-element Vector{Int64}\n ├─── freq: 1\n └────── i: 1"
372368
end
369+
@test repr(prob.eqn) == "Equation\n ├──────── linear coefficients: L\n │ ├───type: Int64\n │ └───size: (65,)\n ├───────────── nonlinear term: calcN!()\n └─── type of state vector sol: ComplexF64"
373370
@test repr(prob.clock) == "Clock\n ├─── timestep dt: 0.01\n ├────────── step: 0\n └──────── time t: 0.0"
374371
@test repr(prob) == "Problem\n ├─────────── grid: grid (on " * FourierFlows.griddevice(prob.grid) * ")\n ├───── parameters: params\n ├────── variables: vars\n ├─── state vector: sol\n ├─────── equation: eqn\n ├────────── clock: clock\n └──── timestepper: RK4TimeStepper"
375372
end

0 commit comments

Comments
 (0)