Skip to content

Commit 9f56c5c

Browse files
authored
Update for PolyesterWeave 0.1.1 (#115)
* Update for PolyesterWeave 0.1.1 * Bump version
1 parent f6110b9 commit 9f56c5c

File tree

7 files changed

+161
-232
lines changed

7 files changed

+161
-232
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,26 @@ defaults:
1111
run:
1212
shell: bash
1313
jobs:
14-
test:
15-
name: Julia ${{ matrix.version }}/${{ matrix.threads }} threads/${{ matrix.os }}/${{ matrix.arch }}/${{ github.event_name }}
14+
coverage:
15+
name: coverage=true/Julia ${{ matrix.version }}/${{ matrix.threads }} threads/${{ matrix.os }}/${{ matrix.arch }}/${{ github.event_name }}
1616
runs-on: ${{ matrix.os }}
1717
strategy:
1818
fail-fast: false
1919
matrix:
2020
arch:
2121
- x64
22-
- x86
22+
eltype:
23+
- Float64
24+
- Float32
25+
- Int64
26+
- Int32
2327
os:
2428
- ubuntu-latest
25-
- windows-latest
26-
- macOS-latest
2729
threads:
2830
- '1'
2931
- '3' # GitHub runners have 2 cores, so `NUM_CORES+1` is 3
3032
version:
3133
- '1' # automatically expands to the latest stable 1.x release of Julia
32-
exclude:
33-
- os: macOS-latest
34-
arch: x86 # 32-bit Julia binaries are not available on macOS
3534
steps:
3635
- uses: actions/checkout@v2
3736
- uses: julia-actions/setup-julia@v1
@@ -51,24 +50,35 @@ jobs:
5150
- uses: julia-actions/julia-buildpkg@v1
5251
- uses: julia-actions/julia-runtest@v1
5352
with:
54-
coverage: false
53+
coverage: true
5554
env:
5655
JULIA_NUM_THREADS: ${{ matrix.threads }}
57-
coverage:
58-
name: coverage=true/Julia ${{ matrix.version }}/${{ matrix.threads }} threads/${{ matrix.os }}/${{ matrix.arch }}/${{ github.event_name }}
56+
JULIA_TEST_ELTYPE: ${{ matrix.eltype }}
57+
- uses: julia-actions/julia-processcoverage@v1
58+
- uses: codecov/codecov-action@v1
59+
with:
60+
file: lcov.info
61+
test:
62+
name: Julia ${{ matrix.version }}/${{ matrix.threads }} threads/${{ matrix.os }}/${{ matrix.arch }}/${{ github.event_name }}
5963
runs-on: ${{ matrix.os }}
6064
strategy:
6165
fail-fast: false
6266
matrix:
6367
arch:
6468
- x64
69+
- x86
6570
os:
6671
- ubuntu-latest
72+
- windows-latest
73+
- macOS-latest
6774
threads:
6875
- '1'
6976
- '3' # GitHub runners have 2 cores, so `NUM_CORES+1` is 3
7077
version:
7178
- '1' # automatically expands to the latest stable 1.x release of Julia
79+
exclude:
80+
- os: macOS-latest
81+
arch: x86 # 32-bit Julia binaries are not available on macOS
7282
steps:
7383
- uses: actions/checkout@v2
7484
- uses: julia-actions/setup-julia@v1
@@ -88,13 +98,9 @@ jobs:
8898
- uses: julia-actions/julia-buildpkg@v1
8999
- uses: julia-actions/julia-runtest@v1
90100
with:
91-
coverage: true
101+
coverage: false
92102
env:
93103
JULIA_NUM_THREADS: ${{ matrix.threads }}
94-
- uses: julia-actions/julia-processcoverage@v1
95-
- uses: codecov/codecov-action@v1
96-
with:
97-
file: lcov.info
98104
docs:
99105
name: Documentation
100106
runs-on: ubuntu-latest

Project.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "Octavian"
22
uuid = "6fd5a793-0b7e-452c-907f-f8bfe9c57db4"
33
authors = ["Mason Protter", "Chris Elrod", "Dilum Aluthge", "contributors"]
4-
version = "0.3.3"
4+
version = "0.3.4"
55

66
[deps]
77
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
@@ -16,12 +16,12 @@ VectorizationBase = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
1616
[compat]
1717
ArrayInterface = "3.1.14"
1818
IfElse = "0.1"
19-
LoopVectorization = "0.12.34"
19+
LoopVectorization = "0.12.86"
2020
ManualMemory = "0.1.1"
21-
PolyesterWeave = "0.1"
21+
PolyesterWeave = "0.1.1"
2222
Static = "0.2, 0.3"
2323
ThreadingUtilities = "0.4.6"
24-
VectorizationBase = "0.21.5"
24+
VectorizationBase = "0.21.15"
2525
julia = "1.6"
2626

2727
[extras]

src/complex_matmul.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ for AT in [:AbstractVector, :AbstractMatrix] # to avoid ambiguity error
5252
η = ifelse(ArrayInterface.is_lazy_conjugate(_A), StaticInt(-1), StaticInt(1))
5353
(+ᶻ, -ᶻ) = ifelse(ArrayInterface.is_lazy_conjugate(_C), (-, +), (+, -))
5454

55-
@tturbo for n indices((C, B), (3, 2)), m indices((C, A), 2)
55+
# @tturbo for n ∈ indices((C, B), (3, 2)), m ∈ indices((C, A), 2)
56+
@turbo for n indices((C, B), (3, 2)), m indices((C, A), 2)
5657
Cmn_re = zero(T)
5758
Cmn_im = zero(T)
5859
for k indices((A, B), (3, 1))
@@ -130,4 +131,4 @@ for AT in [:AbstractVector, :AbstractMatrix] # to avoid ambiguity error
130131
_C
131132
end
132133
end
133-
end
134+
end

src/matmul.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ function __matmul!(
360360
clamp(div_fast(M * N, StaticInt{256}() * W), 0, _nthread-1)
361361
end
362362
# nkern = cld_fast(M * N, MᵣW * Nᵣ)
363-
threads, torelease = PolyesterWeave.__request_threads(_nrequest % UInt32, PolyesterWeave.worker_pointer())
363+
threads, torelease = PolyesterWeave.__request_threads(_nrequest % UInt32, PolyesterWeave.worker_pointer(), nothing)
364364
# _threads, _torelease = PolyesterWeave.request_threads(Threads.threadid()%UInt32, _nrequest)
365365

366366
nrequest = threads.i

0 commit comments

Comments
 (0)