Skip to content

Commit bb83c61

Browse files
committed
fix for old MPI.jl
1 parent 5b77bac commit bb83c61

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

.appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ install:
3030
"https://download.microsoft.com/download/A/E/0/AE002626-9D9D-448D-8197-1EA510E297CE/msmpisetup.exe",
3131
"C:\projects\MSMpiSetup.exe")
3232
- C:\projects\MSMpiSetup.exe -unattend -minimal
33+
- set PATH=C:\Program Files\Microsoft MPI\Bin;%PATH% # can be removed in new MPI.jl
3334
# This shouldn't typicallybe needed: the installer adds the directory to
3435
# the PATH. For some reason this doesn't work on Appveyor
3536
- set JULIA_MPIEXEC=C:\Program Files\Microsoft MPI\Bin\mpiexec.exe

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ before_install:
4949
export JULIA_MPI_PATH=$HOME/$MPI_IMPL;
5050
fi
5151
fi
52+
# following can be removed with next MPI.jl release.
53+
- export PATH=$HOME/OpenMPI/bin:$HOME/MPICH/bin:$PATH
54+
- export CC=mpicc
55+
- export FC=mpif90
5256
# Work around OpenMPI attempting to create overly long temporary
5357
# file names - and erroring as a result
5458
- export TMPDIR=/tmp

src/mpimanager.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,9 @@ function start_main_loop(mode::TransportMode=TCP_TRANSPORT_ALL;
391391
Distributed.init_worker(cookie, mgr)
392392
# Start a worker event loop
393393
receive_event_loop(mgr)
394-
MPI.free(comm)
394+
if isdefined(MPI, :free) && hasmethod(MPI.free, Tuple{MPI.Comm})
395+
MPI.free(comm)
396+
end
395397
MPI.Finalize()
396398
exit()
397399
end

0 commit comments

Comments
 (0)