Skip to content

Commit b0de284

Browse files
moynervchuravymaleadt
authored
Update to AMGX_jll 2.4 and later Julia versions (#33)
* Use AMGX_jll 2.3 and bump julia compat to 1.6 Co-authored-by: Valentin Churavy <[email protected]> Co-authored-by: Tim Besard <[email protected]>
1 parent f812a39 commit b0de284

File tree

9 files changed

+185
-165
lines changed

9 files changed

+185
-165
lines changed

.buildkite/pipeline.yml

Lines changed: 54 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,57 @@
1-
env:
2-
SECRET_CODECOV_TOKEN: "MIXvKy8FpOJzyBykdGQdVdn0jVli57e1Mc1QQQQA6RyLBdViYwCOjLQS+Yh5sgeD5eEm9JLtu6ISePq01EjqpHF7/6zJlcEJTqj2JidcH/sp/FnJiIY0MfV48DSrz1XA7rN6hHQ8wh09+BMG1Ur4CbtwVQl1HF3wZqmt+b2Ahknyxd0mrIoT3j6RJ90vVSGagLLqWolaQLLOFoGNyHbeFV15r1YXLZDkwyE1SSNz4JF3qEN7vFbM9ZnbR4edd7zWABdDiGd3FDnbn1OJFbZ3JzJXph6JAxZyF34RFDzZsERiKyIrAM+0LfyDYqCAcYnjDpJoEASZugTTwIKXOjUkyQ==;U2FsdGVkX1+go3U7v0bYSZs2Lx4R/lwnJXQm4ATdXL2Y7x5H9QDOgazDvusO8UmBtwHFi3szvPuuxr/gcXYgxw=="
3-
41
steps:
5-
- label: "Julia 1.6"
6-
plugins:
7-
- JuliaCI/julia#v1:
8-
version: 1.6
9-
- JuliaCI/julia-test#v1: ~
10-
- JuliaCI/julia-coverage#v1:
11-
codecov: true
12-
agents:
13-
queue: "juliagpu"
14-
cuda: "10.0"
15-
if: build.message !~ /\[skip tests\]/
16-
timeout_in_minutes: 60
2+
- group: ":julia: Julia"
3+
steps:
4+
- label: "Julia {{matrix.julia}}"
5+
plugins:
6+
- JuliaCI/julia#v1:
7+
version: "{{matrix.julia}}"
8+
- JuliaCI/julia-test#v1: ~
9+
- JuliaCI/julia-coverage#v1: ~
10+
agents:
11+
queue: "juliagpu"
12+
cuda: "*"
13+
commands: |
14+
julia --project -e "
15+
using CUDA
16+
CUDA.set_runtime_version!(local_toolkit=true)"
17+
timeout_in_minutes: 60
18+
matrix:
19+
setup:
20+
julia:
21+
- "1.10"
22+
- "1.11"
1723

18-
- label: "Julia 1.7"
19-
plugins:
20-
- JuliaCI/julia#v1:
21-
version: 1.7
22-
- JuliaCI/julia-test#v1: ~
23-
- JuliaCI/julia-coverage#v1:
24-
codecov: true
25-
agents:
26-
queue: "juliagpu"
27-
cuda: "10.0"
28-
if: build.message !~ /\[skip tests\]/
29-
timeout_in_minutes: 60
24+
- group: "CUDA"
25+
steps:
26+
- label: "CUDA {{matrix.cuda}}"
27+
plugins:
28+
- JuliaCI/julia#v1:
29+
version: "1.11"
30+
- JuliaCI/julia-test#v1: ~
31+
- JuliaCI/julia-coverage#v1: ~
32+
agents:
33+
queue: "juliagpu"
34+
cuda: "*"
35+
timeout_in_minutes: 45
36+
matrix:
37+
setup:
38+
cuda:
39+
- "12.6"
40+
- "12.5"
41+
- "12.4"
42+
- "12.3"
43+
- "12.2"
44+
- "12.1"
45+
- "12.0"
46+
- "11.8"
47+
- "11.7"
48+
- "11.6"
49+
- "11.5"
50+
- "11.4"
51+
commands: |
52+
julia --project -e "
53+
using CUDA
54+
CUDA.set_runtime_version!(v\"{{matrix.cuda}}\")"
3055
31-
- label: "Julia 1.8"
32-
plugins:
33-
- JuliaCI/julia#v1:
34-
version: 1.8
35-
- JuliaCI/julia-test#v1: ~
36-
- JuliaCI/julia-coverage#v1:
37-
codecov: true
38-
agents:
39-
queue: "juliagpu"
40-
cuda: "10.0"
41-
if: build.message !~ /\[skip tests\]/
42-
timeout_in_minutes: 60
56+
env:
57+
SECRET_CODECOV_TOKEN: "MIXvKy8FpOJzyBykdGQdVdn0jVli57e1Mc1QQQQA6RyLBdViYwCOjLQS+Yh5sgeD5eEm9JLtu6ISePq01EjqpHF7/6zJlcEJTqj2JidcH/sp/FnJiIY0MfV48DSrz1XA7rN6hHQ8wh09+BMG1Ur4CbtwVQl1HF3wZqmt+b2Ahknyxd0mrIoT3j6RJ90vVSGagLLqWolaQLLOFoGNyHbeFV15r1YXLZDkwyE1SSNz4JF3qEN7vFbM9ZnbR4edd7zWABdDiGd3FDnbn1OJFbZ3JzJXph6JAxZyF34RFDzZsERiKyIrAM+0LfyDYqCAcYnjDpJoEASZugTTwIKXOjUkyQ==;U2FsdGVkX1+go3U7v0bYSZs2Lx4R/lwnJXQm4ATdXL2Y7x5H9QDOgazDvusO8UmBtwHFi3szvPuuxr/gcXYgxw=="

Project.toml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1+
authors = ["JuliaHub"]
12
name = "AMGX"
23
uuid = "c963dde9-0319-47f5-bf0c-b07d3c80ffa6"
3-
authors = ["JuliaHub"]
4-
version = "0.1.4"
4+
version = "0.2.0"
5+
6+
[compat]
7+
AMGX_jll = "2.4"
8+
CEnum = "0.5"
9+
CUDA = "4,5"
10+
JSON = "0.21"
11+
julia = "1.10"
512

613
[deps]
714
AMGX_jll = "656d14af-56e4-5275-8e68-4e861d7b5043"
@@ -11,12 +18,6 @@ JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
1118
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
1219
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1320

14-
[compat]
15-
CEnum = "0.4"
16-
CUDA = "2.2, 3, 4"
17-
JSON = "0.21"
18-
julia = "1.5"
19-
2021
[extras]
2122
Defer = "6f25fe36-ecbb-5dff-aeb8-f7b50c87fb5f"
2223
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ The library can now be initialized with:
4141
```julia
4242
using AMGX
4343
AMGX.initialize()
44-
AMGX.initialize_plugins()
4544
```
4645

4746
### `Config`
@@ -182,6 +181,7 @@ After a solve, the status can be retrieved using `AMGX.get_status(solver)`. It i
182181
- `AMGX.SUCCESS`
183182
- `AMGX.FAILED`
184183
- `AMGX.DIVERGED`
184+
- `AMGX.NOT_CONVERGED`
185185

186186
The total number of iterations can be retrieved with `AMGX.get_iterations_number(solver)`.
187187

0 commit comments

Comments
 (0)