Skip to content

Commit

Permalink
Allow MPI.jl 0.20 (#59)
Browse files Browse the repository at this point in the history
* CI: test with default MPI binaries (from MPI_jll)

* Allow MPI.jl 0.20

* `Waitall!` -> `Waitall`

* Require Julia 1.7+

* Use system MPI for docs
  • Loading branch information
jipolanco authored Oct 5, 2022
1 parent 4157ce8 commit 8a37db8
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 22 deletions.
40 changes: 22 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ on:
- master
tags: '*'

env:
JULIA_MPI_BINARY: system

jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
Expand All @@ -23,7 +20,7 @@ jobs:
matrix:
experimental: [false]
version:
- '1.6'
- '1.7'
- '1.8'
os:
- ubuntu-latest
Expand All @@ -36,11 +33,6 @@ jobs:
experimental: true

steps:
- name: Install libraries
run: |
sudo apt-get update
sudo apt-get install mpich libmpich-dev
- uses: actions/checkout@v2

- uses: julia-actions/setup-julia@v1
Expand All @@ -60,18 +52,17 @@ jobs:
${{ runner.os }}-
- name: Precompile
shell: julia --color=yes --project=. {0}
run: |
julia --project -e '
using Pkg
using InteractiveUtils
versioninfo()
pkg"instantiate"
pkg"precompile"
using MPI
println("\n", MPI.MPI_LIBRARY_VERSION_STRING)'
using Pkg
using InteractiveUtils
versioninfo()
pkg"instantiate"
pkg"precompile"
using MPI
println("\n", MPI.MPI_LIBRARY_VERSION_STRING)
- uses: julia-actions/julia-buildpkg@v1

- uses: julia-actions/julia-runtest@v1

- uses: julia-actions/julia-processcoverage@v1
Expand All @@ -94,6 +85,19 @@ jobs:
- uses: julia-actions/setup-julia@latest
with:
version: '1.8'

- name: Add MPIPreferences
shell: julia --color=yes --project=. {0}
run: |
using Pkg
Pkg.add("MPIPreferences")
- name: Use system MPI
shell: julia --color=yes --project=. {0}
run: |
using MPIPreferences
MPIPreferences.use_system_binary()
- name: Install dependencies
run: |
julia --project=docs -e '
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/Manifest.toml
LocalPreferences.toml

*.so

Expand Down
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "PencilFFTs"
uuid = "4a48f351-57a6-4416-9ec4-c37015456aae"
authors = ["Juan Ignacio Polanco <[email protected]>"]
version = "0.14.1"
version = "0.14.2"

[deps]
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
Expand All @@ -15,8 +15,8 @@ TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
[compat]
AbstractFFTs = "1"
FFTW = "1"
MPI = "0.19"
MPI = "0.19, 0.20"
PencilArrays = "0.17"
Reexport = "1"
TimerOutputs = "0.5"
julia = "1.6"
julia = "1.7"
3 changes: 3 additions & 0 deletions docs/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/build
/Manifest.toml
/src/generated

*.mp4
/build.*
2 changes: 1 addition & 1 deletion src/operations.jl
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ _apply_plans_out_of_place!(dir::Val, ::PencilFFTPlan, y::PencilArray,

# Wait for send operations to complete (only has an effect for specific
# transposition methods).
_wait_mpi_operations!(t, to) = @timeit_debug to "MPI.Waitall!" MPI.Waitall!(t)
_wait_mpi_operations!(t, to) = @timeit_debug to "MPI.Waitall" MPI.Waitall(t)
_wait_mpi_operations!(::Nothing, to) = nothing

function _apply_plans_in_place!(
Expand Down

2 comments on commit 8a37db8

@jipolanco
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/69567

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.14.2 -m "<description of version>" 8a37db82690cab19c7c590d395ae871467024f92
git push origin v0.14.2

Please sign in to comment.