From 5f90a49f8ec1b820da67839bf9c5bf551b60cfdf Mon Sep 17 00:00:00 2001 From: Chengyu HAN Date: Wed, 24 Apr 2024 21:24:21 -0500 Subject: [PATCH 1/5] test: Don't use GPL module when Base.USE_GPL_LIBS=false --- test/cholmod.jl | 6 ++++-- test/linalg_solvers.jl | 6 ++++-- test/spqr.jl | 6 +++++- test/umfpack.jl | 6 +++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/test/cholmod.jl b/test/cholmod.jl index e025119a..d47409da 100644 --- a/test/cholmod.jl +++ b/test/cholmod.jl @@ -2,6 +2,10 @@ module CHOLMODTests +if !Base.USE_GPL_LIBS + @info "Not use GPL libs, Skipping CHOLMOD Tests" +else + using Test using SparseArrays.CHOLMOD using SparseArrays.CHOLMOD: getcommon @@ -16,8 +20,6 @@ using SparseArrays: getcolptr using SparseArrays.LibSuiteSparse using SparseArrays.LibSuiteSparse: cholmod_l_allocate_sparse, cholmod_allocate_sparse -if Base.USE_GPL_LIBS - # CHOLMOD tests itypes = sizeof(Int) == 4 ? (Int32,) : (Int32, Int64) for Ti ∈ itypes, Tv ∈ (Float32, Float64) diff --git a/test/linalg_solvers.jl b/test/linalg_solvers.jl index f8a758c7..96454c44 100644 --- a/test/linalg_solvers.jl +++ b/test/linalg_solvers.jl @@ -2,13 +2,15 @@ module SparseLinalgSolversTests +if !Base.USE_GPL_LIBS + @info "Not use GPL libs, Skipping SparseLinalgSolvers Tests" +else + using Test using SparseArrays using Random using LinearAlgebra -if Base.USE_GPL_LIBS - @testset "explicit zeros" begin a = SparseMatrixCSC(2, 2, [1, 3, 5], [1, 2, 1, 2], [1.0, 0.0, 0.0, 1.0]) @test lu(a)\[2.0, 3.0] ≈ [2.0, 3.0] diff --git a/test/spqr.jl b/test/spqr.jl index 16a72eef..dbb6cc77 100644 --- a/test/spqr.jl +++ b/test/spqr.jl @@ -2,6 +2,10 @@ module SPQRTests +if !Base.USE_GPL_LIBS + @info "Not use GPL libs, Skipping SPQR Tests" +else + using Test using SparseArrays.SPQR using SparseArrays.CHOLMOD @@ -10,7 +14,7 @@ using SparseArrays: SparseArrays, sparse, sprandn, spzeros, SparseMatrixCSC using Random: seed! # TODO REMOVE SECOND PREDICATE WITH SS7.1 -if Base.USE_GPL_LIBS + @testset "Sparse QR" begin m, n = 100, 10 nn = 100 diff --git a/test/umfpack.jl b/test/umfpack.jl index ba65e1b2..d01358c4 100644 --- a/test/umfpack.jl +++ b/test/umfpack.jl @@ -2,6 +2,10 @@ module UMFPACKTests +if !Base.USE_GPL_LIBS + @info "Not use GPL libs, Skipping UMFPACK Tests" +else + using Test using Random using SparseArrays @@ -9,7 +13,7 @@ using Serialization using LinearAlgebra: LinearAlgebra, I, det, issuccess, ldiv!, lu, lu!, Transpose, SingularException, Diagonal, logabsdet using SparseArrays: nnz, sparse, sprand, sprandn, SparseMatrixCSC, UMFPACK, increment! -if Base.USE_GPL_LIBS + function umfpack_report(l::UMFPACK.UmfpackLU) UMFPACK.umfpack_report_numeric(l, 0) UMFPACK.umfpack_report_symbolic(l, 0) From 78c865b9d6c975960500ed5a2a0f14cb4f3bf397 Mon Sep 17 00:00:00 2001 From: Chengyu HAN Date: Sun, 5 May 2024 13:13:52 -0500 Subject: [PATCH 2/5] test: use static if --- test/cholmod.jl | 2 +- test/linalg_solvers.jl | 2 +- test/spqr.jl | 2 +- test/umfpack.jl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cholmod.jl b/test/cholmod.jl index d47409da..9c8208d9 100644 --- a/test/cholmod.jl +++ b/test/cholmod.jl @@ -2,7 +2,7 @@ module CHOLMODTests -if !Base.USE_GPL_LIBS +@static if !Base.USE_GPL_LIBS @info "Not use GPL libs, Skipping CHOLMOD Tests" else diff --git a/test/linalg_solvers.jl b/test/linalg_solvers.jl index 96454c44..c49cb795 100644 --- a/test/linalg_solvers.jl +++ b/test/linalg_solvers.jl @@ -2,7 +2,7 @@ module SparseLinalgSolversTests -if !Base.USE_GPL_LIBS +@static if !Base.USE_GPL_LIBS @info "Not use GPL libs, Skipping SparseLinalgSolvers Tests" else diff --git a/test/spqr.jl b/test/spqr.jl index dbb6cc77..d7d5ce4e 100644 --- a/test/spqr.jl +++ b/test/spqr.jl @@ -2,7 +2,7 @@ module SPQRTests -if !Base.USE_GPL_LIBS +@static if !Base.USE_GPL_LIBS @info "Not use GPL libs, Skipping SPQR Tests" else diff --git a/test/umfpack.jl b/test/umfpack.jl index d01358c4..8f41df83 100644 --- a/test/umfpack.jl +++ b/test/umfpack.jl @@ -2,7 +2,7 @@ module UMFPACKTests -if !Base.USE_GPL_LIBS +@static if !Base.USE_GPL_LIBS @info "Not use GPL libs, Skipping UMFPACK Tests" else From 57a0cf875fdb6b99919e4d91f45a4a4955f22cf7 Mon Sep 17 00:00:00 2001 From: Chengyu HAN Date: Sun, 5 May 2024 13:16:45 -0500 Subject: [PATCH 3/5] test: using Test first --- test/cholmod.jl | 2 +- test/linalg_solvers.jl | 2 +- test/spqr.jl | 2 +- test/umfpack.jl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cholmod.jl b/test/cholmod.jl index 9c8208d9..604491dc 100644 --- a/test/cholmod.jl +++ b/test/cholmod.jl @@ -1,12 +1,12 @@ # This file is a part of Julia. License is MIT: https://julialang.org/license module CHOLMODTests +using Test @static if !Base.USE_GPL_LIBS @info "Not use GPL libs, Skipping CHOLMOD Tests" else -using Test using SparseArrays.CHOLMOD using SparseArrays.CHOLMOD: getcommon using Random diff --git a/test/linalg_solvers.jl b/test/linalg_solvers.jl index c49cb795..8ea66d63 100644 --- a/test/linalg_solvers.jl +++ b/test/linalg_solvers.jl @@ -1,12 +1,12 @@ # This file is a part of Julia. License is MIT: https://julialang.org/license module SparseLinalgSolversTests +using Test @static if !Base.USE_GPL_LIBS @info "Not use GPL libs, Skipping SparseLinalgSolvers Tests" else -using Test using SparseArrays using Random using LinearAlgebra diff --git a/test/spqr.jl b/test/spqr.jl index d7d5ce4e..49259a7a 100644 --- a/test/spqr.jl +++ b/test/spqr.jl @@ -1,12 +1,12 @@ # This file is a part of Julia. License is MIT: https://julialang.org/license module SPQRTests +using Test @static if !Base.USE_GPL_LIBS @info "Not use GPL libs, Skipping SPQR Tests" else -using Test using SparseArrays.SPQR using SparseArrays.CHOLMOD using LinearAlgebra: I, istriu, norm, qr, rank, rmul!, lmul!, Adjoint, Transpose, ColumnNorm, RowMaximum, NoPivot diff --git a/test/umfpack.jl b/test/umfpack.jl index 8f41df83..0ed531c7 100644 --- a/test/umfpack.jl +++ b/test/umfpack.jl @@ -1,12 +1,12 @@ # This file is a part of Julia. License is MIT: https://julialang.org/license module UMFPACKTests +using Test @static if !Base.USE_GPL_LIBS @info "Not use GPL libs, Skipping UMFPACK Tests" else -using Test using Random using SparseArrays using Serialization From c7c9bc37c193a546e004930b3f084a0bfd891e5e Mon Sep 17 00:00:00 2001 From: inky Date: Thu, 23 May 2024 18:55:01 -0500 Subject: [PATCH 4/5] Apply suggestions from code review --- test/cholmod.jl | 2 +- test/linalg_solvers.jl | 2 +- test/spqr.jl | 2 +- test/umfpack.jl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cholmod.jl b/test/cholmod.jl index 604491dc..108b0ff8 100644 --- a/test/cholmod.jl +++ b/test/cholmod.jl @@ -4,7 +4,7 @@ module CHOLMODTests using Test @static if !Base.USE_GPL_LIBS - @info "Not use GPL libs, Skipping CHOLMOD Tests" + @info "This Julia build excludes the use of SuiteSparse GPL libraries. Skipping CHOLMOD tests" else using SparseArrays.CHOLMOD diff --git a/test/linalg_solvers.jl b/test/linalg_solvers.jl index 8ea66d63..b59659b4 100644 --- a/test/linalg_solvers.jl +++ b/test/linalg_solvers.jl @@ -4,7 +4,7 @@ module SparseLinalgSolversTests using Test @static if !Base.USE_GPL_LIBS - @info "Not use GPL libs, Skipping SparseLinalgSolvers Tests" + @info "This Julia build excludes the use of SuiteSparse GPL libraries. Skipping SparseLinalgSolvers Tests" else using SparseArrays diff --git a/test/spqr.jl b/test/spqr.jl index 49259a7a..0a7e000d 100644 --- a/test/spqr.jl +++ b/test/spqr.jl @@ -4,7 +4,7 @@ module SPQRTests using Test @static if !Base.USE_GPL_LIBS - @info "Not use GPL libs, Skipping SPQR Tests" + @info "This Julia build excludes the use of SuiteSparse GPL libraries. Skipping SPQR Tests" else using SparseArrays.SPQR diff --git a/test/umfpack.jl b/test/umfpack.jl index 0ed531c7..b4bdd588 100644 --- a/test/umfpack.jl +++ b/test/umfpack.jl @@ -4,7 +4,7 @@ module UMFPACKTests using Test @static if !Base.USE_GPL_LIBS - @info "Not use GPL libs, Skipping UMFPACK Tests" + @info "This Julia build excludes the use of SuiteSparse GPL libraries. Skipping UMFPACK Tests" else using Random From 4098ca40f9436f3829b02d74a2c70103e8f4f1da Mon Sep 17 00:00:00 2001 From: inky Date: Thu, 23 May 2024 18:55:32 -0500 Subject: [PATCH 5/5] Update test/spqr.jl --- test/spqr.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/test/spqr.jl b/test/spqr.jl index 0a7e000d..b3d895c3 100644 --- a/test/spqr.jl +++ b/test/spqr.jl @@ -13,7 +13,6 @@ using LinearAlgebra: I, istriu, norm, qr, rank, rmul!, lmul!, Adjoint, Transpose using SparseArrays: SparseArrays, sparse, sprandn, spzeros, SparseMatrixCSC using Random: seed! -# TODO REMOVE SECOND PREDICATE WITH SS7.1 @testset "Sparse QR" begin m, n = 100, 10