Skip to content

Commit 92249ff

Browse files
Da-Be-RuDa-Be-Ru
authored
Merge pull request #55 from Da-Be-Ru/fix/testenv
Revised and cleaned testing environment
2 parents cd32d7d + 87fb763 commit 92249ff

File tree

5 files changed

+176
-155
lines changed

5 files changed

+176
-155
lines changed

‎Project.toml

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
name = "ExtendableSparse"
22
uuid = "95c220a8-a1cf-11e9-0c77-dbfce5f500b3"
3-
authors = ["Juergen Fuhrmann <juergen.fuhrmann@wias-berlin.de>"]
4-
version = "1.7.0"
3+
authors = ["Juergen Fuhrmann <juergen.fuhrmann@wias-berlin.de>", "Daniel Runge"]
4+
version = "1.7.1"
55

66
[deps]
7-
AMGCLWrap = "4f76b812-4ba5-496d-b042-d70715554288"
87
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
98
ILUZero = "88f59080-6952-5380-9ea5-54057fb9a43f"
109
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -29,14 +28,58 @@ ExtendableSparseIncompleteLUExt = "IncompleteLU"
2928
ExtendableSparsePardisoExt = "Pardiso"
3029
ExtendableSparseLinearSolveExt = "LinearSolve"
3130

31+
[extras]
32+
AMGCLWrap = "4f76b812-4ba5-496d-b042-d70715554288"
33+
AlgebraicMultigrid = "2169fc97-5a83-5252-b627-83903c6c433c"
34+
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
35+
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
36+
ChunkSplitters = "ae650224-84b6-46f8-82ea-d812ca08434e"
37+
ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7"
38+
ExtendableGrids = "cfc395e8-590f-11e8-1f13-43a2532b2fa8"
39+
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
40+
IncompleteLU = "40713840-3770-5561-ab4c-a76e7d0d7895"
41+
IterativeSolvers = "42fd0dbc-a981-5370-80f2-aaf504508153"
42+
LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
43+
Metis = "2679e427-3c69-5b7f-982b-ece356f1e94b"
44+
MultiFloats = "bdf0d083-296b-4888-a5b6-7498122e68a5"
45+
OhMyThreads = "67456a42-1dca-4109-a031-0a68de7e3ad5"
46+
Pardiso = "46dd5b70-b6fb-5a00-ae2d-e8fea33afaf2"
47+
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
48+
RecursiveFactorization = "f2c3362d-daeb-58d1-803e-2bc74f2840b4"
49+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
50+
3251
[compat]
3352
AMGCLWrap = "2"
34-
AlgebraicMultigrid = "0.4, 0.5, 0.6"
53+
AlgebraicMultigrid = "0.4, 0.5, 0.6, 1"
3554
DocStringExtensions = "0.8, 0.9"
55+
ExtendableGrids = "1.9"
3656
ILUZero = "0.2"
3757
IncompleteLU = "^0.2.1"
38-
LinearSolve = "2.36.0, 3"
58+
IterativeSolvers = "0.9"
59+
LinearSolve = "2.36.0, 3.7.1"
3960
Pardiso = "0.5.1, 1"
4061
Sparspak = "0.3.6"
4162
StaticArrays = "1.5.24"
4263
julia = "1.9"
64+
65+
[targets]
66+
test = [
67+
"AMGCLWrap",
68+
"AlgebraicMultigrid",
69+
"Aqua",
70+
"BenchmarkTools",
71+
"ChunkSplitters",
72+
"ExplicitImports",
73+
"ExtendableGrids",
74+
"ForwardDiff",
75+
"IncompleteLU",
76+
"IterativeSolvers",
77+
"LinearSolve",
78+
"Metis",
79+
"MultiFloats",
80+
"OhMyThreads",
81+
"Pardiso",
82+
"Random",
83+
"RecursiveFactorization",
84+
"Test",
85+
]

‎test/ExtendableSparseReTest.jl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# See https://wias-pdelib.github.io/VoronoiFVM.jl/dev/devel/#ReTest
2+
3+
module ExtendableSparseReTest
4+
using ReTest
5+
include("alltests.jl")
6+
end

‎test/Project.toml

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

‎test/alltests.jl

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
using LinearAlgebra
2+
using SparseArrays
3+
using ExtendableSparse
4+
#using ExtendableSparse.Experimental
5+
using Printf
6+
using BenchmarkTools
7+
8+
using MultiFloats
9+
using ForwardDiff
10+
using ExplicitImports
11+
12+
@testset "ExplicitImports" begin
13+
@test ExplicitImports.check_no_implicit_imports(ExtendableSparse) === nothing
14+
@test ExplicitImports.check_no_stale_explicit_imports(ExtendableSparse) === nothing
15+
end
16+
17+
@testset "Parallel" begin
18+
include("test_parallel.jl")
19+
20+
for Tm in [STExtendableSparseMatrixCSC, MTExtendableSparseMatrixCSC, ExtendableSparseMatrix]
21+
for N in [10000, 20000]
22+
test_parallel.test_correctness_build_seq(N, Tm, dim = 2)
23+
end
24+
end
25+
26+
for Tm in [MTExtendableSparseMatrixCSC]
27+
for N in [10000, 20000]
28+
test_parallel.test_correctness_update(N, Tm, dim = 2)
29+
test_parallel.test_correctness_build(N, Tm, dim = 2)
30+
test_parallel.test_correctness_mul(N, Tm, dim = 2)
31+
end
32+
end
33+
end
34+
35+
# @testset "ExperimentalParallel" begin
36+
# include("ExperimentalParallel.jl")
37+
# for d=[1,2,3]
38+
# for N in [10,rand(30:40),50]
39+
# ExperimentalParallel.test_correctness_build(N,d)
40+
# end
41+
# end
42+
# end
43+
44+
45+
@testset "Constructors" begin
46+
include("test_constructors.jl")
47+
end
48+
49+
@testset "Copy-Methods" begin
50+
include("test_copymethods.jl")
51+
end
52+
53+
@testset "Updates" begin
54+
include("test_updates.jl")
55+
end
56+
57+
@testset "Assembly" begin
58+
include("test_assembly.jl")
59+
end
60+
61+
@testset "Construction timings" begin
62+
include("test_timings.jl")
63+
end
64+
65+
@testset "Operations" begin
66+
include("test_operations.jl")
67+
end
68+
69+
@testset "fdrand" begin
70+
include("test_fdrand.jl")
71+
end
72+
73+
@testset "Backslash" begin
74+
include("test_backslash.jl")
75+
end
76+
77+
@testset "Dirichlet" begin
78+
include("test_dirichlet.jl")
79+
end
80+
81+
@testset "LinearSolve" begin
82+
include("test_linearsolve.jl")
83+
end
84+
85+
@testset "Preconditioners" begin
86+
include("test_preconditioners.jl")
87+
end
88+
89+
@testset "Symmetric" begin
90+
include("test_symmetric.jl")
91+
end
92+
93+
@testset "ExtendableSparse.LUFactorization" begin
94+
include("test_default_lu.jl")
95+
end
96+
97+
@testset "Sparspak" begin
98+
include("test_sparspak.jl")
99+
end
100+
101+
if ExtendableSparse.USE_GPL_LIBS
102+
@testset "Cholesky" begin
103+
include("test_default_cholesky.jl")
104+
end
105+
end
106+
107+
@testset "block" begin
108+
include("test_block.jl")
109+
end
110+
111+
#@testset "parilu0" begin include("test_parilu0.jl") end
112+
113+
114+
# @testset "mkl-pardiso" begin if !Sys.isapple()
115+
# include("test_mklpardiso.jl")
116+
# end end
117+
118+
119+
# if Pardiso.PARDISO_LOADED[]
120+
# @testset "pardiso" begin include("test_pardiso.jl") end
121+
# end

‎test/runtests.jl

Lines changed: 1 addition & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,2 @@
11
using Test
2-
using LinearAlgebra
3-
using SparseArrays
4-
using ExtendableSparse
5-
#using ExtendableSparse.Experimental
6-
using Printf
7-
using BenchmarkTools
8-
9-
using MultiFloats
10-
using ForwardDiff
11-
using ExplicitImports
12-
13-
@testset "ExplicitImports" begin
14-
@test ExplicitImports.check_no_implicit_imports(ExtendableSparse) === nothing
15-
@test ExplicitImports.check_no_stale_explicit_imports(ExtendableSparse) === nothing
16-
end
17-
18-
@testset "Parallel" begin
19-
include("test_parallel.jl")
20-
21-
for Tm in [STExtendableSparseMatrixCSC, MTExtendableSparseMatrixCSC, ExtendableSparseMatrix]
22-
for N in [10000, 20000]
23-
test_parallel.test_correctness_build_seq(N, Tm, dim = 2)
24-
end
25-
end
26-
27-
for Tm in [MTExtendableSparseMatrixCSC]
28-
for N in [10000, 20000]
29-
test_parallel.test_correctness_update(N, Tm, dim = 2)
30-
test_parallel.test_correctness_build(N, Tm, dim = 2)
31-
test_parallel.test_correctness_mul(N, Tm, dim = 2)
32-
end
33-
end
34-
end
35-
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
44-
45-
46-
@testset "Constructors" begin
47-
include("test_constructors.jl")
48-
end
49-
50-
@testset "Copy-Methods" begin
51-
include("test_copymethods.jl")
52-
end
53-
54-
@testset "Updates" begin
55-
include("test_updates.jl")
56-
end
57-
58-
@testset "Assembly" begin
59-
include("test_assembly.jl")
60-
end
61-
62-
@testset "Construction timings" begin
63-
include("test_timings.jl")
64-
end
65-
66-
@testset "Operations" begin
67-
include("test_operations.jl")
68-
end
69-
70-
@testset "fdrand" begin
71-
include("test_fdrand.jl")
72-
end
73-
74-
@testset "Backslash" begin
75-
include("test_backslash.jl")
76-
end
77-
78-
@testset "Dirichlet" begin
79-
include("test_dirichlet.jl")
80-
end
81-
82-
@testset "LinearSolve" begin
83-
include("test_linearsolve.jl")
84-
end
85-
86-
@testset "Preconditioners" begin
87-
include("test_preconditioners.jl")
88-
end
89-
90-
@testset "Symmetric" begin
91-
include("test_symmetric.jl")
92-
end
93-
94-
@testset "ExtendableSparse.LUFactorization" begin
95-
include("test_default_lu.jl")
96-
end
97-
98-
@testset "Sparspak" begin
99-
include("test_sparspak.jl")
100-
end
101-
102-
if ExtendableSparse.USE_GPL_LIBS
103-
@testset "Cholesky" begin
104-
include("test_default_cholesky.jl")
105-
end
106-
end
107-
108-
@testset "block" begin
109-
include("test_block.jl")
110-
end
111-
112-
#@testset "parilu0" begin include("test_parilu0.jl") end
113-
114-
115-
# @testset "mkl-pardiso" begin if !Sys.isapple()
116-
# include("test_mklpardiso.jl")
117-
# end end
118-
119-
120-
# if Pardiso.PARDISO_LOADED[]
121-
# @testset "pardiso" begin include("test_pardiso.jl") end
122-
# end
2+
include("alltests.jl")

0 commit comments

Comments
 (0)