Skip to content

Commit 9f0bcff

Browse files
authored
Merge pull request #948 from JuliaControl/nopoly
remove use of `Polyester.@batch` due to segfault
2 parents 40a14eb + 49f93ac commit 9f0bcff

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

lib/ControlSystemsBase/Project.toml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1313
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
1414
MatrixEquations = "99c1a7ee-ab34-5fd5-8076-27c950a045f4"
1515
MatrixPencils = "48965c70-4690-11ea-1f13-43a2532b2fa8"
16-
Polyester = "f517fe37-dbe3-4b94-8317-1923a5111588"
1716
Polynomials = "f27b6e38-b328-58d1-80ce-0feddd5e7a45"
1817
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
1918
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
@@ -37,20 +36,19 @@ ForwardDiff = "0.10"
3736
ImplicitDifferentiation = "0.4.2"
3837
IterTools = "1.0"
3938
LaTeXStrings = "1.0"
39+
LinearAlgebra = "<0.0.1, 1"
4040
MacroTools = "0.5"
4141
MatrixEquations = "1, 2.1"
4242
MatrixPencils = "1.6"
43-
Polyester = "0.6, 0.7"
4443
Polynomials = "3.0, 4.0"
4544
PrecompileTools = "1"
46-
RecipesBase = "1"
47-
StaticArraysCore = "1"
48-
julia = "1.6"
49-
LinearAlgebra = "<0.0.1, 1"
5045
Printf = "<0.0.1, 1"
5146
Random = "<0.0.1, 1"
52-
UUIDs = "<0.0.1, 1"
47+
RecipesBase = "1"
5348
SparseArrays = "<0.0.1, 1"
49+
StaticArraysCore = "1"
50+
UUIDs = "<0.0.1, 1"
51+
julia = "1.6"
5452

5553
[extras]
5654
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"

lib/ControlSystemsBase/src/ControlSystemsBase.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ import MatrixPencils
146146
using MacroTools
147147
using MatrixEquations
148148
using UUIDs # to load Plots in gangoffourplot
149-
using StaticArraysCore, Polyester
149+
using StaticArraysCore
150150

151151
abstract type AbstractSystem end
152152

lib/ControlSystemsBase/src/types/staticsystems.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ end
216216
te = sys.timeevol
217217

218218
let R=R, A=A, B=B, C=C, D=D, te=te
219-
@inbounds Polyester.@batch for i in eachindex(w_vec)
219+
@inbounds Threads.@threads :static for i in eachindex(w_vec)
220220
Ri = @views R[:,:,i]
221221
copyto!(Ri,D) # start with the D-matrix
222222
isinf(w_vec[i]) && continue

lib/ControlSystemsBase/test/test_staticsystems.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ syss = StaticStateSpace(ssrand(1,1,5,proper=false))
148148
sys = ss(syss)
149149

150150
freqresp_nohess!(R, syss, w) # precompile
151-
@test @allocated(freqresp_nohess!(R, syss, w)) == 0
151+
# @test @allocated(freqresp_nohess!(R, syss, w)) == 0 # This used to hold with Polyester.@batch, but Polyester sometimes segfaulted when used with ForwardDiff
152+
@test @allocated(freqresp_nohess!(R, syss, w)) < 20000
152153

153154
@test freqresp_nohess!(R, syss, w) freqresp(ss(syss), w)
154155

0 commit comments

Comments
 (0)