Merge branch 'Docker-update' of github.com:sourceryinstitute/OpenCoarrays

Author: zbeekman

.Dockerfiles/master-jupyter-inherit/Dockerfile

@@ -1,7 +1,7 @@
-FROM jupyter/minimal-notebook:f3652d3f58f2
+FROM jupyter/minimal-notebook:4cdbc9cdb7d1
 
 USER root
-ENV GCC_VERSION 7.3.0
+ENV GCC_VERSION 8.2.0
 
 RUN DEBIAN_FRONTEND=noninteractive transientBuildDeps="file" \
     && echo "NB_USER=${NB_USER}" \
@@ -16,14 +16,14 @@ RUN DEBIAN_FRONTEND=noninteractive transientBuildDeps="file" \
     && apt-get update -y \
     && apt-get install -y --no-install-recommends \
     build-essential \
-    gcc-7>=7.3.0 \
-    gfortran-7>=7.3.0 \
-    g++-7>=7.3.0 \
+    gcc-8>=8.2.0 \
+    gfortran-8>=8.2.0 \
+    g++-8>=8.2.0 \
     mpich>=3.2 \
     libmpich-dev>=3.2 \
     ${transientBuildDeps} \
-    && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-7 \
-    && update-alternatives --set gcc "/usr/bin/gcc-7" \
+    && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-8 \
+    && update-alternatives --set gcc "/usr/bin/gcc-8" \
     && gcc --version \
     && gfortran --version \
     && mpiexec --version \
@@ -74,4 +74,4 @@ RUN DEBIAN_FRONTEND=noninteractive transientBuildDeps="cmake cmake-data git" \
     && apt-get purge -y --auto-remove ${transientBuildDeps} \
     && rm -rf /var/lib/apt/lists/* /var/log/* /tmp/*
 
-USER "${NB_USER}"
+USER "${NB_USER}"

.Dockerfiles/master-jupyter-inherit/Makefile

@@ -19,7 +19,7 @@ build: $(subst /,_,$(NAME))-build.stamp ## Build docker file. Depending on which
 
 $(subst /,_,$(NAME))-build.stamp: Dockerfile .dockerignore hooks/build ## Target for doing & timestamping the build
 	touch $@
-	hooks/build 2>&1 | tee $(subst stamp,log,$@) || rm -rf $@
+	IMAGE_NAME=$(IMAGE_NAME) hooks/build 2>&1 | tee $(subst stamp,log,$@) || rm -rf $@
 	docker tag $(NAME) $(NAME):$(GIT_MASTER_HEAD_SHA)
 	docker tag $(NAME) $(NAME):latest
 

.Dockerfiles/master-jupyter-inherit/hooks/build

@@ -15,13 +15,15 @@ git fetch -v --all --depth=9999999 --update-shallow
 git tag --list
 git branch
 
+echo "Info: value of IMAGE_NAME = ${IMAGE_NAME:-<unset>}"
+
 d_repo='sourceryinstitute/OpenCoarrays'
 d_git_remotes=("$(git remote show)")
 echo "${#d_git_remotes[@]} git remotes found."
 n_remotes=${#d_git_remotes[@]}
 if (( n_remotes > 0 )) ; then
     echo "Using remote: ${d_git_remotes[0]}"
-    d_vcs_url="$(git remote -v | awk 'FNR == 1 {print $2}')"
+    d_vcs_url="$(git remote -v | awk '/origin/ {print $2; exit}')"
 fi
 
 if [[ -z "${d_vcs_url:-}" ]]; then
@@ -56,5 +58,5 @@ docker build --build-arg OPENCOARRAYS_VERSION="${opencoarrays_version}" \
 	     --build-arg VCS_VERSION="${d_vcs_describe:-${d_tag}}" \
 	     --rm \
 	     --pull \
-             -t "${IMAGE_NAME:-$(tr '[:upper:]' '[:lower:]' <<< "${d_repo}")}:latest" .
-docker tag "${IMAGE_NAME:-$(tr '[:upper:]' '[:lower:]' <<< "${d_repo}")}:latest" "${IMAGE_NAME:-$(tr '[:upper:]' '[:lower:]' <<< "${d_repo}")}:${d_vcs_tag}"
+             -t "${IMAGE_NAME:-$(tr '[:upper:]' '[:lower:]' <<< "${d_repo}_jupyter")}:latest" .
+docker tag "${IMAGE_NAME:-$(tr '[:upper:]' '[:lower:]' <<< "${d_repo}_jupyter")}:latest" "${IMAGE_NAME:-$(tr '[:upper:]' '[:lower:]' <<< "${d_repo}_jupyter")}:${d_vcs_tag}"

src/tests/unit/teams/CMakeLists.txt

@@ -1,3 +1,3 @@
 caf_compile_executable(team_number team-number.f90)
 caf_compile_executable(teams_subset teams_subset.f90)
-caf_compile_executable(get_communicator get-communicator.f90)
+caf_compile_executable(get_communicator get-communicator.F90)

src/tests/unit/teams/get-communicator.f90 renamed to src/tests/unit/teams/get-communicator.F90

@@ -34,6 +34,10 @@ program main
 
   implicit none
 
+#ifndef MPI_WORKING_MODULE
+  include 'mpif.h'
+#endif
+
   call mpi_matches_caf(get_communicator())
     !! verify # ranks = # images and image number = rank + 1
 
@@ -83,8 +87,10 @@ pure function destination_team(image,numTeams) result(team)
      team = mod(image+1,numTeams)+1
    end function
 
-  subroutine mpi_matches_caf(comm)
+subroutine mpi_matches_caf(comm)
+#ifdef MPI_WORKING_MODULE
     use mpi
+#endif
     use iso_c_binding, only : c_int
     integer(c_int), intent(in) :: comm
       !! MPI communicator