diff --git a/Project.toml b/Project.toml index 3b2689050..5e02e2efe 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "MPI" uuid = "da04e1cc-30fd-572f-bb4f-1f8673147195" authors = [] -version = "0.20.24" +version = "0.20.25" [deps] Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b" @@ -15,7 +15,6 @@ MicrosoftMPI_jll = "9237b28f-5490-5468-be7b-bb81f5f5e6cf" OpenMPI_jll = "fe0851c0-eecd-5654-98d4-656369965a5c" PkgVersion = "eebad327-c553-4316-9ea0-9fa01ccd7688" PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a" -Requires = "ae029012-a4dd-5104-9daa-d747884805df" Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" Sockets = "6462fe0b-24de-5631-8697-dd941f90decc" @@ -32,7 +31,6 @@ MPItrampoline_jll = "5" OpenMPI_jll = "4, 5" PkgVersion = "0.3" PrecompileTools = "1.0.1" -Requires = "~0.5, 1.0" Serialization = "1" Sockets = "1" julia = "1.10" diff --git a/ext/AMDGPUExt.jl b/ext/AMDGPUExt.jl index 912525bff..60f68c015 100644 --- a/ext/AMDGPUExt.jl +++ b/ext/AMDGPUExt.jl @@ -1,8 +1,7 @@ module AMDGPUExt -import MPI -isdefined(Base, :get_extension) ? (import AMDGPU) : (import ..AMDGPU) -import MPI: MPIPtr, Buffer, Datatype +using AMDGPU: AMDGPU +using MPI: MPIPtr, Buffer, Datatype function Base.cconvert(::Type{MPIPtr}, A::AMDGPU.ROCArray{T}) where T A diff --git a/ext/CUDAExt.jl b/ext/CUDAExt.jl index f86dcd18a..51435ea98 100644 --- a/ext/CUDAExt.jl +++ b/ext/CUDAExt.jl @@ -1,8 +1,7 @@ module CUDAExt -import MPI -isdefined(Base, :get_extension) ? (import CUDA) : (import ..CUDA) -import MPI: MPIPtr, Buffer, Datatype +using CUDA: CUDA +using MPI: MPIPtr, Buffer, Datatype function Base.cconvert(::Type{MPIPtr}, buf::CUDA.CuArray{T}) where T Base.cconvert(CUDA.CuPtr{T}, buf) # returns DeviceBuffer diff --git a/src/MPI.jl b/src/MPI.jl index 530412430..2697d9b3b 100644 --- a/src/MPI.jl +++ b/src/MPI.jl @@ -107,10 +107,6 @@ include("misc.jl") include("deprecated.jl") -if !isdefined(Base, :get_extension) - using Requires: @require -end - function __init__() MPIPreferences.check_unchanged() @@ -172,11 +168,6 @@ function __init__() end run_load_time_hooks() - - @static if !isdefined(Base, :get_extension) - @require AMDGPU="21141c5a-9bdb-4563-92ae-f87d6854732e" include("../ext/AMDGPUExt.jl") - @require CUDA="052768ef-5323-5732-b1bb-66c8b64840ba" include("../ext/CUDAExt.jl") - end end