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.

Sign up for GitHub

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

Jump to bottom

#2084: Create release `1.3.0` (`git merge` approach) #2128

Merged

lifflander merged 429 commits into main from 2084-release-1-3-0-merge

May 30, 2023

Contributor

cz4rs commented Mar 31, 2023 •

edited

Loading

fixes #2084

Try another way of handling the history:

git checkout main
git checkout -b 2084-release-1-3-0-merge
git merge -X theirs origin/develop
git status
(...)
git rm ci/azure/azure-clang-5.0-ubuntu-mpich.yml 
git rm ci/azure/azure-gcc-7-ubuntu-mpich.yml 
git add src/vt/messaging/async_op_hip.h 
git merge --continue 
git cherry-pick 7ac436c9a

The remaining differences are handled with 348fb8e.

thearusable and others added 30 commits

December 6, 2022 19:26


          #2018: Remove support for gcc-5, gcc-6, clang-3.9


          #2018: Remove reference to gcc-5, gcc-6, clang-3.9 from CI and misc f…

17dc010

…iles


          Merge pull request #2021 from DARMA-tasking/2018-remove-support-for-o…

b04218c

…ld-compilers

#2018: Remove support for old compilers


          #1930: Add new microbenchmarks

7ccfb7a


          #1930: tests: improve tests, align with develop

b58f7de


          #1930: fix license

e472953


          #1930: reduce num_iters in make_runnable test

b0bde99


          #1930: perf: fix wrong names

ba2c830


          #1930: add benchmarks

d83125a


          #1930: change names and fix licenses

f0f3c76


          #1930: update test names in strings

9d37137


          #1930: remove destructor so that make_runnable_micro passes

931335d


          #1930: reduce the number of runs

db31213


          #1930: split collection_local_send

6d76bbd


          #1930: fix license

288a1d1


          #1930: clean whitespace

c6dfc3f


          Merge pull request #1931 from DARMA-tasking/1930-add-new-microbenchmarks

63376f6

1930 Add new microbenchmarks


          #2028: runnable: track suspended task to put it back correctly

8f0adea


          #2028: tests: write new test to check for nested suspensions

641e90b


          #2028: Fix setting/restoring current thread across suspend/resume


          #2028: tests: write new test to check thread ID with nested suspensions

ae39985


          #2028: Assert unconditionally that a suspending-thread task is the bo…

f8b98ee

…ttom of the implicit task stack


          #2028: ults: add comments

67101e2


          #2028: tests: fix comments and make variable names better

df9e052


          Merge pull request #2029 from DARMA-tasking/2028-setcontext-doesnt-su…

712749c

…spend-correct-task-with-threads

2028 setcontext doesnt suspend correct task with threads


          #2040 Clarify reference to static member functions in template argume…

9a45fbe

…nt to appease nvcc 11.4


          #2040: Also qualify remaining instances of member function names as s…

de4cd03

…endMsg template arguments that nvcc didn't complain about this time


          Merge pull request #2041 from DARMA-tasking/2040-appease-cuda

3ac0077

#2040 Clarify reference to static member functions in template argument to appease nvcc 11.4


          #1659: lb: remove redundant argument

8024e1d


          #1659: clean-up LBType

f874ccd

cz4rs and others added 5 commits

March 30, 2023 13:11


          #2107: CI: further remove gcc-7 usage

42f0ce3


          #2107: CI: use pinned version of macos image (12)

7eaac98


          Merge pull request #2110 from DARMA-tasking/2107-remove-obsolete-builds

d4f4501

#2107: CI: remove builds for unsupported compilers


          Merge remote-tracking branch 'origin/develop' into 2084-release-1-3-0…

e45d299

…-merge


          #2084: bump version number to 1.3.0

d5c0d9f

github-actions bot commented Mar 31, 2023 •

edited

Loading

Pipelines results

PR tests (gcc-12, ubuntu, mpich)

Build for 348fb8e (2023-04-04 15:53:26 UTC)

Compilation - successful

Testing - passed

PR tests (gcc-9, ubuntu, mpich, zoltan, json schema test)

Build for 348fb8e (2023-04-04 15:53:26 UTC)

Compilation - successful

Testing - passed

PR tests (clang-9, ubuntu, mpich)

Build for 348fb8e (2023-04-04 15:53:26 UTC)

Compilation - successful

Testing - passed

PR tests (gcc-10, ubuntu, openmpi, no LB)

Build for 348fb8e (2023-04-04 15:53:26 UTC)

Compilation - successful

Testing - passed

PR tests (clang-12, ubuntu, mpich)

Build for 348fb8e (2023-04-04 15:53:26 UTC)

Compilation - successful

Testing - passed

PR tests (clang-11, ubuntu, mpich)

Build for 348fb8e (2023-04-04 15:53:26 UTC)

Compilation - successful

Testing - passed

PR tests (gcc-8, ubuntu, mpich, address sanitizer)

Build for 348fb8e (2023-04-04 15:53:26 UTC)

Compilation - successful

Testing - passed

PR tests (clang-13, ubuntu, mpich)

Build for 348fb8e (2023-04-04 15:53:26 UTC)

Compilation - successful

Testing - passed

PR tests (clang-14, ubuntu, mpich)

Build for 348fb8e (2023-04-04 15:53:26 UTC)

Compilation - successful

Testing - passed

PR tests (nvidia cuda 11.0, ubuntu, mpich)

Build for 348fb8e (2023-04-04 15:53:26 UTC)

Compilation - successful

Testing - passed

PR tests (nvidia cuda 11.2, ubuntu, mpich)

Build for 348fb8e (2023-04-04 15:53:26 UTC)

Compilation - successful

Testing - passed

PR tests (clang-10, ubuntu, mpich)

Build for 348fb8e (2023-04-04 15:53:26 UTC)

Compilation - successful

Testing - passed

PR tests (gcc-11, ubuntu, mpich, trace runtime, coverage)

Build for 348fb8e (2023-04-04 15:53:26 UTC)

Compilation - successful

Testing - passed

PR tests (intel icpc, ubuntu, mpich)

Build for 348fb8e (2023-04-04 15:53:26 UTC)

intel-cc: remark #10441: The Intel(R) C++ Compiler Classic (ICC) is deprecated and will be removed from product release in the second half of 2023. The Intel(R) oneAPI DPC++/C++ Compiler (ICX) is the recommended compiler moving forward. Please transition to use this compiler. Use '-diag-disable=10441' to disable this message.
intel-cc: remark #10441: The Intel(R) C++ Compiler Classic (ICC) is deprecated and will be removed from product release in the second half of 2023. The Intel(R) oneAPI DPC++/C++ Compiler (ICX) is the recommended compiler moving forward. Please transition to use this compiler. Use '-diag-disable=10441' to disable this message.
icpc: remark #10441: The Intel(R) C++ Compiler Classic (ICC) is deprecated and will be removed from product release in the second half of 2023. The Intel(R) oneAPI DPC++/C++ Compiler (ICX) is the recommended compiler moving forward. Please transition to use this compiler. Use '-diag-disable=10441' to disable this message.
icpc: remark #10441: The Intel(R) C++ Compiler Classic (ICC) is deprecated and will be removed from product release in the second half of 2023. The Intel(R) oneAPI DPC++/C++ Compiler (ICX) is the recommended compiler moving forward. Please transition to use this compiler. Use '-diag-disable=10441' to disable this message.
intel-cc: remark #10441: The Intel(R) C++ Compiler Classic (ICC) is deprecated and will be removed from product release in the second half of 2023. The Intel(R) oneAPI DPC++/C++ Compiler (ICX) is the recommended compiler moving forward. Please transition to use this compiler. Use '-diag-disable=10441' to disable this message.
intel-cc: remark #10441: The Intel(R) C++ Compiler Classic (ICC) is deprecated and will be removed from product release in the second half of 2023. The Intel(R) oneAPI DPC++/C++ Compiler (ICX) is the recommended compiler moving forward. Please transition to use this compiler. Use '-diag-disable=10441' to disable this message.
intel-cc: remark #10441: The Intel(R) C++ Compiler Classic (ICC) is deprecated and will be removed from product release in the second half of 2023. The Intel(R) oneAPI DPC++/C++ Compiler (ICX) is the recommended compiler moving forward. Please transition to use this compiler. Use '-diag-disable=10441' to disable this message.
intel-cc: remark #10441: The Intel(R) C++ Compiler Classic (ICC) is deprecated and will be removed from product release in the second half of 2023. The Intel(R) oneAPI DPC++/C++ Compiler (ICX) is the recommended compiler moving forward. Please transition to use this compiler. Use '-diag-disable=10441' to disable this message.
intel-cc: remark #10441: The Intel(R) C++ Compiler Classic (ICC) is deprecated and will be removed from product release in the second half of 2023. The Intel(R) oneAPI DPC++/C++ Compiler (ICX) is the recommended compiler moving forward. Please transition to use this compiler. Use '-diag-disable=10441' to disable this message.
in%0D%0A%0D%0A%0D%0A ==> And there is more. Read log. <==

cz4rs mentioned this pull request

#2084: Create release 1.3.0 #2114

Closed

Contributor Author

cz4rs commented Apr 4, 2023

With this approach git log main..develop will show history correctly as Phil has requested.

cz4rs marked this pull request as ready for review

April 4, 2023 15:53


          #2084: sync with develop

348fb8e

cz4rs force-pushed the 2084-release-1-3-0-merge branch from 80d7b34 to 348fb8e Compare

April 4, 2023 15:53

cz4rs requested review from PhilMiller, stmcgovern, lifflander, nmm0, thearusable, JacobDomagala and nlslatt

April 4, 2023 15:54

cz4rs changed the title ~~#2084: Create release 1.3.0~~ #2084: Create release 1.3.0 (git merge approach)

Collaborator

nlslatt commented Apr 4, 2023

@cz4rs Why does this PR target develop instead of main?

Contributor Author

cz4rs commented Apr 4, 2023

@cz4rs Why does this PR target develop instead of main?

My bad 🤦

cz4rs marked this pull request as draft

April 4, 2023 17:04

PhilMiller changed the base branch from develop to main

April 4, 2023 17:13

cz4rs marked this pull request as ready for review

April 4, 2023 17:21

nmm0 mentioned this pull request

Meeting Agenda [do not close] #925

Open

Contributor Author

cz4rs commented Apr 5, 2023

Source code is in sync now:

git diff develop..2084-release-1-3-0-merge

diff --git a/VERSION b/VERSION
index 23aa83906..f0bb29e76 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.2
+1.3.0

lifflander approved these changes

View reviewed changes

Collaborator

nlslatt commented May 23, 2023

@cz4rs @PhilMiller @lifflander Is this the one we want to merge, without the signed commit? I don't see an option to override the requirement here. Do we just turn off the requirement in the branch settings, merge, and then turn it back on?

Contributor Author

cz4rs commented May 23, 2023

@cz4rs @PhilMiller @lifflander Is this the one we want to merge, without the signed commit? I don't see an option to override the requirement here. Do we just turn off the requirement in the branch settings, merge, and then turn it back on?

Sounds reasonable to me.

lifflander merged commit 9e707d2 into main

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

lifflander lifflander approved these changes

PhilMiller Awaiting requested review from PhilMiller

stmcgovern Awaiting requested review from stmcgovern

nmm0 Awaiting requested review from nmm0

thearusable Awaiting requested review from thearusable

JacobDomagala Awaiting requested review from JacobDomagala

nlslatt Awaiting requested review from nlslatt

Labels

None yet