Skip to content

Commit 2e0a9b1

Browse files
committed
Undo all unrelated changes
1 parent 724af9f commit 2e0a9b1

11 files changed

Lines changed: 19 additions & 33 deletions

File tree

.buildkite/pipeline.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@
111111
# This is broken for OpenMPI 5 and Julia 1.12.
112112
# It is broken for OpenMPI 4 for all versions of Julia. So we use OpenMPI 5 and skip Julia 1.12
113113
OPENMPI_VER: "5.0"
114-
#TODO OPENMPI_VER_FULL: "5.0.9"
115-
OPENMPI_VER_FULL: "5.0.10"
114+
OPENMPI_VER_FULL: "5.0.9"
116115
# OPENMPI_VER: "4.1"
117116
# OPENMPI_VER_FULL: "4.1.8"
118117
UCX_VER: "1.19.1"
@@ -156,7 +155,6 @@
156155
version:
157156
- "1.10"
158157
- "1.11"
159-
- "1.12" #TODO
160158
#
161159
# Skip the test with Julia 1.12 because it segfaults while installing packages:
162160
# [amdgpu1:516 :0:516] Caught signal 11 (Segmentation fault: invalid permissions for mapped object at address 0x7ee1a9ec5000)
@@ -205,7 +203,7 @@
205203
'
206204
207205
echo "+++ Run tests"
208-
#TODO export JULIA_MPI_TEST_EXCLUDE="test_allreduce.jl,test_reduce.jl,test_scan.jl"
206+
export JULIA_MPI_TEST_EXCLUDE="test_allreduce.jl,test_reduce.jl,test_scan.jl"
209207
julia --color=yes --project=. -e '
210208
import Pkg
211209
Pkg.test("MPI"; test_args=["--backend=AMDGPU"])

.github/workflows/UnitTests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ jobs:
7878
env:
7979
COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
8080

81-
8281
test-openmpi-jll:
8382
timeout-minutes: 20
8483
strategy:
@@ -130,7 +129,6 @@ jobs:
130129
131130
- uses: julia-actions/julia-runtest@v1
132131

133-
134132
test-system-brew:
135133
timeout-minutes: 20
136134
strategy:
@@ -243,7 +241,6 @@ jobs:
243241
244242
- uses: julia-actions/julia-runtest@v1
245243

246-
247244
test-intel-linux:
248245
timeout-minutes: 20
249246
strategy:

Project.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "MPI"
22
uuid = "da04e1cc-30fd-572f-bb4f-1f8673147195"
3-
version = "0.20.24"
43
authors = []
4+
version = "0.20.24"
55

66
[deps]
77
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
@@ -19,18 +19,10 @@ Requires = "ae029012-a4dd-5104-9daa-d747884805df"
1919
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
2020
Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
2121

22-
[weakdeps]
23-
AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e"
24-
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
25-
26-
[extensions]
27-
AMDGPUExt = "AMDGPU"
28-
CUDAExt = "CUDA"
29-
3022
[compat]
23+
Distributed = "1"
3124
AMDGPU = "0.6, 0.7, 0.8, 0.9, 1, 2"
3225
CUDA = "3, 4, 5"
33-
Distributed = "1"
3426
DocStringExtensions = "0.8, 0.9"
3527
Libdl = "1"
3628
MPIABI_jll = "0.1.1"
@@ -45,6 +37,14 @@ Serialization = "1"
4537
Sockets = "1"
4638
julia = "1.10"
4739

40+
[extensions]
41+
AMDGPUExt = "AMDGPU"
42+
CUDAExt = "CUDA"
43+
4844
[extras]
4945
AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e"
5046
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
47+
48+
[weakdeps]
49+
AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e"
50+
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"

docs/make.jl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,6 @@ makedocs(
8282
# wants to run the linkchecks locally they can set the environment variable `CI=true`.
8383
linkcheck = get(ENV, "CI", "false") == "true",
8484
linkcheck_useragent = nothing,
85-
# - Our cross references contain paths that begin with `..`.
86-
# Documenter does not like this. We know this, and we disable
87-
# this check until we fixed this.
88-
# - The link checks do not work on CI because the web sites to
89-
# which we point forbid access to our CI systems (403).
90-
warnonly = [:cross_references, :linkcheck],
9185
)
9286

9387
deploydocs(

docs/src/knownissues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ MPID_nem_tcp_get_business_card(397):
8282
GetSockInterfaceAddr(370)..........: gethostbyname failed, bogon (errno 0)
8383
```
8484

85-
A workaround is provided in the [documentation of the MOOSE framework](https://mooseframework.inl.gov/moose/help/troubleshooting.html) and we report it here for reference:
85+
A workaround is provided in the [documentation of the MOOSE framework](https://mooseframework.inl.gov/help/troubleshooting.html) and we report it here for reference:
8686

8787
* obtain your hostname
8888
```console

lib/MPIPreferences/src/MPIPreferences.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ const binary = @load_preference("binary", Sys.iswindows() ? "MicrosoftMPI_jll" :
3131
3232
The ABI (application binary interface) of the currently selected binary. Supported values are:
3333
34+
- `"HPE MPT"`: HPE MPT
3435
- `"MPIABI"`: MPI-ABI-compatible ABI (https://www.mpi-form.org/)
3536
- `"MPICH"`: MPICH-compatible ABI (https://www.mpich.org/abi/)
3637
- `"MPItrampoline"`: MPItrampoline

src/buffers.jl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ function Base.unsafe_convert(::Type{MPIPtr}, x::MPIBuffertype{T}) where T
77
ptr = Base.unsafe_convert(Ptr{T}, x)
88
reinterpret(MPIPtr, ptr)
99
end
10-
@static if VERSION >= v"1.14.0-DEV"
11-
function Base.unsafe_convert(::Type{MPIPtr}, x::Base.OffsetCConvert{T}) where {T}
12-
ptr = Base.unsafe_convert(Ptr{T}, x) # Base handles offset arithmetic
13-
reinterpret(MPIPtr, ptr)
14-
end
15-
end
1610

1711

1812
Base.cconvert(::Type{MPIPtr}, x::String) = x

src/errhandler.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,5 @@ function set_errorhandler!(file::File.FileHandle, errh::Errhandler)
9494
API.MPI_File_set_errhandler(file, errh)
9595
return nothing
9696
end
97+
98+

src/implementations.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ $(_doc_external("MPI_Get_version"))
8080
"""
8181
const MPI_VERSION = Get_version()
8282

83-
8483
using PkgVersion
8584
"""
8685
MPI.versioninfo(io::IO=stdout)
@@ -100,7 +99,7 @@ function versioninfo(io::IO=stdout)
10099
println(io, " MPI.jl: ", PkgVersion.@Version)
101100
println(io, " MPIPreferences.jl: ", PkgVersion.Version(MPIPreferences))
102101
if MPIPreferences.binary == "MPIABI_jll"
103-
println(io, " MPIABI_jll: ", PkgVersion.Version(API.MPICH_jll))
102+
println(io, " MPIABI_jll: ", PkgVersion.Version(API.MPICH_jll))
104103
elseif MPIPreferences.binary == "MPICH_jll"
105104
println(io, " MPICH_jll: ", PkgVersion.Version(API.MPICH_jll))
106105
elseif MPIPreferences.binary == "MPItrampoline_jll"

src/pointtopoint.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
"""
23
Send(buf, comm::Comm; dest::Integer, tag::Integer=0)
34

0 commit comments

Comments
 (0)