Skip to content

Commit 135e425

Browse files
authored
Merge main into gd/structured3 (#316)
* Merge main into gd/structured3 * Add the missing docs
1 parent b24c181 commit 135e425

47 files changed

Lines changed: 1601 additions & 543 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.buildkite/pipeline.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
env:
2+
SECRET_CODECOV_TOKEN: "l7PxpMgxHEiz2l3UDDj5122Xirv5du1QFQiTf09YISC8VOz/nXeQC2yYY6iTMbccQG3xrumfWke9vtLbAc9LPH75kw3zQODuWMbz0eGSf9wtw7foqO6KAo5neMTeZJ0ZFgFMa2Q89T5SNIQsi4b5Zs7BVto6qB9Z/3QEs/BpsR25cYkY4Y6JBU6XuqZ6GRAc6BtlB4OmBEp3BBsXatx6y64zF0qbp4rocmcBQEoeQkcXtxf0dfA0KNAHpweWPrzIAMZ0aUYp6iEikxwLY5TjVFhOIcpVXUlxIdhl2qaaDF6b6WlgGXiGLpBjsLQfvlOgIlXH59Ddg0IVxboF2a37OA==;U2FsdGVkX19MveWMe1aasYZoJwaeiKO5XqwMZ/utOFj7h1CE9UX4nduBMXTyJ77tpNmCBYsQNJ/PadbX2224hQ=="
3+
4+
steps:
5+
- label: "Julia v1"
6+
plugins:
7+
- JuliaCI/julia#v1:
8+
version: "1"
9+
- JuliaCI/julia-test#v1: ~
10+
- JuliaCI/julia-coverage#v1:
11+
codecov: true
12+
agents:
13+
queue: "juliagpu"
14+
cuda: "*"
15+
if: build.message !~ /\[skip tests\]/
16+
timeout_in_minutes: 60
17+
env:
18+
JULIA_SMC_TEST_GROUP: 'GPU'

.github/workflows/Benchmark.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
runs-on: ubuntu-latest
1313
if: contains(github.event.pull_request.labels.*.name, 'benchmark')
1414
steps:
15-
- uses: actions/checkout@v4
16-
- uses: julia-actions/setup-julia@v2
15+
- uses: actions/checkout@v6
16+
- uses: julia-actions/setup-julia@v3
1717
with:
1818
version: "1"
19-
- uses: julia-actions/cache@v2
19+
- uses: julia-actions/cache@v3
2020
- name: Extract Package Name from Project.toml
2121
id: extract-package-name
2222
run: |
@@ -46,14 +46,14 @@ jobs:
4646
echo '' >> body.md
4747
echo '' >> body.md
4848
- name: Find Comment
49-
uses: peter-evans/find-comment@v3
49+
uses: peter-evans/find-comment@v4
5050
id: fcbenchmark
5151
with:
5252
issue-number: ${{ github.event.pull_request.number }}
5353
comment-author: 'github-actions[bot]'
5454
body-includes: Benchmark Results
5555
- name: Comment on PR
56-
uses: peter-evans/create-or-update-comment@v4
56+
uses: peter-evans/create-or-update-comment@v5
5757
with:
5858
comment-id: ${{ steps.fcbenchmark.outputs.comment-id }}
5959
issue-number: ${{ github.event.pull_request.number }}

.github/workflows/CompatHelper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
run: which julia
1616
continue-on-error: true
1717
- name: Install Julia, but only if it is not already available in the PATH
18-
uses: julia-actions/setup-julia@v2
18+
uses: julia-actions/setup-julia@v3
1919
with:
2020
version: '1'
2121
arch: ${{ runner.arch }}

.github/workflows/Documentation.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
statuses: write
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v4
23-
- uses: julia-actions/setup-julia@v2
22+
- uses: actions/checkout@v6
23+
- uses: julia-actions/setup-julia@v3
2424
with:
2525
version: '1'
26-
- uses: julia-actions/cache@v2
26+
- uses: julia-actions/cache@v3
2727
- name: Install dependencies
2828
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
2929
- name: Build and deploy

.github/workflows/Format.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Format suggestions
2+
on:
3+
pull_request:
4+
# this argument is not required if you don't use the `suggestion-label` input
5+
types: [opened, reopened, synchronize, labeled, unlabeled]
6+
jobs:
7+
code-style:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: julia-actions/julia-format@v4
11+
with:
12+
version: '1' # Set `version` to '1.0.54' if you need to use JuliaFormatter.jl v1.0.54 (default: '1')

.github/workflows/Test-GPU.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/workflows/Test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@ jobs:
2020
runs-on: ubuntu-latest
2121
strategy:
2222
matrix:
23-
julia-version: ['1.10', '1']
23+
julia-version: ['1.10', '1.11', '1.12']
2424

2525
steps:
26-
- uses: actions/checkout@v4
27-
- uses: julia-actions/setup-julia@v2
26+
- uses: actions/checkout@v6
27+
- uses: julia-actions/setup-julia@v3
2828
with:
2929
version: ${{ matrix.julia-version }}
3030
arch: x64
31-
- uses: julia-actions/julia-downgrade-compat@v1
31+
- uses: julia-actions/julia-downgrade-compat@v2
3232
if: ${{ matrix.version == '1.10' }}
3333
with:
3434
skip: LinearAlgebra, Random, SparseArrays
35-
- uses: julia-actions/cache@v2
35+
- uses: julia-actions/cache@v3
3636
- uses: julia-actions/julia-buildpkg@v1
3737
- uses: julia-actions/julia-runtest@v1
3838
- uses: julia-actions/julia-processcoverage@v1
39-
- uses: codecov/codecov-action@v5
39+
- uses: codecov/codecov-action@v6
4040
with:
4141
files: lcov.info
4242
token: ${{ secrets.CODECOV_TOKEN }}
43-
fail_ci_if_error: false
43+
fail_ci_if_error: false

CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ identifiers:
1818
- type: doi
1919
value: 10.5281/zenodo.11314275
2020
description: Zenodo
21-
repository-code: 'https://github.com/gdalle/SparseMatrixColorings.jl'
21+
repository-code: 'https://github.com/JuliaDiff/SparseMatrixColorings.jl'
2222
abstract: >-
2323
Coloring algorithms for sparse Jacobian and Hessian
2424
matrices

Project.toml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "SparseMatrixColorings"
22
uuid = "0a514795-09f3-496d-8182-132a7b665d35"
3+
version = "0.4.27"
34
authors = ["Guillaume Dalle", "Alexis Montoison"]
4-
version = "0.4.22"
55

66
[deps]
77
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
@@ -18,25 +18,35 @@ BlockBandedMatrices = "ffab5731-97b5-5995-9138-79e8c1846df0"
1818
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
1919
CliqueTrees = "60701a23-6482-424a-84db-faee86b9b1f8"
2020
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
21+
GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
22+
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
23+
MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
24+
cuSPARSE = "b26da814-b3bc-49ef-b0ee-c816305aa060"
2125

2226
[extensions]
2327
SparseMatrixColoringsBandedMatricesExt = "BandedMatrices"
2428
SparseMatrixColoringsBlockBandedMatricesExt = ["BlockArrays", "BlockBandedMatrices"]
25-
SparseMatrixColoringsCUDAExt = "CUDA"
29+
SparseMatrixColoringsCUDAExt = ["CUDA", "cuSPARSE"]
2630
SparseMatrixColoringsCliqueTreesExt = "CliqueTrees"
2731
SparseMatrixColoringsColorsExt = "Colors"
32+
SparseMatrixColoringsGPUArraysExt = "GPUArrays"
33+
SparseMatrixColoringsJuMPExt = ["JuMP", "MathOptInterface"]
2834

2935
[compat]
3036
ADTypes = "1.2.1"
3137
BandedMatrices = "1.9.4"
3238
BlockArrays = "1.6.3"
3339
BlockBandedMatrices = "0.13.1"
34-
CUDA = "5.8.2"
40+
CUDA = "6.0.0"
3541
CliqueTrees = "1"
3642
Colors = "0.12.11, 0.13"
3743
DocStringExtensions = "0.8,0.9"
38-
LinearAlgebra = "<0.0.1, 1"
44+
GPUArrays = "11.5.0"
45+
JuMP = "1.29.1"
46+
LinearAlgebra = "1"
47+
MathOptInterface = "1.45.0"
3948
PrecompileTools = "1.2.1"
40-
Random = "<0.0.1, 1"
41-
SparseArrays = "<0.0.1, 1"
49+
Random = "1"
50+
SparseArrays = "1"
51+
cuSPARSE = "6.0.0"
4252
julia = "1.10"

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# SparseMatrixColorings.jl
22

3-
[![Build Status](https://github.com/gdalle/SparseMatrixColorings.jl/actions/workflows/Test.yml/badge.svg?branch=main)](https://github.com/gdalle/SparseMatrixColorings.jl/actions/workflows/Test.yml?query=branch%3Amain)
4-
[![Stable Documentation](https://img.shields.io/badge/docs-stable-blue.svg)](https://gdalle.github.io/SparseMatrixColorings.jl/stable/)
5-
[![Dev Documentation](https://img.shields.io/badge/docs-dev-blue.svg)](https://gdalle.github.io/SparseMatrixColorings.jl/dev/)
6-
[![Coverage](https://codecov.io/gh/gdalle/SparseMatrixColorings.jl/branch/main/graph/badge.svg)](https://app.codecov.io/gh/gdalle/SparseMatrixColorings.jl)
3+
[![Build Status](https://github.com/juliadiff/SparseMatrixColorings.jl/actions/workflows/Test.yml/badge.svg?branch=main)](https://github.com/juliadiff/SparseMatrixColorings.jl/actions/workflows/Test.yml?query=branch%3Amain)
4+
[![GPU build status](https://badge.buildkite.com/7d8ed289d7bdb5a25ae48b2c778a202ce4990b7ee558cdfef8.svg?branch=main)](https://buildkite.com/julialang/sparsematrixcolorings-dot-jl)
5+
[![Coverage](https://codecov.io/gh/juliadiff/SparseMatrixColorings.jl/branch/main/graph/badge.svg)](https://app.codecov.io/gh/juliadiff/SparseMatrixColorings.jl)
6+
7+
[![Stable Documentation](https://img.shields.io/badge/docs-stable-blue.svg)](https://juliadiff.org/SparseMatrixColorings.jl/stable/)
8+
[![Dev Documentation](https://img.shields.io/badge/docs-dev-blue.svg)](https://juliadiff.org/SparseMatrixColorings.jl/dev/)
79
[![Code Style: Blue](https://img.shields.io/badge/code%20style-blue-4495d1.svg)](https://github.com/JuliaDiff/BlueStyle)
810
[![arXiv](https://img.shields.io/badge/arXiv-2505.07308-b31b1b.svg)](https://arxiv.org/abs/2505.07308)
911
[![DOI](https://zenodo.org/badge/801999408.svg)](https://zenodo.org/doi/10.5281/zenodo.11314275)

0 commit comments

Comments
 (0)