Skip to content

Commit a327c2d

Browse files
committed
Remove OhMyThreads dependency
As long this would just amount to writing @tasks instead of @threads its seems it provides no difference. So we decrease the "attack surface" Nevertheless that Package is a great resource of know-how...
1 parent 33ced7b commit a327c2d

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

Project.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
name = "ExtendableSparse"
22
uuid = "95c220a8-a1cf-11e9-0c77-dbfce5f500b3"
33
authors = ["Juergen Fuhrmann <juergen.fuhrmann@wias-berlin.de>"]
4-
version = "1.5.0"
4+
version = "1.5.1"
55

66
[deps]
77
AMGCLWrap = "4f76b812-4ba5-496d-b042-d70715554288"
88
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
99
ILUZero = "88f59080-6952-5380-9ea5-54057fb9a43f"
1010
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
11-
OhMyThreads = "67456a42-1dca-4109-a031-0a68de7e3ad5"
1211
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
1312
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1413
Sparspak = "e56a9233-b9d6-4f03-8d0f-1825330902ac"
@@ -34,7 +33,6 @@ AlgebraicMultigrid = "0.4,0.5,0.6"
3433
DocStringExtensions = "0.8, 0.9"
3534
ILUZero = "0.2"
3635
IncompleteLU = "^0.2.1"
37-
OhMyThreads = "0.5.3"
3836
Pardiso = "0.5.1"
3937
Sparspak = "0.3.6"
4038
StaticArrays = "1.5.24"

src/ExtendableSparse.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ module ExtendableSparse
22

33
using DocStringExtensions: DocStringExtensions, SIGNATURES, TYPEDEF,TYPEDFIELDS
44
using ILUZero: ILUZero, ldiv!, nnz
5-
using OhMyThreads: @tasks
65
using LinearAlgebra: LinearAlgebra, Diagonal, Hermitian, Symmetric, Tridiagonal,
76
cholesky, cholesky!, convert, lu!, mul!, norm, transpose
87
using SparseArrays: SparseArrays, AbstractSparseMatrix, SparseMatrixCSC,

src/experimental/Experimental.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ using ExtendableSparse: AbstractExtendableSparseMatrixCSC, AbstractSparseMatrix
99
using DocStringExtensions
1010
using Metis
1111
using Base.Threads
12-
using OhMyThreads: @tasks
1312
import ExtendableSparse: factorize!, update!, partitioning!
1413

1514
include(joinpath(@__DIR__, "ExtendableSparseMatrixParallel", "ExtendableSparseParallel.jl"))

src/factorizations/blockpreconditioner.jl

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function update!(precon::BlockPreconditioner)
4949

5050
np=length(precon.partitioning)
5151
precon.facts=Vector{Any}(undef,np)
52-
@tasks for ipart=1:np
52+
Threads.@threads for ipart=1:np
5353
factorization=deepcopy(precon.factorization)
5454
AP=precon.A[precon.partitioning[ipart],precon.partitioning[ipart]]
5555
FP=factorization(AP)
@@ -66,11 +66,11 @@ function LinearAlgebra.ldiv!(p::BlockPreconditioner,v)
6666
np=length(partitioning)
6767

6868
if allow_views(p.factorization)
69-
@tasks for ipart=1:np
69+
Threads.@threads for ipart=1:np
7070
ldiv!(facts[ipart],view(v,partitioning[ipart]))
7171
end
7272
else
73-
@tasks for ipart=1:np
73+
Threads.@threads for ipart=1:np
7474
vv=v[partitioning[ipart]]
7575
ldiv!(facts[ipart],vv)
7676
view(v,partitioning[ipart]).=vv
@@ -83,13 +83,12 @@ function LinearAlgebra.ldiv!(u,p::BlockPreconditioner,v)
8383
partitioning=p.partitioning
8484
facts=p.facts
8585
np=length(partitioning)
86-
87-
if allow_views(p.factorization)
88-
@tasks for ipart=1:np
86+
if allow_views(p.factorization)
87+
Threads.@threads for ipart=1:np
8988
ldiv!(view(u,partitioning[ipart]),facts[ipart],view(v,partitioning[ipart]))
9089
end
9190
else
92-
@tasks for ipart=1:np
91+
Threads.@threads for ipart=1:np
9392
uu=u[partitioning[ipart]]
9493
ldiv!(uu,facts[ipart],v[partitioning[ipart]])
9594
view(u,partitioning[ipart]).=uu

src/matrix/genericmtextendablesparsematrixcsc.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ function LinearAlgebra.mul!(r, ext::GenericMTExtendableSparseMatrixCSC, x)
131131
r.=zero(eltype(ext))
132132
m,n=size(A)
133133
for icol=1:length(colparts)-1
134-
@tasks for ip in colparts[icol]:colparts[icol+1]-1
134+
Threads.@threads for ip in colparts[icol]:colparts[icol+1]-1
135135
@inbounds for inode in partnodes[ip]:partnodes[ip+1]-1
136136
@inbounds for i in nzrange(A,inode)
137137
r[rows[i]]+=vals[i]*x[inode]

0 commit comments

Comments
 (0)