Skip to content

Commit

Permalink
Clean up dependencies
Browse files Browse the repository at this point in the history 
* Comment out experimental stuff & remove Metis
* Remove Requires & clean up 1.6 compatibility plumbing
  • Loading branch information
@j-fu
j-fu committed Jul 17, 2024
1 parent 6f1ff93 commit eb8c716
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 33 deletions.
9 changes: 0 additions & 9 deletions Project.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ AMGCLWrap = "4f76b812-4ba5-496d-b042-d70715554288"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
ILUZero = "88f59080-6952-5380-9ea5-54057fb9a43f"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Metis = "2679e427-3c69-5b7f-982b-ece356f1e94b"
OhMyThreads = "67456a42-1dca-4109-a031-0a68de7e3ad5"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
Sparspak = "e56a9233-b9d6-4f03-8d0f-1825330902ac"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Expand All @@ -38,13 +36,6 @@ ILUZero = "0.2"
IncompleteLU = "^0.2.1"
OhMyThreads = "0.5.3"
Pardiso = "0.5.1"
Requires = "1.1.3"
Sparspak = "0.3.6"
StaticArrays = "1.5.24"
julia = "1.9"

[extras]
AMGCLWrap = "4f76b812-4ba5-496d-b042-d70715554288"
AlgebraicMultigrid = "2169fc97-5a83-5252-b627-83903c6c433c"
IncompleteLU = "40713840-3770-5561-ab4c-a76e7d0d7895"
Pardiso = "46dd5b70-b6fb-5a00-ae2d-e8fea33afaf2"
4 changes: 1 addition & 3 deletions ext/ExtendableSparseAMGCLWrapExt.jl
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module ExtendableSparseAMGCLWrapExt

using ExtendableSparse

isdefined(Base, :get_extension) ? using AMGCLWrap : using ..AMGCLWrap
using AMGCLWrap

import ExtendableSparse: @makefrommatrix, AbstractPreconditioner, update!

Expand Down
4 changes: 1 addition & 3 deletions ext/ExtendableSparseAlgebraicMultigridExt.jl
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module ExtendableSparseAlgebraicMultigridExt

using ExtendableSparse

isdefined(Base, :get_extension) ? using AlgebraicMultigrid : using ..AlgebraicMultigrid
using AlgebraicMultigrid

import ExtendableSparse: @makefrommatrix, AbstractPreconditioner, update!

Expand Down
4 changes: 1 addition & 3 deletions ext/ExtendableSparseIncompleteLUExt.jl
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module ExtendableSparseIncompleteLUExt

using ExtendableSparse

isdefined(Base, :get_extension) ? using IncompleteLU : using ..IncompleteLU
using IncompleteLU

import ExtendableSparse: @makefrommatrix, AbstractPreconditioner, update!

Expand Down
3 changes: 1 addition & 2 deletions ext/ExtendableSparsePardisoExt.jl
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
module ExtendableSparsePardisoExt
using ExtendableSparse
using LinearAlgebra

isdefined(Base, :get_extension) ? using Pardiso : using ..Pardiso
using Pardiso

import ExtendableSparse: @makefrommatrix, update!, AbstractLUFactorization

Expand Down
2 changes: 1 addition & 1 deletion src/ExtendableSparse.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export eliminate_dirichlet, eliminate_dirichlet!, mark_dirichlet

include("factorizations/factorizations.jl")

include("experimental/Experimental.jl")
#include("experimental/Experimental.jl")

include("factorizations/simple_iteration.jl")
export simple, simple!
Expand Down
22 changes: 11 additions & 11 deletions test/runtests.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ using Test
using LinearAlgebra
using SparseArrays
using ExtendableSparse
using ExtendableSparse.Experimental
#using ExtendableSparse.Experimental
using Printf
using BenchmarkTools

Expand All @@ -11,8 +11,8 @@ using ForwardDiff
using ExplicitImports

@testset "ExplicitImports" begin
@test ExplicitImports.check_no_implicit_imports(ExtendableSparse, allow_unanalyzable=(ExtendableSparse.Experimental,)) === nothing
@test ExplicitImports.check_no_stale_explicit_imports(ExtendableSparse, allow_unanalyzable=(ExtendableSparse.Experimental,)) === nothing
@test ExplicitImports.check_no_implicit_imports(ExtendableSparse) === nothing
@test ExplicitImports.check_no_stale_explicit_imports(ExtendableSparse) === nothing
end

@testset "Parallel" begin
Expand All @@ -33,14 +33,14 @@ end
end
end

@testset "ExperimentalParallel" begin
include("ExperimentalParallel.jl")
for d=[1,2,3]
for N in [10,rand(30:40),50]
ExperimentalParallel.test_correctness_build(N,d)
end
end
end
# @testset "ExperimentalParallel" begin
# include("ExperimentalParallel.jl")
# for d=[1,2,3]
# for N in [10,rand(30:40),50]
# ExperimentalParallel.test_correctness_build(N,d)
# end
# end
# end


@testset "Constructors" begin include("test_constructors.jl") end
Expand Down
3 changes: 2 additions & 1 deletion test/test_parallel.jl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module test_parallel

using ExtendableSparse, SparseArrays, ExtendableSparse.Experimental
using ExtendableSparse, SparseArrays
# using ExtendableSparse.Experimental
using BenchmarkTools
using ExtendableGrids
#using MKLSparse
Expand Down

2 comments on commit eb8c716

@j-fu
Copy link
Member Author

@j-fu j-fu commented on eb8c716 Jul 17, 2024

Choose a reason for hiding this comment

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

@JuliaRegistrator register

@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 updated: JuliaRegistries/General/111187

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 v1.5.0 -m "<description of version>" eb8c7169b5b36919bafe21395f07369feba93ed6
git push origin v1.5.0

Please sign in to comment.