Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test Julia 1.4, remove 1.1 & 1.2 from CI matrix #365

Merged
merged 9 commits into from
Apr 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
environment:
matrix:
- julia_version: 1.0
- julia_version: 1.1
- julia_version: 1.2
- julia_version: 1.3
- julia_version: 1.4
- julia_version: nightly

platform:
Expand Down
99 changes: 42 additions & 57 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,78 +1,63 @@
include:
- 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v3/common.yml'
- 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v6.yml'

.projecttest:
extends: .test
image: nvidia/cuda:10.1-devel

variables:
OMPI_ALLOW_RUN_AS_ROOT: '1'
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: '1'
OMPI_MCA_btl_vader_single_copy_mechanism: 'none' # https://github.com/open-mpi/ompi/issues/4948
OMPI_MCA_plm_rsh_agent: 'sh' # the container doesn't have ssh installed, but we don't need it
JULIA_CUDA_VERBOSE: 'true'
JULIA_MPI_TEST_ARRAYTYPE: 'CuArray'
JULIA_MPI_PATH: "$CI_PROJECT_DIR/mpi"

openmpi:
stage: build
variables:
OMPI_ALLOW_RUN_AS_ROOT: '1'
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: '1'
OMPI_MCA_btl_vader_single_copy_mechanism: 'none' # https://github.com/open-mpi/ompi/issues/4948
JULIA_MPI_TEST_ARRAYTYPE: 'CuArray'
OPENMPI_VER: '4.0'
OPENMPI_VER_FULL: '4.0.3'
before_script:
- mkdir -p ccache
- export CCACHE_BASEDIR=${CI_PROJECT_DIR}
- export CCACHE_DIR=${CI_PROJECT_DIR}/ccache
- export JULIA_DEPOT_PATH="${CI_PROJECT_DIR}/jldepot"
- export JULIA_MPI_PATH="${HOME}/mpi"
- export CCACHE_DIR=${CI_PROJECT_DIR}/downloads/ccache
- mkdir -p ${CCACHE_DIR}
- apt-get update
- apt-get install --yes --no-install-recommends ssh ccache
- /usr/sbin/update-ccache-symlinks
- export PATH="/usr/lib/ccache:$PATH"
- apt-get install --yes --no-install-recommends ccache curl
- /usr/sbin/update-ccache-symlinks
- export PATH="/usr/lib/ccache:$PATH"
- curl https://download.open-mpi.org/release/open-mpi/v${OPENMPI_VER}/openmpi-${OPENMPI_VER_FULL}.tar.gz --output openmpi.tar.gz
- tar xf openmpi.tar.gz
- patch -p1 -d openmpi-${OPENMPI_VER_FULL} < conf/ompi_rootenv.patch
- pushd openmpi-${OPENMPI_VER_FULL}
- ./configure --with-cuda --prefix=${JULIA_MPI_PATH}
- ./configure --with-cuda --prefix="${JULIA_MPI_PATH}"
- make -j
- make install
- popd
script:
- export JULIA_PROJECT="test/cudaenv"
- ${JULIA_MPI_PATH}/bin/ompi_info
- julia -e 'using InteractiveUtils;
versioninfo()'
- julia --color=yes -e 'using Pkg;
Pkg.develop(PackageSpec(path=pwd()));
Pkg.instantiate();
Pkg.build()'
- julia --color=yes test/runtests.jl
cache:
artifacts:
when: always
paths:
- ccache/
- jldepot/
- mpi/

# Julia versions
julia:1.3:
extends:
- .julia:1.3
- .test
tags:
- nvidia

.gputest:
extends: .projecttest
variables:
CI_IMAGE_TAG: 'cuda'
OPENMPI_VER: '4.0'
OPENMPI_VER_FULL: '4.0.1'
julia:1.4:
extends:
- .julia:1.4
- .test
tags:
- nvidia

gpu:test:dev:
extends: .gputest
variables:
CI_VERSION_TAG: 'dev'
julia:nightly:
extends:
- .julia:nightly
- .test
tags:
- nvidia
allow_failure: true

gpu:test:v1.3:
extends: .gputest
variables:
CI_VERSION_TAG: 'v1.3'

gpu:test:v1.2:
extends: .gputest
variables:
CI_VERSION_TAG: 'v1.2'

gpu:test:v1.1:
extends: .gputest
variables:
CI_VERSION_TAG: 'v1.1'

gpu:test:v1.0:
extends: .gputest
variables:
CI_VERSION_TAG: 'v1.0'
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ os:

julia:
- 1.0
- 1.1
- 1.2
- 1.3
- 1.4
- nightly

branches:
Expand Down
3 changes: 2 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ Requires = "~0.5, 1.0"
julia = "1"

[extras]
CuArrays = "3a865a2d-5b23-5a0f-bc46-62713ec82fae"
DoubleFloats = "497a8b3b-efae-58df-a0af-a86822472b78"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["DoubleFloats", "Pkg", "Test"]
test = ["CuArrays", "DoubleFloats", "Pkg", "Test"]
29 changes: 0 additions & 29 deletions conf/ompi_rootenv.patch

This file was deleted.

16 changes: 8 additions & 8 deletions conf/travis-install-mpi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ set -x

MPI_IMPL="$1"
os=`uname`
OMPIVER=openmpi-3.0.0
MPICHVER=mpich-3.2.1
OMPIVER=4.0.3
MPICHVER=3.3.2
IMPIVER=2019.4.243
case "$os" in
Darwin)
Expand Down Expand Up @@ -41,9 +41,9 @@ case "$os" in
sudo apt-get install -y gfortran hwloc ccache
sudo /usr/sbin/update-ccache-symlinks
export PATH="/usr/lib/ccache:$PATH"
wget http://www.mpich.org/static/downloads/3.2.1/$MPICHVER.tar.gz
tar -zxf $MPICHVER.tar.gz
cd $MPICHVER
wget http://www.mpich.org/static/downloads/$MPICHVER/mpich-$MPICHVER.tar.gz
tar -zxf mpich-$MPICHVER.tar.gz
cd mpich-$MPICHVER
sh ./configure --prefix=$HOME/mpich --enable-shared > /dev/null
make -j > /dev/null
sudo make install > /dev/null
Expand All @@ -52,9 +52,9 @@ case "$os" in
sudo apt-get install -y gfortran ccache
sudo /usr/sbin/update-ccache-symlinks
export PATH="/usr/lib/ccache:$PATH"
wget --no-check-certificate https://www.open-mpi.org/software/ompi/v3.0/downloads/$OMPIVER.tar.gz
tar -zxf $OMPIVER.tar.gz
cd $OMPIVER
wget --no-check-certificate https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-$OMPIVER.tar.gz
tar -zxf openmpi-$OMPIVER.tar.gz
cd openmpi-$OMPIVER
sh ./configure --prefix=$HOME/openmpi > /dev/null
make -j > /dev/null
sudo make install > /dev/null
Expand Down
6 changes: 0 additions & 6 deletions test/cudaenv/Project.toml

This file was deleted.

11 changes: 7 additions & 4 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
using Pkg
pkg"precompile"
using DoubleFloats
using Test

using MPI
using Test

import MPI: mpiexec_path
# load test packages to trigger precompilation
using DoubleFloats
if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
using CuArrays
end


# Code coverage command line options; must correspond to src/julia.h
# and src/ui/repl.c
Expand Down