Skip to content

Commit

Permalink
Merge pull request #2128 from DARMA-tasking/2084-release-1-3-0-merge
Browse files Browse the repository at this point in the history
#2084: Create release `1.3.0` (`git merge` approach)
  • Loading branch information
lifflander authored May 30, 2023
2 parents 04ee937 + 348fb8e commit 9e707d2
Show file tree
Hide file tree
Showing 329 changed files with 3,528 additions and 8,574 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
REPO=lifflander1/vt
ARCH=amd64
UBUNTU=18.04
UBUNTU=22.04
ULIMIT_CORE=0
COMPILER=gcc-7
COMPILER=gcc-12
COMPILER_TYPE=gnu
PROXY=
CACHE=
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Build Documentation

on:
# Trigger the workflow on push or pull request,
# but only for the master branch
push:
branches:
- develop
Expand All @@ -18,7 +16,7 @@ jobs:
ARCH: amd64
UBUNTU: 18.04
COMPILER_TYPE: gnu
COMPILER: gcc-7
COMPILER: gcc-8
BUILD_TYPE: release
ULIMIT_CORE: 0
VT_LB: 1
Expand All @@ -31,6 +29,6 @@ jobs:
TOKEN: ${{ secrets.GH_PAT }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Build the Docker image
run: docker-compose run ubuntu-docs
2 changes: 1 addition & 1 deletion .github/workflows/build-statistics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Generate build stats
uses: DARMA-tasking/build-stats@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-commit-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Check commit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-include-guards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
steps:

- name: Checkout source code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup Dependencies
uses: actions/setup-python@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-trailing-whitespace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Find Trailing Whitespace
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: DARMA-tasking/find-trailing-whitespace@master
with:
exclude: "sketches;lib"
20 changes: 9 additions & 11 deletions .github/workflows/macosx-clang-mpich.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: PR tests (clang-8, macosx, mpich)
name: PR tests (clang-14, macosx, mpich)

# Trigger the workflow on push or pull request
on:
push:
branches:
- develop
- 1.*
- main
pull_request:
types: [opened, reopened, synchronize, converted_to_draft, ready_for_review]

Expand All @@ -15,7 +15,7 @@ concurrency:

jobs:
build:
runs-on: macos-latest
runs-on: macos-12

if: github.event.pull_request.draft == false

Expand All @@ -26,26 +26,24 @@ jobs:
CMAKE_BUILD_TYPE: release
VT_LB_ENABLED: 1
VT_TRACE_ENABLED: 1
VT_USE_OPENMP: 0
VT_USE_STD_THREAD: 0
VT_WERROR: 1
CMAKE_CXX_STANDARD: 17
CMAKE_GENERATOR: "Unix Makefiles"
CMAKE_BUILD_PARALLEL_LEVEL: 4

steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: ~/.ccache
key: ${{ runner.os }}-macosx-clang-8-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }}-${{ hashFiles('**/*') }}
key: ${{ runner.os }}-macosx-clang-14-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }}-${{ hashFiles('**/*') }}
restore-keys: |
${{ runner.os }}-macosx-clang-8-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }}
- uses: actions/cache@v2
${{ runner.os }}-macosx-clang-14-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }}
- uses: actions/cache@v3
id: mpich-cache
with:
path: ~/.mpich
key: ${{ runner.os }}-macosx-clang-8-mpich-${{ hashFiles('**/.github/workflows/macosx-clang-mpich.yml', '**/ci/deps/mpich.sh') }}
key: ${{ runner.os }}-macosx-clang-14-mpich-${{ hashFiles('**/.github/workflows/macosx-clang-mpich.yml', '**/ci/deps/mpich.sh') }}
- name: Install Dependencies
shell: bash
run: brew bundle --file=ci/Brewfile
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/pushdockerimage.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
name: Docker Image CI

on:
# Trigger the workflow on push or pull request,
# but only for the master branch
push:
branches:
- develop
- 1.*

jobs:

Expand All @@ -15,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Docker Build & Push
uses: jerray/publish-docker-action@master
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-git-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Run git check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ build
transport
lib/*-build
lib/checkpoint
lib/detector
lib/googletest
lib/kokkos
.emacs.desktop
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.17 FATAL_ERROR)
cmake_minimum_required(VERSION 3.23 FATAL_ERROR)

file(READ "VERSION" _vt_version_str)
string(STRIP "${_vt_version_str}" _vt_version_str)
Expand Down Expand Up @@ -39,7 +39,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14 CACHE STRING "The C++ standard to use")
set(CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard to use")
endif()
message(STATUS "CMAKE_CXX_STANDARD: ${CMAKE_CXX_STANDARD}")

Expand Down
13 changes: 9 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,23 @@
[![codecov](https://codecov.io/gh/DARMA-tasking/vt/branch/develop/graph/badge.svg)](https://codecov.io/gh/DARMA-tasking/vt)
[![License](https://img.shields.io/badge/License-BSD%203--Clause-orange.svg)](https://opensource.org/licenses/BSD-3-Clause)
![](https://github.com/DARMA-tasking/vt/workflows/Docker%20Image%20CI/badge.svg)
[![gcc-7, ubuntu, mpich, trace runtime, LB](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-7%2C%20ubuntu%2C%20mpich%2C%20trace%20runtime%2C%20LB)?branchName=develop&Label=(gcc-7%2C%20ubuntu%2C%20mpich%2C%20trace%20runtime%2C%20LB))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=8&branchName=develop)
[![gcc-8, ubuntu, mpich, address sanitizer](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-8%2C%20ubuntu%2C%20mpich%2C%20address%20sanitizer)?branchName=develop&Label=(gcc-8%2C%20ubuntu%2C%20mpich%2C%20address%20sanitizer))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=9&branchName=develop)
[![gcc-9, ubuntu, mpich, zoltan](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-9%2C%20ubuntu%2C%20mpich%2C%20zoltan)?branchName=develop&Label=(gcc-9%2C%20ubuntu%2C%20mpich%2C%20zoltan))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=10&branchName=develop)
[![gcc-10, ubuntu, openmpi, no LB](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-10%2C%20ubuntu%2C%20openmpi%2C%20no%20LB)?branchName=develop&Label=(gcc-10%2C%20ubuntu%2C%20openmpi%2C%20no%20LB))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=4&branchName=develop)
[![clang-5, ubuntu, mpich, trace](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(clang-5.0%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(clang-5.0%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=5&branchName=develop)
[![gcc-11, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-11%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(gcc-11%2C%20ubuntu%2C%20mpich%2C%20trace%20runtime%2C%20coverage))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=29&branchName=develop)
[![gcc-12, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-12%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(gcc-12%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=30&branchName=develop)
[![clang-9, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(clang-9%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(clang-9.0%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build?definitionId=22&branchName=develop)
[![clang-10, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(clang-10%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(clang-10.0%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build?definitionId=21&branchName=develop)
[![nvidia cuda 10.1, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(nvidia%20cuda%2010.1%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(nvidia%20cuda%2010.1%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=11&branchName=develop)
[![clang-11, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(clang-11%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(clang-11.0%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build?definitionId=25&branchName=develop)
[![clang-12, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(clang-12%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(clang-12.0%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build?definitionId=26&branchName=develop)
[![clang-13, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(clang-13%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(clang-13.0%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build?definitionId=27&branchName=develop)
[![clang-13, alpine, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(clang-13%2C%20alpine%2C%20mpich)?branchName=develop&Label=(clang-13.0%2C%20alpine%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build?definitionId=23&branchName=develop)
[![clang-14, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(clang-14%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(clang-14.0%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build?definitionId=28&branchName=develop)
[![nvidia cuda 11.0, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(nvidia%20cuda%2011.0%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(nvidia%20cuda%2011.0%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=12&branchName=develop)
[![nvidia cuda 11.2, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(nvidia%20cuda%2011.2%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(nvidia%20cuda%2011.2%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=32&branchName=develop)
[![gcc-10, ubuntu, openmpi, no LB, spack-package](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20spack-package%20(gcc-10%2C%20ubuntu%2C%20openmpi%2C%20no%20LB%2C%20spack-package)?branchName=develop&Label=(gcc-10%2C%20ubuntu%2C%20openmpi%2C%20no%20LB%2C%20spack-package))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=20&branchName=develop)
[![icpx, ubuntu, mpich](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(intel%20icpx%2C%20ubuntu%2C%20mpich)?branchName=develop&Label=(icpx%2C%20ubuntu%2C%20mpich))](https://dev.azure.com/DARMA-tasking/DARMA/_build?definitionId=24&branchName=develop)
![apple clang, macosx, mpich](https://github.com/DARMA-tasking/vt/workflows/PR%20tests%20(clang-8,%20macosx,%20mpich)/badge.svg?branch=develop)
![apple clang, macosx, mpich](https://github.com/DARMA-tasking/vt/workflows/PR%20tests%20(clang-14,%20macosx,%20mpich)/badge.svg?branch=develop)
![Build Documentation](https://github.com/DARMA-tasking/vt/workflows/Build%20Documentation/badge.svg?branch=develop)
[![](https://github.com/DARMA-tasking/vt/wiki/build_stats/build_status_badge.svg)](https://github.com/DARMA-tasking/vt/wiki/Build-Stats)

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.2
1.3.0
14 changes: 4 additions & 10 deletions ci/azure/azure-clang-10-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ trigger:
branches:
include:
- develop
- 1.0.0*
- main

pr:
drafts: false
Expand Down Expand Up @@ -46,15 +46,13 @@ variables:
VT_UNITY_BUILD: 1
VT_PRODUCTION_BUILD: 0
VT_FCONTEXT: 0
VT_USE_OPENMP: 0
VT_USE_STD_THREAD: 0
VT_ZOLTAN: 0
VT_CI_BUILD: 1
VT_DIAGNOSTICS: 1
VT_NO_COLOR: 1
VT_BUILD_SHARED_LIBS: 0
VT_INCLUSION: TPL
CMAKE_CXX_STANDARD: 14
CMAKE_CXX_STANDARD: 17
TEST_LB_SCHEMA: 0
CACHE: "$(Agent.TempDirectory)/cache/"
cache_name: ubuntu-clang-10-cache
Expand All @@ -76,12 +74,8 @@ stages:
vmImage: 'ubuntu-22.04'
timeoutInMinutes: 180
steps:
- task: Bash@3
displayName: Job setup
inputs:
targetType: 'inline'
script: |
echo setup
- checkout: self
fetchDepth: 0
- task: Bash@3
displayName: Build timestamp for caching
continueOnError: true
Expand Down
16 changes: 5 additions & 11 deletions ci/azure/azure-clang-11-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ trigger:
branches:
include:
- develop
- 1.0.0*
- main

pr:
drafts: false
Expand Down Expand Up @@ -45,16 +45,14 @@ variables:
VT_TESTS_NUM_NODES: 2
VT_UNITY_BUILD: 1
VT_PRODUCTION_BUILD: 0
VT_FCONTEXT: 0
VT_USE_OPENMP: 0
VT_USE_STD_THREAD: 0
VT_FCONTEXT: 1
VT_ZOLTAN: 0
VT_CI_BUILD: 1
VT_DIAGNOSTICS: 1
VT_NO_COLOR: 1
VT_BUILD_SHARED_LIBS: 0
VT_INCLUSION: TPL
CMAKE_CXX_STANDARD: 14
CMAKE_CXX_STANDARD: 17
TEST_LB_SCHEMA: 0
CACHE: "$(Agent.TempDirectory)/cache/"
cache_name: ubuntu-clang-11-cache
Expand All @@ -76,12 +74,8 @@ stages:
vmImage: 'ubuntu-22.04'
timeoutInMinutes: 180
steps:
- task: Bash@3
displayName: Job setup
inputs:
targetType: 'inline'
script: |
echo setup
- checkout: self
fetchDepth: 0
- task: Bash@3
displayName: Build timestamp for caching
continueOnError: true
Expand Down
14 changes: 4 additions & 10 deletions ci/azure/azure-clang-12-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ trigger:
branches:
include:
- develop
- 1.0.0*
- main

pr:
drafts: false
Expand Down Expand Up @@ -46,15 +46,13 @@ variables:
VT_UNITY_BUILD: 1
VT_PRODUCTION_BUILD: 0
VT_FCONTEXT: 0
VT_USE_OPENMP: 0
VT_USE_STD_THREAD: 0
VT_ZOLTAN: 0
VT_CI_BUILD: 1
VT_DIAGNOSTICS: 1
VT_NO_COLOR: 1
VT_BUILD_SHARED_LIBS: 0
VT_INCLUSION: TPL
CMAKE_CXX_STANDARD: 14
CMAKE_CXX_STANDARD: 17
TEST_LB_SCHEMA: 0
CACHE: "$(Agent.TempDirectory)/cache/"
cache_name: ubuntu-clang-12-cache
Expand All @@ -76,12 +74,8 @@ stages:
vmImage: 'ubuntu-22.04'
timeoutInMinutes: 180
steps:
- task: Bash@3
displayName: Job setup
inputs:
targetType: 'inline'
script: |
echo setup
- checkout: self
fetchDepth: 0
- task: Bash@3
displayName: Build timestamp for caching
continueOnError: true
Expand Down
12 changes: 3 additions & 9 deletions ci/azure/azure-clang-13-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ trigger:
branches:
include:
- develop
- 1.0.0*
- main

pr:
drafts: false
Expand Down Expand Up @@ -46,8 +46,6 @@ variables:
VT_UNITY_BUILD: 1
VT_PRODUCTION_BUILD: 0
VT_FCONTEXT: 0
VT_USE_OPENMP: 0
VT_USE_STD_THREAD: 0
VT_ZOLTAN: 0
VT_CI_BUILD: 1
VT_DIAGNOSTICS: 1
Expand Down Expand Up @@ -76,12 +74,8 @@ stages:
vmImage: 'ubuntu-22.04'
timeoutInMinutes: 180
steps:
- task: Bash@3
displayName: Job setup
inputs:
targetType: 'inline'
script: |
echo setup
- checkout: self
fetchDepth: 0
- task: Bash@3
displayName: Build timestamp for caching
continueOnError: true
Expand Down
Loading

0 comments on commit 9e707d2

Please sign in to comment.