Merge Release 1.5.0 to master

Release 1.5.0 of Ginkgo.


The Ginkgo team is proud to announce the new Ginkgo minor release 1.5.0. This release brings many important new features such as:
- MPI-based multi-node support for all matrix formats and most solvers;
- full DPC++/SYCL support,
- functionality and interface for GPU-resident sparse direct solvers,
- an interface for wrapping solvers with scaling and reordering applied,
- a new algebraic Multigrid solver/preconditioner,
- improved mixed-precision support,
- support for device matrix assembly,

and much more.

See PR: #1197

Complete release notes: https://github.com/ginkgo-project/ginkgo/blob/master/CHANGELOG.md

Author: Terry Cojean

.clang-format

@@ -86,7 +86,7 @@ PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
-PointerAlignment: Right
+PointerAlignment: Left
 ReflowComments:  true
 SortIncludes:    true
 SortUsingDeclarations: true

.github/abidiff.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+pushd old
+source .github/bot-pr-base.sh
+popd
+
+bot_delete_comments_matching "Note: This PR changes the Ginkgo ABI"
+
+abidiff build-old/lib/libginkgod.so build-new/lib/libginkgod.so &> abi.diff || (bot_comment "Note: This PR changes the Ginkgo ABI:\n\`\`\`\n$(head -n2 abi.diff | tr '\n' ';' | sed 's/;/\\n/g')\`\`\`\nFor details check the full ABI diff under **Artifacts** [here]($JOB_URL)")

.github/bot-base.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

.github/bot-pr-base.sh

@@ -1,7 +1,12 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 source .github/bot-base.sh
 
+EXTENSION_REGEX='\.(cuh?|hpp|hpp\.inc?|cpp)$'
+FORMAT_HEADER_REGEX='^(benchmark|core|cuda|hip|include/ginkgo/core|omp|reference|dpcpp|common/unified|test)/'
+FORMAT_REGEX='^(common|examples)/'
+CLANG_FORMAT=clang-format-9
+
 echo -n "Collecting information on triggering PR"
 PR_URL=$(jq -r .pull_request.url "$GITHUB_EVENT_PATH")
 if [[ "$PR_URL" == "null" ]]; then

.github/bot-pr-format-base.sh

@@ -1,11 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 source .github/bot-pr-base.sh
 
-EXTENSION_REGEX='\.(cuh?|hpp|hpp\.inc?|cpp)$'
-FORMAT_HEADER_REGEX='^(benchmark|core|cuda|hip|include/ginkgo/core|omp|reference|dpcpp)/'
-FORMAT_REGEX='^(common|examples|test)/'
-
 echo "Retrieving PR file list"
 PR_FILES=$(bot_get_all_changed_files ${PR_URL})
 NUM=$(echo "${PR_FILES}" | wc -l)
@@ -34,7 +30,6 @@ cp /tmp/format_header.sh dev_tools/scripts/
 cp /tmp/update_ginkgo_header.sh dev_tools/scripts/
 
 # format files
-CLANG_FORMAT=clang-format-9
 dev_tools/scripts/add_license.sh
 dev_tools/scripts/update_ginkgo_header.sh
 for f in $(echo "$TO_FORMAT" | grep -E $FORMAT_HEADER_REGEX); do dev_tools/scripts/format_header.sh "$f"; done

.github/check-format.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 cp .github/bot-pr-format-base.sh /tmp
 source /tmp/bot-pr-format-base.sh

.github/format-rebase.sh

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+source .github/bot-pr-base.sh
+
+git remote add base "$BASE_URL"
+git remote add fork "$HEAD_URL"
+
+git remote -v
+
+git fetch base $BASE_BRANCH
+git fetch fork $HEAD_BRANCH
+
+git config user.email "$USER_EMAIL"
+git config user.name "$USER_NAME"
+
+LOCAL_BRANCH=rebase-tmp-$HEAD_BRANCH
+git checkout -b $LOCAL_BRANCH fork/$HEAD_BRANCH
+
+# save scripts from develop
+pushd dev_tools/scripts
+cp add_license.sh format_header.sh update_ginkgo_header.sh /tmp
+popd
+
+bot_delete_comments_matching "Error: Rebase failed"
+
+DIFF_COMMAND="git diff --name-only --no-renames --diff-filter=AM HEAD~ | grep -E '$EXTENSION_REGEX'"
+
+# do the formatting rebase
+git rebase --rebase-merges --empty=drop --no-keep-empty \
+    --exec "cp /tmp/add_license.sh /tmp/format_header.sh /tmp/update_ginkgo_header.sh dev_tools/scripts/ && \
+            dev_tools/scripts/add_license.sh && dev_tools/scripts/update_ginkgo_header.sh && \
+            for f in \$($DIFF_COMMAND | grep -E '$FORMAT_HEADER_REGEX'); do dev_tools/scripts/format_header.sh \$f; done && \
+            for f in \$($DIFF_COMMAND | grep -E '$FORMAT_REGEX'); do $CLANG_FORMAT -i \$f; done && \
+            git checkout dev_tools/scripts && (git diff >> /tmp/difflog; true) && (git diff --quiet || git commit -a --amend --no-edit --allow-empty)" \
+    base/$BASE_BRANCH 2>&1 || bot_error "Rebase failed, see the related [Action]($JOB_URL) for details"
+
+# repeat rebase to delete empty commits
+git rebase --rebase-merges --empty=drop --no-keep-empty --exec true \
+    base/$BASE_BRANCH 2>&1 || bot_error "Rebase failed, see the related [Action]($JOB_URL) for details"
+
+cp /tmp/difflog diff.patch
+
+if [ -s diff.patch ]
+then
+    bot_comment "Formatting rebase introduced changes, see Artifacts [here]($JOB_URL) to review them"
+fi
+
+# push back
+git push --force-with-lease fork $LOCAL_BRANCH:$HEAD_BRANCH 2>&1 || bot_error "Cannot push rebased branch, are edits for maintainers allowed, or were changes pushed while the rebase was running?"

.github/format.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 cp .github/bot-pr-format-base.sh /tmp
 source /tmp/bot-pr-format-base.sh
@@ -11,5 +11,5 @@ if [[ "$LIST_FILES" != "" ]]; then
   git commit -a -m "Format files
 
 Co-authored-by: $USER_COMBINED"
-  git push fork $LOCAL_BRANCH:$HEAD_BRANCH 2>&1 || bot_error "Cannot push formatted branch, are edits for maintainers allowed?"
+  git push fork "$LOCAL_BRANCH:$HEAD_BRANCH" 2>&1 || bot_error "Cannot push formatted branch, are edits for maintainers allowed?"
 fi

.github/label.sh

@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 source .github/bot-pr-base.sh
 
 echo "Retrieving PR file list"
-PR_FILES=$(bot_get_all_changed_files ${PR_URL})
+PR_FILES=$(bot_get_all_changed_files "${PR_URL}")
 NUM=$(echo "${PR_FILES}" | wc -l)
 echo "PR has ${NUM} changed files"
 

.github/mirror.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+BRANCH_NAME=${BRANCH_NAME##*/}
+
+git remote add fork "git@github.com:${GITHUB_REPO}.git"
+git remote add gitlab "git@gitlab.com:ginkgo-project/ginkgo-public-ci.git"
+
+git remote -v
+
+# Setup ssh
+eval $(ssh-agent -s)
+echo "${BOT_KEY}" | tr -d '\r' | ssh-add - >/dev/null
+mkdir -p ~/.ssh
+chmod 700 ~/.ssh
+ssh-keyscan -t rsa gitlab.com github.com >>~/.ssh/known_hosts
+
+# Fetch from github
+git fetch fork "$BRANCH_NAME"
+git checkout -B "$BRANCH_NAME"
+git reset --hard fork/"$BRANCH_NAME"
+# Push to gitlab
+git push -u --force gitlab HEAD:$BRANCH_NAME