Skip to content

Commit eb8c716

Browse files
j-fuj-fu
committed
Clean up dependencies
* Comment out experimental stuff & remove Metis * Remove Requires & clean up 1.6 compatibility plumbing
1 parent 6f1ff93 commit eb8c716

8 files changed

+18
-33
lines changed

‎Project.toml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ AMGCLWrap = "4f76b812-4ba5-496d-b042-d70715554288"
88
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
99
ILUZero = "88f59080-6952-5380-9ea5-54057fb9a43f"
1010
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
11-
Metis = "2679e427-3c69-5b7f-982b-ece356f1e94b"
1211
OhMyThreads = "67456a42-1dca-4109-a031-0a68de7e3ad5"
1312
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
14-
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
1513
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1614
Sparspak = "e56a9233-b9d6-4f03-8d0f-1825330902ac"
1715
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
@@ -38,13 +36,6 @@ ILUZero = "0.2"
3836
IncompleteLU = "^0.2.1"
3937
OhMyThreads = "0.5.3"
4038
Pardiso = "0.5.1"
41-
Requires = "1.1.3"
4239
Sparspak = "0.3.6"
4340
StaticArrays = "1.5.24"
4441
julia = "1.9"
45-
46-
[extras]
47-
AMGCLWrap = "4f76b812-4ba5-496d-b042-d70715554288"
48-
AlgebraicMultigrid = "2169fc97-5a83-5252-b627-83903c6c433c"
49-
IncompleteLU = "40713840-3770-5561-ab4c-a76e7d0d7895"
50-
Pardiso = "46dd5b70-b6fb-5a00-ae2d-e8fea33afaf2"

‎ext/ExtendableSparseAMGCLWrapExt.jl‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module ExtendableSparseAMGCLWrapExt
2-
32
using ExtendableSparse
4-
5-
isdefined(Base, :get_extension) ? using AMGCLWrap : using ..AMGCLWrap
3+
using AMGCLWrap
64

75
import ExtendableSparse: @makefrommatrix, AbstractPreconditioner, update!
86

‎ext/ExtendableSparseAlgebraicMultigridExt.jl‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module ExtendableSparseAlgebraicMultigridExt
2-
32
using ExtendableSparse
4-
5-
isdefined(Base, :get_extension) ? using AlgebraicMultigrid : using ..AlgebraicMultigrid
3+
using AlgebraicMultigrid
64

75
import ExtendableSparse: @makefrommatrix, AbstractPreconditioner, update!
86

‎ext/ExtendableSparseIncompleteLUExt.jl‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module ExtendableSparseIncompleteLUExt
2-
32
using ExtendableSparse
4-
5-
isdefined(Base, :get_extension) ? using IncompleteLU : using ..IncompleteLU
3+
using IncompleteLU
64

75
import ExtendableSparse: @makefrommatrix, AbstractPreconditioner, update!
86

‎ext/ExtendableSparsePardisoExt.jl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
module ExtendableSparsePardisoExt
22
using ExtendableSparse
33
using LinearAlgebra
4-
5-
isdefined(Base, :get_extension) ? using Pardiso : using ..Pardiso
4+
using Pardiso
65

76
import ExtendableSparse: @makefrommatrix, update!, AbstractLUFactorization
87

‎src/ExtendableSparse.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export eliminate_dirichlet, eliminate_dirichlet!, mark_dirichlet
4848

4949
include("factorizations/factorizations.jl")
5050

51-
include("experimental/Experimental.jl")
51+
#include("experimental/Experimental.jl")
5252

5353
include("factorizations/simple_iteration.jl")
5454
export simple, simple!

‎test/runtests.jl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ using Test
22
using LinearAlgebra
33
using SparseArrays
44
using ExtendableSparse
5-
using ExtendableSparse.Experimental
5+
#using ExtendableSparse.Experimental
66
using Printf
77
using BenchmarkTools
88

@@ -11,8 +11,8 @@ using ForwardDiff
1111
using ExplicitImports
1212

1313
@testset "ExplicitImports" begin
14-
@test ExplicitImports.check_no_implicit_imports(ExtendableSparse, allow_unanalyzable=(ExtendableSparse.Experimental,)) === nothing
15-
@test ExplicitImports.check_no_stale_explicit_imports(ExtendableSparse, allow_unanalyzable=(ExtendableSparse.Experimental,)) === nothing
14+
@test ExplicitImports.check_no_implicit_imports(ExtendableSparse) === nothing
15+
@test ExplicitImports.check_no_stale_explicit_imports(ExtendableSparse) === nothing
1616
end
1717

1818
@testset "Parallel" begin
@@ -33,14 +33,14 @@ end
3333
end
3434
end
3535

36-
@testset "ExperimentalParallel" begin
37-
include("ExperimentalParallel.jl")
38-
for d=[1,2,3]
39-
for N in [10,rand(30:40),50]
40-
ExperimentalParallel.test_correctness_build(N,d)
41-
end
42-
end
43-
end
36+
# @testset "ExperimentalParallel" begin
37+
# include("ExperimentalParallel.jl")
38+
# for d=[1,2,3]
39+
# for N in [10,rand(30:40),50]
40+
# ExperimentalParallel.test_correctness_build(N,d)
41+
# end
42+
# end
43+
# end
4444

4545

4646
@testset "Constructors" begin include("test_constructors.jl") end

‎test/test_parallel.jl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module test_parallel
22

3-
using ExtendableSparse, SparseArrays, ExtendableSparse.Experimental
3+
using ExtendableSparse, SparseArrays
4+
# using ExtendableSparse.Experimental
45
using BenchmarkTools
56
using ExtendableGrids
67
#using MKLSparse

0 commit comments

Comments
 (0)