Skip to content

Commit

Permalink
Merge branch 'develop' into 941-record-communication-stats-per-subphase
Browse files Browse the repository at this point in the history
  • Loading branch information
bradybray authored Oct 13, 2020
2 parents 751de78 + e6df66e commit aa73485
Show file tree
Hide file tree
Showing 128 changed files with 1,169 additions and 471 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/check-commits-are-signed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: PR checks (unsigned commits)

on:
pull_request

jobs:
check:
name: Check if there are unsigned commits
runs-on: ubuntu-latest
steps:
- uses: DARMA-tasking/find-unsigned-commits@master
with:
repo_owner: ${{ github.event.repository.owner.login }}
repo_name: ${{ github.event.repository.name }}
pr_number: ${{ github.event.pull_request.number }}
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-clang-3.9-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
VT_ASAN: 0
VT_POOL: 1
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
CACHE: ~/.local/cache/

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-clang-5.0-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
VT_ASAN: 0
VT_POOL: 1
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
CACHE: ~/.local/cache/

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-clang-8-alpine-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
VT_ASAN: 0
VT_POOL: 1
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
CACHE: ~/.local/cache/

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-gcc-10-ubuntu-openmpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
VT_ASAN: 0
VT_POOL: 1
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
CACHE: ~/.local/cache/

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-gcc-5-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
VT_ASAN: 0
VT_POOL: 1
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
CACHE: ~/.local/cache/

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-gcc-6-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
VT_ASAN: 0
VT_POOL: 1
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
CACHE: ~/.local/cache/

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-gcc-7-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
VT_ASAN: 0
VT_POOL: 1
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
CACHE: ~/.local/cache/

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
VT_ASAN: 1
VT_POOL: 0
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
CACHE: ~/.local/cache/

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
VT_ASAN: 0
VT_POOL: 1
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 1
CACHE: ~/.local/cache/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
VT_ASAN: 0
VT_POOL: 0
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
CACHE: ~/.local/cache/

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-intel-18-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
VT_ASAN: 0
VT_POOL: 0
VT_EXTENDED_TESTS: ${{ github.event_name != 'pull_request' }}
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
CACHE: ~/.local/cache/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
VT_ASAN: 0
VT_POOL: 0
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
CACHE: ~/.local/cache/

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-nvidia-10-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
VT_ASAN: 0
VT_POOL: 0
VT_EXTENDED_TESTS: ${{ github.event_name != 'pull_request' }}
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
CACHE: ~/.local/cache/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
VT_ASAN: 0
VT_POOL: 0
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
CACHE: ~/.local/cache/

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-nvidia-11-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
VT_ASAN: 0
VT_POOL: 0
VT_EXTENDED_TESTS: ${{ github.event_name != 'pull_request' }}
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
CACHE: ~/.local/cache/

Expand Down
15 changes: 15 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,21 @@ include(cmake/build_git_info.cmake)

include(cmake/check_compiler.cmake)

option(vt_gold_linker_enabled "Build VT using the `gold' linker" ON)

option(vt_unity_build_enabled "Build VT with Unity/Jumbo mode enabled" OFF)

if (vt_unity_build_enabled)
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
message(STATUS "Building VT in Unity/Jumbo build mode")
else()
message(
STATUS
"Could *not* build VT in Unity/Jumbo mode---version of CMake ${CMAKE_VERSION} < 3.16"
)
endif()
endif()

option(vt_fcontext_enabled "Build VT with fcontext (ULT) enabled" OFF)

string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_CMAKE_BUILD_TYPE)
Expand Down
1 change: 1 addition & 0 deletions ci/build_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
-Dvt_pool_enabled="${VT_POOL_ENABLED:-1}" \
-Dvt_build_extended_tests="${VT_EXTENDED_TESTS_ENABLED:-1}" \
-Dvt_zoltan_enabled="${VT_ZOLTAN_ENABLED:-0}" \
-Dvt_unity_build_enabled="${VT_UNITY_BUILD_ENABLED:-0}" \
-Dzoltan_DIR="${ZOLTAN_CONFIG:-}" \
-DCODE_COVERAGE="${CODE_COVERAGE:-0}" \
-DMI_INTERPOSE:BOOL=ON \
Expand Down
19 changes: 19 additions & 0 deletions ci/deps/cmake.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env bash

set -exo pipefail

if test $# -lt 1
then
echo "usage: ./$0 <cmake-version>"
exit 1
fi

cmake_version=$1
cmake_tar_name=cmake-${cmake_version}-Linux-x86_64.tar.gz

echo "${cmake_version}"
echo "${cmake_tar_name}"

wget http://github.com/Kitware/CMake/releases/download/v${cmake_version}/${cmake_tar_name}

tar xzf ${cmake_tar_name} --one-top-level=cmake --strip-components 1
9 changes: 8 additions & 1 deletion ci/docker/ubuntu-18.04-clang-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN apt-get update -y -q && \
apt-get install -y -q --no-install-recommends \
ca-certificates \
curl \
cmake \
less \
git \
wget \
${compiler} \
Expand All @@ -35,6 +35,12 @@ RUN ln -s \
ENV CC=${compiler} \
CXX=clang++

COPY ./ci/deps/cmake.sh cmake.sh
RUN ./cmake.sh 3.18.4

ENV PATH=/cmake/bin/:$PATH
ENV LESSCHARSET=utf-8

COPY ./ci/deps/mpich.sh mpich.sh
RUN ./mpich.sh 3.3.2 -j4

Expand Down Expand Up @@ -65,6 +71,7 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
VT_POOL_ENABLED=${VT_POOL_ENABLED} \
VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

RUN /vt/ci/build_cpp.sh /vt /build
Expand Down
8 changes: 7 additions & 1 deletion ci/docker/ubuntu-18.04-gnu-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ RUN apt-get update -y -q && \
less \
curl \
${zoltan_enabled:+gfortran-$(echo ${compiler} | cut -d- -f2)} \
cmake \
git \
wget \
${compiler} \
Expand Down Expand Up @@ -50,6 +49,12 @@ RUN if test ${zoltan_enabled} -eq 1; then \
ENV CC=gcc \
CXX=g++

COPY ./ci/deps/cmake.sh cmake.sh
RUN ./cmake.sh 3.18.4

ENV PATH=/cmake/bin/:$PATH
ENV LESSCHARSET=utf-8

COPY ./ci/deps/mpich.sh mpich.sh
RUN ./mpich.sh 3.3.2 -j4

Expand Down Expand Up @@ -94,6 +99,7 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
VT_ZOLTAN_ENABLED=${VT_ZOLTAN_ENABLED} \
VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

RUN /vt/ci/build_cpp.sh /vt /build
Expand Down
8 changes: 7 additions & 1 deletion ci/docker/ubuntu-18.04-intel-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ RUN apt-get update -y -q && \
ca-certificates \
less \
curl \
cmake \
git \
wget \
zlib1g \
Expand All @@ -35,6 +34,12 @@ RUN ln -s \
/opt/intel/install/bin/icc \
/opt/intel/install/bin/gcc

COPY ./ci/deps/cmake.sh cmake.sh
RUN ./cmake.sh 3.18.4

ENV PATH=/cmake/bin/:$PATH
ENV LESSCHARSET=utf-8

COPY ./ci/deps/mpich.sh mpich.sh
RUN ./mpich.sh 3.3.2 -j4

Expand Down Expand Up @@ -67,6 +72,7 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
VT_POOL_ENABLED=${VT_POOL_ENABLED} \
VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

RUN /vt/ci/build_cpp.sh /vt /build
Expand Down
8 changes: 7 additions & 1 deletion ci/docker/ubuntu-18.04-nvidia-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ RUN apt-get update -y -q && \
ca-certificates \
g++-7 \
curl \
cmake \
less \
git \
wget \
Expand Down Expand Up @@ -60,6 +59,12 @@ RUN if test ${compiler} = "nvcc-10"; then \
ENV CC=gcc \
CXX=g++

COPY ./ci/deps/cmake.sh cmake.sh
RUN ./cmake.sh 3.18.4

ENV PATH=/cmake/bin/:$PATH
ENV LESSCHARSET=utf-8

COPY ./ci/deps/mpich.sh mpich.sh
RUN ./mpich.sh 3.3.2 -j4

Expand Down Expand Up @@ -97,6 +102,7 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
VT_ASAN_ENABLED=${VT_ASAN_ENABLED} \
VT_POOL_ENABLED=${VT_POOL_ENABLED} \
VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

RUN /vt/ci/build_cpp.sh /vt /build
Expand Down
9 changes: 8 additions & 1 deletion ci/docker/ubuntu-20.04-clang-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN apt-get update -y -q && \
apt-get install -y -q --no-install-recommends \
ca-certificates \
curl \
cmake \
less \
git \
wget \
${compiler} \
Expand All @@ -35,6 +35,12 @@ RUN ln -s \
ENV CC=${compiler} \
CXX=clang++

COPY ./ci/deps/cmake.sh cmake.sh
RUN ./cmake.sh 3.18.4

ENV PATH=/cmake/bin/:$PATH
ENV LESSCHARSET=utf-8

COPY ./ci/deps/mpich.sh mpich.sh
RUN ./mpich.sh 3.3.2 -j4

Expand Down Expand Up @@ -65,6 +71,7 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
VT_POOL_ENABLED=${VT_POOL_ENABLED} \
VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

RUN /vt/ci/build_cpp.sh /vt /build
Expand Down
8 changes: 7 additions & 1 deletion ci/docker/ubuntu-20.04-gnu-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ RUN apt-get update -y -q && \
less \
curl \
${zoltan_enabled:+gfortran-$(echo ${compiler} | cut -d- -f2)} \
cmake \
git \
wget \
${compiler} \
Expand Down Expand Up @@ -50,6 +49,12 @@ RUN if test ${zoltan_enabled} -eq 1; then \
ENV CC=gcc \
CXX=g++

COPY ./ci/deps/cmake.sh cmake.sh
RUN ./cmake.sh 3.18.4

ENV PATH=/cmake/bin/:$PATH
ENV LESSCHARSET=utf-8

COPY ./ci/deps/mpich.sh mpich.sh
RUN ./mpich.sh 3.3.2 -j4

Expand Down Expand Up @@ -88,6 +93,7 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
VT_ZOLTAN_ENABLED=${VT_ZOLTAN_ENABLED} \
VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

RUN /vt/ci/build_cpp.sh /vt /build
Expand Down
8 changes: 7 additions & 1 deletion ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ RUN apt-get update -y -q && \
less \
curl \
${zoltan_enabled:+gfortran-$(echo ${compiler} | cut -d- -f2)} \
cmake \
git \
wget \
${compiler} \
Expand Down Expand Up @@ -51,6 +50,12 @@ RUN if test ${zoltan_enabled} -eq 1; then \
ENV CC=gcc \
CXX=g++

COPY ./ci/deps/cmake.sh cmake.sh
RUN ./cmake.sh 3.18.4

ENV PATH=/cmake/bin/:$PATH
ENV LESSCHARSET=utf-8

COPY ./ci/deps/openmpi.sh openmpi.sh
RUN ./openmpi.sh v4.0 4.0.4 -j4

Expand Down Expand Up @@ -92,6 +97,7 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
VT_ZOLTAN_ENABLED=${VT_ZOLTAN_ENABLED} \
VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

RUN /vt/ci/build_cpp.sh /vt /build
Expand Down
Loading

0 comments on commit aa73485

Please sign in to comment.