Skip to content

Fix CPU CI #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anicusan merged 3 commits into from
Mar 25, 2025
+18 −4
Merged

Fix CPU CI #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a645b2
Actually test with 2 threads
christiangnrd Mar 24, 2025
f58f7bb
only macos-13 runners support macos x64 and officially test macos aar…
christiangnrd Mar 24, 2025
6b2e348
Fix multi-thread CPU mapreduce
christiangnrd Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion .github/workflows/CI-CPU.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,27 @@ jobs:
- ubuntu-latest
- macOS-latest
- windows-latest
- macOS-13
arch:
- x64
- x86
- aarch64
env:
- JULIA_NUM_THREADS: 1
- JULIA_NUM_THREADS: 2
exclude:
- os: macOS-13
arch: x86
- os: macOS-13
arch: aarch64
- os: macOS-latest
arch: x86
- os: macOS-latest
arch: x64
- os: ubuntu-latest
arch: aarch64
- os: windows-latest
arch: aarch64
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
Expand All @@ -49,6 +61,8 @@ jobs:
- uses: julia-actions/cache@v2
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
env:
JULIA_NUM_THREADS: ${{ matrix.env.JULIA_NUM_THREADS }}
docs:
name: Documentation
runs-on: ubuntu-latest
Expand All @@ -58,4 +72,4 @@ jobs:
- uses: julia-actions/julia-docdeploy@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
6 changes: 3 additions & 3 deletions src/reduce/reduce.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,12 +274,12 @@ function _mapreduce_impl(
if num_tasks <= 1
return Base.mapreduce(f, op, src; init=init)
end
return OMT.tmapreduce(
f, op, src, init=init,
return op(init, OMT.tmapreduce(
f, op, src; init=neutral,
scheduler=scheduler,
outputtype=typeof(init),
nchunks=num_tasks,
)
))
else
# FIXME: waiting on OhMyThreads.jl for n-dimensional reduction
return Base.mapreduce(f, op, src; init=init, dims=dims)
Expand Down
Loading