Skip to content

test: Don't use GPL module when Base.USE_GPL_LIBS=false #535

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
ViralBShah merged 6 commits into from
May 25, 2024
Merged

test: Don't use GPL module when Base.USE_GPL_LIBS=false #535

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f90a49
test: Don't use GPL module when Base.USE_GPL_LIBS=false
inkydragon Apr 25, 2024
dcce029
Merge branch 'main' into no-gpl
inkydragon May 4, 2024
78c865b
test: use static if
inkydragon May 5, 2024
57a0cf8
test: using Test first
inkydragon May 5, 2024
c7c9bc3
Apply suggestions from code review
inkydragon May 23, 2024
4098ca4
Update test/spqr.jl
inkydragon May 23, 2024
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
8 changes: 5 additions & 3 deletions test/cholmod.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +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"
Comment thread
inkydragon marked this conversation as resolved.
Outdated
Comment thread
inkydragon marked this conversation as resolved.
Outdated
else

using SparseArrays.CHOLMOD
using SparseArrays.CHOLMOD: getcommon
using Random
Expand All @@ -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)
Expand Down
8 changes: 5 additions & 3 deletions test/linalg_solvers.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# 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"
Comment thread
inkydragon marked this conversation as resolved.
Outdated
else

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]
Expand Down
8 changes: 6 additions & 2 deletions test/spqr.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
# 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"
Comment thread
inkydragon marked this conversation as resolved.
Outdated
else

using SparseArrays.SPQR
using SparseArrays.CHOLMOD
using LinearAlgebra: I, istriu, norm, qr, rank, rmul!, lmul!, Adjoint, Transpose, ColumnNorm, RowMaximum, NoPivot
using SparseArrays: SparseArrays, sparse, sprandn, spzeros, SparseMatrixCSC
using Random: seed!

# TODO REMOVE SECOND PREDICATE WITH SS7.1
Comment thread
inkydragon marked this conversation as resolved.
Outdated
if Base.USE_GPL_LIBS

@testset "Sparse QR" begin
m, n = 100, 10
nn = 100
Expand Down
8 changes: 6 additions & 2 deletions test/umfpack.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
# 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"
Comment thread
inkydragon marked this conversation as resolved.
Outdated
else

using Random
using SparseArrays
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)
Expand Down