Skip to content

Commit 56e2685

Browse files
Merge pull request #798 from JuliaSymbolics/as/more-fixes
fix: fix bugs
2 parents 1923e4d + 70677a5 commit 56e2685

32 files changed

+4024
-649
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
matrix:
2121
version:
2222
- 'min'
23+
- '1.11' # to test inference
2324
- '1'
2425
fail-fast: false
2526
steps:

Project.toml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ReadOnlyArrays = "988b38a3-91fc-5605-94a2-ee2116b3bd83"
2525
Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
2626
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
2727
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
28-
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
28+
StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
2929
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
3030
TaskLocalValues = "ed4db957-447d-4319-bfb6-7fa9ae7ecf34"
3131
TermInterface = "8ea1fca8-c5ef-4a55-8b96-4e9afe9c9a3c"
@@ -67,9 +67,11 @@ ReadOnlyArrays = "0.2.0"
6767
ReverseDiff = "1"
6868
RuntimeGeneratedFunctions = "0.5.13"
6969
Setfield = "0.7, 0.8, 1"
70+
SnoopCompileCore = "3.0.0"
7071
SparseArrays = "1"
7172
SpecialFunctions = "0.10, 1.0, 2"
72-
StaticArrays = "0.12, 1.0"
73+
StaticArrays = "1.0"
74+
StaticArraysCore = "1.4.3"
7375
SymbolicIndexingInterface = "0.3"
7476
TaskLocalValues = "0.1.2"
7577
TermInterface = "2.0"
@@ -88,8 +90,11 @@ ReferenceTests = "324d217c-45ce-50fc-942e-d289b448e8cf"
8890
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
8991
RuntimeGeneratedFunctions = "7e49a35a-f44a-4d26-94aa-eba1b4ca6b47"
9092
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
93+
SnoopCompile = "aa65fe97-06da-5843-b5b1-d5d13cad87d2"
94+
SnoopCompileCore = "e2b509da-e806-4183-be48-004708413034"
95+
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
9196
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
9297
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
9398

9499
[targets]
95-
test = ["BenchmarkTools", "Documenter", "LabelledArrays", "Pkg", "PkgBenchmark", "Random", "ReferenceTests", "ReverseDiff", "SafeTestsets", "Test", "Zygote", "OhMyThreads", "RuntimeGeneratedFunctions"]
100+
test = ["BenchmarkTools", "Documenter", "LabelledArrays", "Pkg", "PkgBenchmark", "Random", "ReferenceTests", "ReverseDiff", "SafeTestsets", "Test", "Zygote", "OhMyThreads", "RuntimeGeneratedFunctions", "StaticArrays", "SnoopCompile", "SnoopCompileCore"]

benchmark/benchmarks.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,16 @@ let r = @rule(~x => ~x), rs = RuleSet([r]),
5858

5959
# we use `fold = false` since otherwise it dynamic dispatches to `sin`/`cos` whenever
6060
# both arguments in the contained addition are substituted.
61-
overhead["substitute"]["a"] = @benchmarkable substitute(subs_expr, $(Dict(a=>1)); fold = false) setup=begin
61+
62+
overhead["substitute"]["a"] = @benchmarkable substitute(subs_expr, $(Dict(a=>1))) setup=begin
6263
subs_expr = (sin(a+b) + cos(b+c)) * (sin(b+c) + cos(c+a)) * (sin(c+a) + cos(a+b))
6364
end
6465

65-
overhead["substitute"]["a,b"] = @benchmarkable substitute(subs_expr, $(Dict(a=>1, b=>2)); fold = false) setup=begin
66+
overhead["substitute"]["a,b"] = @benchmarkable substitute(subs_expr, $(Dict(a=>1, b=>2))) setup=begin
6667
subs_expr = (sin(a+b) + cos(b+c)) * (sin(b+c) + cos(c+a)) * (sin(c+a) + cos(a+b))
6768
end
6869

69-
overhead["substitute"]["a,b,c"] = @benchmarkable substitute(subs_expr, $(Dict(a=>1, b=>2, c=>3)); fold = false) setup=begin
70+
overhead["substitute"]["a,b,c"] = @benchmarkable substitute(subs_expr, $(Dict(a=>1, b=>2, c=>3))) setup=begin
7071
subs_expr = (sin(a+b) + cos(b+c)) * (sin(b+c) + cos(c+a)) * (sin(c+a) + cos(a+b))
7172
end
7273

docs/pages.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ pages = Any["index.md",
22
"Manual" => Any["manual/representation.md",
33
"manual/rewrite.md",
44
"manual/interface.md",
5-
"manual/codegen.md"],
5+
"manual/codegen.md",
6+
"manual/variants.md"],
67
"api.md",
78
"upgrade.md"
89
]

docs/src/api.md

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,11 @@
33
## Symbols and Terms
44

55
### Creating Symbols and Terms
6-
```@docs
6+
```@docs; canonical=false
77
SymbolicUtils.@syms
88
SymbolicUtils.term
99
```
1010

11-
### Inspecting Terms
12-
```@docs
13-
SymbolicUtils.issym
14-
SymbolicUtils.symtype
15-
SymbolicUtils.iscall
16-
SymbolicUtils.operation
17-
SymbolicUtils.arguments
18-
SymbolicUtils.sorted_arguments
19-
SymbolicUtils.showraw
20-
```
21-
2211
### Metadata
2312
```@docs
2413
SymbolicUtils.hasmetadata
@@ -27,7 +16,7 @@ SymbolicUtils.setmetadata
2716
```
2817

2918
### Type Promotion
30-
```@docs
19+
```@docs; canonical=false
3120
SymbolicUtils.promote_symtype
3221
```
3322

0 commit comments

Comments
 (0)