Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ authors = ["Tobias Knopp <tobias.knopp@tuhh.de> and contributors"]
version = "2.3.2"

[deps]
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
OhMyThreads = "67456a42-1dca-4109-a031-0a68de7e3ad5"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
LinearOperators = "5c8ed15e-5a4c-59e4-a42b-c7e8811fb125"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"

[extras]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
JLArrays = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb"
NonuniformFFTs = "cd96f58b-6017-4a02-bb9e-f4d81626177f"
Expand All @@ -22,18 +23,24 @@ FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
RadonKA = "86de8297-835b-47df-b249-c04e8db91db5"

[compat]
Aqua = "0.8"
julia = "1.9"
GPUArrays = "11"
InteractiveUtils = "1"
KernelAbstractions = "0.9"
JLArrays = "0.2"
AbstractNFFTs = "0.9"
LinearAlgebra = "1"
LinearOperators = "2"
OhMyThreads = "0.8"
NonuniformFFTs = "0.9"
NFFT = "0.14"
RadonKA = "0.6"
Random = "1"
Wavelets = "0.9, 0.10"
Reexport = "1.0"
SparseArrays = "1"
Test = "1"
FFTW = "1.0"

[weakdeps]
Expand All @@ -47,7 +54,7 @@ FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
RadonKA = "86de8297-835b-47df-b249-c04e8db91db5"

[targets]
test = ["Test", "FFTW", "Wavelets", "NFFT", "NonuniformFFTs", "JLArrays", "RadonKA"]
test = ["Test", "Aqua", "FFTW", "Wavelets", "NFFT", "NonuniformFFTs", "JLArrays", "RadonKA"]

[extensions]
LinearOperatorNFFTExt = ["AbstractNFFTs", "FFTW"]
Expand Down
2 changes: 0 additions & 2 deletions src/LinearOperatorCollection.jl
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ using Reexport
@reexport using LinearOperators
using OhMyThreads

LinearOperators.use_prod5!(op::opEye) = false
LinearOperators.has_args5(op::opEye) = false

# Helper function to wrap a prod into a 5-args mul
function wrapProd(prod::Function)
Expand Down
4 changes: 0 additions & 4 deletions src/ProdOp.jl
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ function Base.copy(S::ProdOp{T}) where T
return ProdOp(A,B)
end

Base.:*(::Type{<:ProdOp}, A, B) = ProdOp(A, B)
Base.:*(::Type{<:ProdOp}, A, args...) = ProdOp(A, *(ProdOp, args...))
Base.:∘(A::AbstractLinearOperator, B::AbstractLinearOperator) = ProdOp(A, B)

storage_type(op::ProdOp) = typeof(op.Mv5)

mutable struct ProdNormalOp{T,S,U,V <: AbstractVector{T}} <: AbstractLinearOperator{T}
Expand Down
1 change: 1 addition & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ areTypesDefined = @isdefined arrayTypes
arrayTypes = areTypesDefined ? arrayTypes : [Array] #, JLArray]

@testset "LinearOperatorCollection" begin
include("testAqua.jl")
include("testNormalOp.jl")
include("testOperators.jl")
end
2 changes: 2 additions & 0 deletions test/testAqua.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
using Aqua
Aqua.test_all(LinearOperatorCollection)
Loading