Skip to content

Commit 142af82

Browse files
committed
update to use latest MPI
1 parent 6fdbf38 commit 142af82

File tree

3 files changed

+7
-47
lines changed

3 files changed

+7
-47
lines changed

.appveyor.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
environment:
22
matrix:
3-
- julia_version: 1.0
4-
- julia_version: 1.1
5-
- julia_version: 1.2
3+
- julia_version: 1.3
4+
- julia_version: 1.4
5+
- julia_version: 1.5
66
- julia_version: nightly
77

88
platform:
@@ -26,14 +26,6 @@ notifications:
2626

2727
install:
2828
- ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
29-
- ps: (new-object net.webclient).DownloadFile(
30-
"https://download.microsoft.com/download/A/E/0/AE002626-9D9D-448D-8197-1EA510E297CE/msmpisetup.exe",
31-
"C:\projects\MSMpiSetup.exe")
32-
- C:\projects\MSMpiSetup.exe -unattend -minimal
33-
- set PATH=C:\Program Files\Microsoft MPI\Bin;%PATH% # can be removed in new MPI.jl
34-
# This shouldn't typicallybe needed: the installer adds the directory to
35-
# the PATH. For some reason this doesn't work on Appveyor
36-
- set JULIA_MPIEXEC=C:\Program Files\Microsoft MPI\Bin\mpiexec.exe
3729

3830
build_script:
3931
- echo "%JL_BUILD_SCRIPT%"

.travis.yml

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
language: julia
2-
sudo: required
32
dist: trusty
43

54
os:
65
- linux
76
- osx
87

98
julia:
10-
- 1.0
11-
- 1.1
12-
- 1.2
9+
- 1.3
10+
- 1.4
11+
- 1.5
1312
- nightly
1413

1514
branches:
@@ -25,41 +24,9 @@ cache:
2524
- $HOME/.ccache
2625
- $HOME/.julia/registries # can we cache all of .julia?
2726

28-
env:
29-
- MPI_IMPL=mpich
30-
- MPI_IMPL=openmpi
31-
# - MPI_IMPL=intelmpi
32-
3327
matrix:
3428
allow_failures:
3529
- julia: nightly
36-
- os: osx # MPI.jl issue 262
37-
env: MPI_IMPL=openmpi
38-
exclude:
39-
- os: osx
40-
env: MPI_IMPL=intelmpi
41-
42-
before_install:
43-
- sh ./conf/travis-install-mpi.sh $MPI_IMPL
44-
- |
45-
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
46-
if [ "$MPI_IMPL" == "intelmpi" ]; then
47-
source $HOME/intel/compilers_and_libraries/linux/mpi/intel64/bin/mpivars.sh release
48-
else
49-
export JULIA_MPI_PATH=$HOME/$MPI_IMPL;
50-
fi
51-
fi
52-
# following can be removed with next MPI.jl release.
53-
- export PATH=$HOME/$MPI_IMPL/bin:$PATH
54-
- export CC=mpicc
55-
- export FC=mpif90
56-
# Work around OpenMPI attempting to create overly long temporary
57-
# file names - and erroring as a result
58-
- export TMPDIR=/tmp
59-
# Work around MacOS/OpenMPI issue:
60-
# https://github.com/open-mpi/ompi/issues/6518
61-
# https://github.com/open-mpi/ompi/issues/5798
62-
- export OMPI_MCA_btl=self,tcp
6330

6431
jobs:
6532
include:

Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
1111

1212
[compat]
1313
julia = "1"
14+
MPI = "0.14"
1415

1516
[extras]
1617
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

0 commit comments

Comments
 (0)