Skip to content

Revised and cleaned testing environment #55

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Mar 30, 2025
Merged

Revised and cleaned testing environment #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a156022
cleaned up testing environment
Da-Be-Ru Mar 26, 2025
5a99a13
fix code quality for Project.toml
Da-Be-Ru Mar 26, 2025
3c8cc75
Refactor tests to allow working with ReTest
j-fu Mar 28, 2025
87fb763
version bump due to compat fix with LinearSolve
Da-Be-Ru Mar 28, 2025
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
53 changes: 48 additions & 5 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
name = "ExtendableSparse"
uuid = "95c220a8-a1cf-11e9-0c77-dbfce5f500b3"
authors = ["Juergen Fuhrmann <[email protected]>"]
version = "1.7.0"
authors = ["Juergen Fuhrmann <[email protected]>", "Daniel Runge"]
version = "1.7.1"

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

[extras]
AMGCLWrap = "4f76b812-4ba5-496d-b042-d70715554288"
AlgebraicMultigrid = "2169fc97-5a83-5252-b627-83903c6c433c"
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
ChunkSplitters = "ae650224-84b6-46f8-82ea-d812ca08434e"
ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7"
ExtendableGrids = "cfc395e8-590f-11e8-1f13-43a2532b2fa8"
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
IncompleteLU = "40713840-3770-5561-ab4c-a76e7d0d7895"
IterativeSolvers = "42fd0dbc-a981-5370-80f2-aaf504508153"
LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
Metis = "2679e427-3c69-5b7f-982b-ece356f1e94b"
MultiFloats = "bdf0d083-296b-4888-a5b6-7498122e68a5"
OhMyThreads = "67456a42-1dca-4109-a031-0a68de7e3ad5"
Pardiso = "46dd5b70-b6fb-5a00-ae2d-e8fea33afaf2"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
RecursiveFactorization = "f2c3362d-daeb-58d1-803e-2bc74f2840b4"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
AMGCLWrap = "2"
AlgebraicMultigrid = "0.4, 0.5, 0.6"
AlgebraicMultigrid = "0.4, 0.5, 0.6, 1"
DocStringExtensions = "0.8, 0.9"
ExtendableGrids = "1.9"
ILUZero = "0.2"
IncompleteLU = "^0.2.1"
LinearSolve = "2.36.0, 3"
IterativeSolvers = "0.9"
LinearSolve = "2.36.0, 3.7.1"
Pardiso = "0.5.1, 1"
Sparspak = "0.3.6"
StaticArrays = "1.5.24"
julia = "1.9"

[targets]
test = [
"AMGCLWrap",
"AlgebraicMultigrid",
"Aqua",
"BenchmarkTools",
"ChunkSplitters",
"ExplicitImports",
"ExtendableGrids",
"ForwardDiff",
"IncompleteLU",
"IterativeSolvers",
"LinearSolve",
"Metis",
"MultiFloats",
"OhMyThreads",
"Pardiso",
"Random",
"RecursiveFactorization",
"Test",
]
6 changes: 6 additions & 0 deletions test/ExtendableSparseReTest.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# See https://wias-pdelib.github.io/VoronoiFVM.jl/dev/devel/#ReTest

module ExtendableSparseReTest
using ReTest
include("alltests.jl")
end
29 changes: 0 additions & 29 deletions test/Project.toml
View file
Open in desktop

This file was deleted.

121 changes: 121 additions & 0 deletions test/alltests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
using LinearAlgebra
using SparseArrays
using ExtendableSparse
#using ExtendableSparse.Experimental
using Printf
using BenchmarkTools

using MultiFloats
using ForwardDiff
using ExplicitImports

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

@testset "Parallel" begin
include("test_parallel.jl")

for Tm in [STExtendableSparseMatrixCSC, MTExtendableSparseMatrixCSC, ExtendableSparseMatrix]
for N in [10000, 20000]
test_parallel.test_correctness_build_seq(N, Tm, dim = 2)
end
end

for Tm in [MTExtendableSparseMatrixCSC]
for N in [10000, 20000]
test_parallel.test_correctness_update(N, Tm, dim = 2)
test_parallel.test_correctness_build(N, Tm, dim = 2)
test_parallel.test_correctness_mul(N, Tm, dim = 2)
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

@testset "Copy-Methods" begin
include("test_copymethods.jl")
end

@testset "Updates" begin
include("test_updates.jl")
end

@testset "Assembly" begin
include("test_assembly.jl")
end

@testset "Construction timings" begin
include("test_timings.jl")
end

@testset "Operations" begin
include("test_operations.jl")
end

@testset "fdrand" begin
include("test_fdrand.jl")
end

@testset "Backslash" begin
include("test_backslash.jl")
end

@testset "Dirichlet" begin
include("test_dirichlet.jl")
end

@testset "LinearSolve" begin
include("test_linearsolve.jl")
end

@testset "Preconditioners" begin
include("test_preconditioners.jl")
end

@testset "Symmetric" begin
include("test_symmetric.jl")
end

@testset "ExtendableSparse.LUFactorization" begin
include("test_default_lu.jl")
end

@testset "Sparspak" begin
include("test_sparspak.jl")
end

if ExtendableSparse.USE_GPL_LIBS
@testset "Cholesky" begin
include("test_default_cholesky.jl")
end
end

@testset "block" begin
include("test_block.jl")
end

#@testset "parilu0" begin include("test_parilu0.jl") end


# @testset "mkl-pardiso" begin if !Sys.isapple()
# include("test_mklpardiso.jl")
# end end


# if Pardiso.PARDISO_LOADED[]
# @testset "pardiso" begin include("test_pardiso.jl") end
# end
122 changes: 1 addition & 121 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,122 +1,2 @@
using Test
using LinearAlgebra
using SparseArrays
using ExtendableSparse
#using ExtendableSparse.Experimental
using Printf
using BenchmarkTools

using MultiFloats
using ForwardDiff
using ExplicitImports

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

@testset "Parallel" begin
include("test_parallel.jl")

for Tm in [STExtendableSparseMatrixCSC, MTExtendableSparseMatrixCSC, ExtendableSparseMatrix]
for N in [10000, 20000]
test_parallel.test_correctness_build_seq(N, Tm, dim = 2)
end
end

for Tm in [MTExtendableSparseMatrixCSC]
for N in [10000, 20000]
test_parallel.test_correctness_update(N, Tm, dim = 2)
test_parallel.test_correctness_build(N, Tm, dim = 2)
test_parallel.test_correctness_mul(N, Tm, dim = 2)
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

@testset "Copy-Methods" begin
include("test_copymethods.jl")
end

@testset "Updates" begin
include("test_updates.jl")
end

@testset "Assembly" begin
include("test_assembly.jl")
end

@testset "Construction timings" begin
include("test_timings.jl")
end

@testset "Operations" begin
include("test_operations.jl")
end

@testset "fdrand" begin
include("test_fdrand.jl")
end

@testset "Backslash" begin
include("test_backslash.jl")
end

@testset "Dirichlet" begin
include("test_dirichlet.jl")
end

@testset "LinearSolve" begin
include("test_linearsolve.jl")
end

@testset "Preconditioners" begin
include("test_preconditioners.jl")
end

@testset "Symmetric" begin
include("test_symmetric.jl")
end

@testset "ExtendableSparse.LUFactorization" begin
include("test_default_lu.jl")
end

@testset "Sparspak" begin
include("test_sparspak.jl")
end

if ExtendableSparse.USE_GPL_LIBS
@testset "Cholesky" begin
include("test_default_cholesky.jl")
end
end

@testset "block" begin
include("test_block.jl")
end

#@testset "parilu0" begin include("test_parilu0.jl") end


# @testset "mkl-pardiso" begin if !Sys.isapple()
# include("test_mklpardiso.jl")
# end end


# if Pardiso.PARDISO_LOADED[]
# @testset "pardiso" begin include("test_pardiso.jl") end
# end
include("alltests.jl")
Loading