Skip to content

Commit 0181046

Browse files
committed
Revert "Merge pull request #179 from DilumAluthge/dpa/unicode-subscript-m-n-only-in-docs"
This reverts commit 10a7327, reversing changes made to ab7a56b.
1 parent 3549b0e commit 0181046

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,11 @@ Note that loops will be faster than broadcasting in general. This is because the
239239
```julia
240240
julia> function AmulBtest!(C,A,Bk,Bn,d)
241241
@avx for m axes(A,1), n axes(Bk,2)
242-
ΔC_m_n = zero(eltype(C))
242+
ΔCₘₙ = zero(eltype(C))
243243
for k axes(A,2)
244-
ΔC_m_n += A[m,k] * (Bk[k,n] + Bn[n,k])
244+
ΔCₘₙ += A[m,k] * (Bk[k,n] + Bn[n,k])
245245
end
246-
C[m,n] = ΔC_m_n + d[m]
246+
C[m,n] = ΔCₘₙ + d[m]
247247
end
248248
end
249249
AmulBtest! (generic function with 1 method)

docs/src/examples/array_interface.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ using StaticArrays, LoopVectorization
1515

1616
@inline function AmulB!(C, A, B)
1717
@avx for n axes(C,2), m axes(C,1)
18-
C_m_n = zero(eltype(C))
18+
Cₘₙ = zero(eltype(C))
1919
for k axes(B,1)
20-
C_m_n += A[m,k] * B[k,n]
20+
Cₘₙ += A[m,k] * B[k,n]
2121
end
22-
C[m,n] = C_m_n
22+
C[m,n] = Cₘₙ
2323
end
2424
C
2525
end
@@ -41,19 +41,19 @@ function runbenches(sr, ::Type{T}, fa = identity, fb = identity) where {T}
4141
bench_results = Matrix{Float64}(undef, length(sr), 4);
4242
for (i,s) enumerate(sr)
4343
M, K, N = matdims(s)
44-
A_m = @MMatrix rand(T, M, K)
45-
B_m = @MMatrix rand(T, K, N)
46-
A_s = Ref(SMatrix(A_m));
47-
B_s = Ref(SMatrix(B_m));
48-
C_s_s = fa(A_s[]) * fb(B_s[]);
49-
C_s_l = AmulB(fa(A_s[]), fb(B_s[]))
50-
C_m_s = similar(C_s_s); mul!(C_m_s, fa(A_m), fb(B_m));
51-
C_m_l = similar(C_s_s); AmulB!(C_m_l, fa(A_m), fb(B_m));
52-
@assert Array(C_s_s) Array(C_s_l) Array(C_m_s) Array(C_m_l) # Once upon a time Julia crashed on ≈ for large static arrays
53-
bench_results[i,1] = @belapsed $fa($A_s[]) * $fb($B_s[])
54-
bench_results[i,2] = @belapsed AmulB($fa($A_s[]), $fb($B_s[]))
55-
bench_results[i,3] = @belapsed mul!($C_m_s, $fa($A_m), $fb($B_m))
56-
bench_results[i,4] = @belapsed AmulB!($C_m_l, $fa($A_m), $fb($B_m))
44+
Aₘ = @MMatrix rand(T, M, K)
45+
Bₘ = @MMatrix rand(T, K, N)
46+
Aₛ = Ref(SMatrix(Aₘ));
47+
Bₛ = Ref(SMatrix(Bₘ));
48+
Cₛₛ = fa(Aₛ[]) * fb(Bₛ[]);
49+
Cₛₗ = AmulB(fa(Aₛ[]), fb(Bₛ[]))
50+
Cₘₛ = similar(Cₛₛ); mul!(Cₘₛ, fa(Aₘ), fb(Bₘ));
51+
Cₘₗ = similar(Cₛₛ); AmulB!(Cₘₗ, fa(Aₘ), fb(Bₘ));
52+
@assert Array(Cₛₛ) Array(Cₛₗ) Array(Cₘₛ) Array(Cₘₗ) # Once upon a time Julia crashed on ≈ for large static arrays
53+
bench_results[i,1] = @belapsed $fa($Aₛ[]) * $fb($Bₛ[])
54+
bench_results[i,2] = @belapsed AmulB($fa($Aₛ[]), $fb($Bₛ[]))
55+
bench_results[i,3] = @belapsed mul!($Cₘₛ, $fa($Aₘ), $fb($Bₘ))
56+
bench_results[i,4] = @belapsed AmulB!($Cₘₗ, $fa($Aₘ), $fb($Bₘ))
5757
@show s, bench_results[i,:]
5858
end
5959
gflops = @. 1e-9 * matflop(sr) / bench_results
@@ -94,11 +94,11 @@ C_hybrid = HybridArray{Tuple{StaticArrays.Dynamic(),StaticArrays.Dynamic(),3,3}}
9494
# B is K x N x L x J
9595
function bmul!(C, A, B)
9696
@avx for n in axes(C,2), m in axes(C,1), j in axes(C,4), i in axes(C,3)
97-
C_m_n_j_i = zero(eltype(C))
97+
Cₘₙⱼᵢ = zero(eltype(C))
9898
for k in axes(B,1), l in axes(B,3)
99-
C_m_n_j_i += A[m,k,i,l] * B[k,n,l,j]
99+
Cₘₙⱼᵢ += A[m,k,i,l] * B[k,n,l,j]
100100
end
101-
C[m,n,i,j] = C_m_n_j_i
101+
C[m,n,i,j] = Cₘₙⱼᵢ
102102
end
103103
end
104104
```

docs/src/examples/matrix_multiplication.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ We can write a single function:
77
```julia
88
function A_mul_B!(𝐂, 𝐀, 𝐁)
99
@avx for m axes(𝐀,1), n axes(𝐁,2)
10-
𝐂_m_n = zero(eltype(𝐂))
10+
𝐂ₘₙ = zero(eltype(𝐂))
1111
for k axes(𝐀,2)
12-
𝐂_m_n += 𝐀[m,k] * 𝐁[k,n]
12+
𝐂ₘₙ += 𝐀[m,k] * 𝐁[k,n]
1313
end
14-
𝐂[m,n] = 𝐂_m_n
14+
𝐂[m,n] = 𝐂ₘₙ
1515
end
1616
end
1717
```

docs/src/examples/matrix_vector_ops.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ Here I'll discuss a variety of Matrix-vector operations, naturally starting with
55
```julia
66
function jgemvavx!(𝐲, 𝐀, 𝐱)
77
@avx for i eachindex(𝐲)
8-
𝐲_i = zero(eltype(𝐲))
8+
𝐲ᵢ = zero(eltype(𝐲))
99
for j eachindex(𝐱)
10-
𝐲_i += 𝐀[i,j] * 𝐱[j]
10+
𝐲ᵢ += 𝐀[i,j] * 𝐱[j]
1111
end
12-
𝐲[i] = 𝐲_i
12+
𝐲[i] = 𝐲ᵢ
1313
end
1414
end
1515
```

0 commit comments

Comments
 (0)