Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for Julia 1.6 #148

Merged
merged 1 commit into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/Test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
julia-version: ['lts', '1', 'pre']
julia-version: ['1.10', '1']

steps:
- uses: actions/checkout@v4
Expand All @@ -29,7 +29,7 @@ jobs:
version: ${{ matrix.julia-version }}
arch: x64
- uses: julia-actions/julia-downgrade-compat@v1
if: ${{ matrix.version == 'lts' }}
if: ${{ matrix.version == '1.10' }}
with:
skip: LinearAlgebra, Random, SparseArrays
- uses: julia-actions/cache@v2
Expand Down
6 changes: 2 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ version = "0.4.6"

[deps]
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Expand All @@ -14,10 +13,9 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[compat]
ADTypes = "1.2.1"
Compat = "3.46,4.2"
DataStructures = "0.18"
LinearAlgebra = "<0.0.1, 1"
DocStringExtensions = "0.8,0.9"
LinearAlgebra = "<0.0.1, 1"
Random = "<0.0.1, 1"
SparseArrays = "<0.0.1, 1"
julia = "1.6"
julia = "1.10"
1 change: 0 additions & 1 deletion src/SparseMatrixColorings.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ module SparseMatrixColorings

using ADTypes: ADTypes
using Base.Iterators: Iterators
using Compat: @compat, stack
using DataStructures: DisjointSets, find_root!, root_union!, num_groups
using DocStringExtensions: README, EXPORTS, SIGNATURES, TYPEDEF, TYPEDFIELDS
using LinearAlgebra:
Expand Down
2 changes: 1 addition & 1 deletion src/coloring.jl
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ This function corresponds to algorithm `DirectRecover2` in the paper.
function symmetric_coefficient(
i::Integer, j::Integer, color::AbstractVector{<:Integer}, star_set::StarSet
)
@compat (; star, hub) = star_set
(; star, hub) = star_set
if i == j
# diagonal
return i, color[j]
Expand Down
2 changes: 1 addition & 1 deletion src/constant.jl
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ function coloring(
decompression_eltype::Type=Float64,
symmetric_pattern::Bool=false,
) where {partition}
@compat (; matrix_template, result) = algo
(; matrix_template, result) = algo
if size(A) != size(matrix_template)
throw(
DimensionMismatch(
Expand Down
29 changes: 14 additions & 15 deletions src/decompression.jl
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ end
## ColumnColoringResult

function decompress!(A::AbstractMatrix, B::AbstractMatrix, result::ColumnColoringResult)
@compat (; color) = result
(; color) = result
S = result.bg.S2
check_same_pattern(A, S)
fill!(A, zero(eltype(A)))
Expand All @@ -282,7 +282,7 @@ end
function decompress_single_color!(
A::AbstractMatrix, b::AbstractVector, c::Integer, result::ColumnColoringResult
)
@compat (; group) = result
(; group) = result
S = result.bg.S2
check_same_pattern(A, S)
rvS = rowvals(S)
Expand All @@ -296,7 +296,7 @@ function decompress_single_color!(
end

function decompress!(A::SparseMatrixCSC, B::AbstractMatrix, result::ColumnColoringResult)
@compat (; compressed_indices) = result
(; compressed_indices) = result
S = result.bg.S2
check_same_pattern(A, S)
nzA = nonzeros(A)
Expand All @@ -309,7 +309,7 @@ end
function decompress_single_color!(
A::SparseMatrixCSC, b::AbstractVector, c::Integer, result::ColumnColoringResult
)
@compat (; group) = result
(; group) = result
S = result.bg.S2
check_same_pattern(A, S)
rvS = rowvals(S)
Expand All @@ -326,7 +326,7 @@ end
## RowColoringResult

function decompress!(A::AbstractMatrix, B::AbstractMatrix, result::RowColoringResult)
@compat (; color) = result
(; color) = result
S = result.bg.S2
check_same_pattern(A, S)
fill!(A, zero(eltype(A)))
Expand All @@ -344,7 +344,7 @@ end
function decompress_single_color!(
A::AbstractMatrix, b::AbstractVector, c::Integer, result::RowColoringResult
)
@compat (; group) = result
(; group) = result
S, Sᵀ = result.bg.S2, result.bg.S1
check_same_pattern(A, S)
rvSᵀ = rowvals(Sᵀ)
Expand All @@ -358,7 +358,7 @@ function decompress_single_color!(
end

function decompress!(A::SparseMatrixCSC, B::AbstractMatrix, result::RowColoringResult)
@compat (; compressed_indices) = result
(; compressed_indices) = result
S = result.bg.S2
check_same_pattern(A, S)
nzA = nonzeros(A)
Expand All @@ -373,8 +373,8 @@ end
function decompress!(
A::AbstractMatrix, B::AbstractMatrix, result::StarSetColoringResult, uplo::Symbol=:F
)
@compat (; color, star_set) = result
@compat (; star, hub, spokes) = star_set
(; color, star_set) = result
(; star, hub, spokes) = star_set
S = result.ag.S
uplo == :F && check_same_pattern(A, S)
fill!(A, zero(eltype(A)))
Expand Down Expand Up @@ -405,8 +405,8 @@ function decompress_single_color!(
result::StarSetColoringResult,
uplo::Symbol=:F,
)
@compat (; color, group, star_set) = result
@compat (; hub, spokes) = star_set
(; color, group, star_set) = result
(; hub, spokes) = star_set
S = result.ag.S
uplo == :F && check_same_pattern(A, S)
for i in axes(A, 1)
Expand All @@ -433,7 +433,7 @@ end
function decompress!(
A::SparseMatrixCSC, B::AbstractMatrix, result::StarSetColoringResult, uplo::Symbol=:F
)
@compat (; compressed_indices) = result
(; compressed_indices) = result
S = result.ag.S
nzA = nonzeros(A)
if uplo == :F
Expand Down Expand Up @@ -465,7 +465,7 @@ end
function decompress!(
A::AbstractMatrix, B::AbstractMatrix, result::TreeSetColoringResult, uplo::Symbol=:F
)
@compat (; color, vertices_by_tree, reverse_bfs_orders, buffer) = result
(; color, vertices_by_tree, reverse_bfs_orders, buffer) = result
S = result.ag.S
uplo == :F && check_same_pattern(A, S)
R = eltype(A)
Expand Down Expand Up @@ -512,8 +512,7 @@ function decompress!(
result::LinearSystemColoringResult,
uplo::Symbol=:F,
)
@compat (; color, strict_upper_nonzero_inds, T_factorization, strict_upper_nonzeros_A) =
result
(; color, strict_upper_nonzero_inds, T_factorization, strict_upper_nonzeros_A) = result
S = result.ag.S
uplo == :F && check_same_pattern(A, S)

Expand Down