Skip to content

Commit

Permalink
Update to AMGX_jll 2.4 and later Julia versions (#33)
Browse files Browse the repository at this point in the history
* Use AMGX_jll 2.3 and bump julia compat to 1.6


Co-authored-by: Valentin Churavy <v.churavy@gmail.com>
Co-authored-by: Tim Besard <tim.besard@gmail.com>
  • Loading branch information
3 people authored Nov 12, 2024
1 parent f812a39 commit b0de284
Show file tree
Hide file tree
Showing 9 changed files with 185 additions and 165 deletions.
93 changes: 54 additions & 39 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,57 @@
env:
SECRET_CODECOV_TOKEN: "MIXvKy8FpOJzyBykdGQdVdn0jVli57e1Mc1QQQQA6RyLBdViYwCOjLQS+Yh5sgeD5eEm9JLtu6ISePq01EjqpHF7/6zJlcEJTqj2JidcH/sp/FnJiIY0MfV48DSrz1XA7rN6hHQ8wh09+BMG1Ur4CbtwVQl1HF3wZqmt+b2Ahknyxd0mrIoT3j6RJ90vVSGagLLqWolaQLLOFoGNyHbeFV15r1YXLZDkwyE1SSNz4JF3qEN7vFbM9ZnbR4edd7zWABdDiGd3FDnbn1OJFbZ3JzJXph6JAxZyF34RFDzZsERiKyIrAM+0LfyDYqCAcYnjDpJoEASZugTTwIKXOjUkyQ==;U2FsdGVkX1+go3U7v0bYSZs2Lx4R/lwnJXQm4ATdXL2Y7x5H9QDOgazDvusO8UmBtwHFi3szvPuuxr/gcXYgxw=="

steps:
- label: "Julia 1.6"
plugins:
- JuliaCI/julia#v1:
version: 1.6
- JuliaCI/julia-test#v1: ~
- JuliaCI/julia-coverage#v1:
codecov: true
agents:
queue: "juliagpu"
cuda: "10.0"
if: build.message !~ /\[skip tests\]/
timeout_in_minutes: 60
- group: ":julia: Julia"
steps:
- label: "Julia {{matrix.julia}}"
plugins:
- JuliaCI/julia#v1:
version: "{{matrix.julia}}"
- JuliaCI/julia-test#v1: ~
- JuliaCI/julia-coverage#v1: ~
agents:
queue: "juliagpu"
cuda: "*"
commands: |
julia --project -e "
using CUDA
CUDA.set_runtime_version!(local_toolkit=true)"
timeout_in_minutes: 60
matrix:
setup:
julia:
- "1.10"
- "1.11"

- label: "Julia 1.7"
plugins:
- JuliaCI/julia#v1:
version: 1.7
- JuliaCI/julia-test#v1: ~
- JuliaCI/julia-coverage#v1:
codecov: true
agents:
queue: "juliagpu"
cuda: "10.0"
if: build.message !~ /\[skip tests\]/
timeout_in_minutes: 60
- group: "CUDA"
steps:
- label: "CUDA {{matrix.cuda}}"
plugins:
- JuliaCI/julia#v1:
version: "1.11"
- JuliaCI/julia-test#v1: ~
- JuliaCI/julia-coverage#v1: ~
agents:
queue: "juliagpu"
cuda: "*"
timeout_in_minutes: 45
matrix:
setup:
cuda:
- "12.6"
- "12.5"
- "12.4"
- "12.3"
- "12.2"
- "12.1"
- "12.0"
- "11.8"
- "11.7"
- "11.6"
- "11.5"
- "11.4"
commands: |
julia --project -e "
using CUDA
CUDA.set_runtime_version!(v\"{{matrix.cuda}}\")"
- label: "Julia 1.8"
plugins:
- JuliaCI/julia#v1:
version: 1.8
- JuliaCI/julia-test#v1: ~
- JuliaCI/julia-coverage#v1:
codecov: true
agents:
queue: "juliagpu"
cuda: "10.0"
if: build.message !~ /\[skip tests\]/
timeout_in_minutes: 60
env:
SECRET_CODECOV_TOKEN: "MIXvKy8FpOJzyBykdGQdVdn0jVli57e1Mc1QQQQA6RyLBdViYwCOjLQS+Yh5sgeD5eEm9JLtu6ISePq01EjqpHF7/6zJlcEJTqj2JidcH/sp/FnJiIY0MfV48DSrz1XA7rN6hHQ8wh09+BMG1Ur4CbtwVQl1HF3wZqmt+b2Ahknyxd0mrIoT3j6RJ90vVSGagLLqWolaQLLOFoGNyHbeFV15r1YXLZDkwyE1SSNz4JF3qEN7vFbM9ZnbR4edd7zWABdDiGd3FDnbn1OJFbZ3JzJXph6JAxZyF34RFDzZsERiKyIrAM+0LfyDYqCAcYnjDpJoEASZugTTwIKXOjUkyQ==;U2FsdGVkX1+go3U7v0bYSZs2Lx4R/lwnJXQm4ATdXL2Y7x5H9QDOgazDvusO8UmBtwHFi3szvPuuxr/gcXYgxw=="
17 changes: 9 additions & 8 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
authors = ["JuliaHub"]
name = "AMGX"
uuid = "c963dde9-0319-47f5-bf0c-b07d3c80ffa6"
authors = ["JuliaHub"]
version = "0.1.4"
version = "0.2.0"

[compat]
AMGX_jll = "2.4"
CEnum = "0.5"
CUDA = "4,5"
JSON = "0.21"
julia = "1.10"

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

[compat]
CEnum = "0.4"
CUDA = "2.2, 3, 4"
JSON = "0.21"
julia = "1.5"

[extras]
Defer = "6f25fe36-ecbb-5dff-aeb8-f7b50c87fb5f"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ The library can now be initialized with:
```julia
using AMGX
AMGX.initialize()
AMGX.initialize_plugins()
```

### `Config`
Expand Down Expand Up @@ -182,6 +181,7 @@ After a solve, the status can be retrieved using `AMGX.get_status(solver)`. It i
- `AMGX.SUCCESS`
- `AMGX.FAILED`
- `AMGX.DIVERGED`
- `AMGX.NOT_CONVERGED`

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

Expand Down
Loading

2 comments on commit b0de284

@KristofferC
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/119220

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.2.0 -m "<description of version>" b0de2842252449103ea9933439416a92328806dd
git push origin v0.2.0

Please sign in to comment.