#2084: Create release `1.3.0` #2114

cz4rs · 2023-03-27T10:30:52Z

fixes #2084

This syncs main with develop.

vt  git diff develop..2084-release-1-3-0 
diff --git a/VERSION b/VERSION
index 23aa83906..f0bb29e76 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.2
+1.3.0

TODO: bump the version on develop once this is merged.

github-actions · 2023-03-27T11:09:03Z

Pipelines results

PR tests (gcc-9, ubuntu, mpich, zoltan)

Build for 7ac436c (2023-03-30 07:47:20 UTC)

Compilation - successful

Testing - passed

Build log

PR tests (clang-9, ubuntu, mpich)

Build for 7ac436c (2023-03-30 07:47:20 UTC)

Compilation - successful

Testing - passed

Build log

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

Build for 7ac436c (2023-03-30 07:47:20 UTC)

Compilation - successful

Testing - passed

Build log

PR tests (gcc-7, ubuntu, mpich, trace runtime, LB)

Build for 7ac436c (2023-03-30 07:47:20 UTC)

Compilation - successful

Testing - passed

Build log

PR tests (nvidia cuda 11.0, ubuntu, mpich)

Build for 7ac436c (2023-03-30 07:47:20 UTC)

Compilation - successful

Testing - passed

Build log

PR tests (clang-11, ubuntu, mpich)

Build for 7ac436c (2023-03-30 07:47:20 UTC)

Compilation - successful

Testing - passed

Build log

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

Build for 7ac436c (2023-03-30 07:47:20 UTC)

Compilation - successful

Testing - passed

Build log

PR tests (clang-10, ubuntu, mpich)

Build for 7ac436c (2023-03-30 07:47:20 UTC)

Compilation - successful

Testing - passed

Build log

PR tests (clang-14, ubuntu, mpich)

Build for 7ac436c (2023-03-30 07:47:20 UTC)

Compilation - successful

Testing - passed

Build log

PR tests (clang-12, ubuntu, mpich)

Build for 7ac436c (2023-03-30 07:47:20 UTC)

Compilation - successful

Testing - passed

Build log

PR tests (intel icpc, ubuntu, mpich)

Build for 7ac436c (2023-03-30 07:47:20 UTC)

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.
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. <==

Build log

PR tests (clang-13, ubuntu, mpich)

Build for 7ac436c (2023-03-30 07:47:20 UTC)

Compilation - successful

Testing - passed

Build log

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

Build for 7ac436c (2023-03-30 07:47:20 UTC)

Compilation - successful

Testing - passed

Build log

PR tests (nvidia cuda 11.2, ubuntu, mpich)

Build for 7ac436c (2023-03-30 07:47:20 UTC)

Compilation - successful

Testing - passed

Build log

PR tests (gcc-12, ubuntu, mpich)

Build for 7ac436c (2023-03-30 07:47:20 UTC)

Compilation - successful

Testing - passed

Build log

…ation function that takes in the worker count but make them deprecated to avoid breaking existing code

…ation caused deprecation warnings on some compilers

cz4rs · 2023-03-30T11:51:41Z

Codacy failure can be safely ignored (it is not configured to run on main).

PhilMiller · 2023-03-30T15:44:27Z

Could we just make this a merge of develop into main, and do away with the cherry-picks? Or, at least, make this branch just downstream of develop, with the single commit setting the release version, and merge that? It would be really nice if history could be reconnected, and we could start doing essentially git log main..develop to see what's been merged but not yet released.

cz4rs · 2023-03-30T16:11:47Z

Simple git checkout main -> git merge develop creates quite a lot of conflicts:

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
        both modified:   .github/workflows/build-docs.yml
        both modified:   .github/workflows/macosx-clang-mpich.yml
        both modified:   CMakeLists.txt
        both modified:   README.md
        both modified:   ci/azure/azure-clang-10-ubuntu-mpich.yml
        both modified:   ci/azure/azure-clang-11-ubuntu-mpich.yml
        both modified:   ci/azure/azure-clang-12-ubuntu-mpich.yml
        both modified:   ci/azure/azure-clang-14-ubuntu-mpich.yml
        deleted by them: ci/azure/azure-clang-5.0-ubuntu-mpich.yml
        both modified:   ci/azure/azure-clang-9-ubuntu-mpich.yml
        both modified:   ci/azure/azure-clang-alpine-mpich.yml
        both modified:   ci/azure/azure-gcc-10-ubuntu-openmpi.yml
        both modified:   ci/azure/azure-gcc-11-ubuntu-mpich.yml
        deleted by them: ci/azure/azure-gcc-7-ubuntu-mpich.yml
        both modified:   ci/azure/azure-gcc-8-ubuntu-mpich.yml
        both modified:   ci/azure/azure-gcc-9-ubuntu-mpich.yml
        both modified:   ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml
        both modified:   ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml
        both modified:   ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml
        both modified:   ci/azure/azure-nvidia-11-ubuntu-mpich.yml
        both modified:   ci/build_cpp.sh
        both modified:   ci/build_vt_sample.sh
        both modified:   ci/docker/ubuntu-clang-cpp.dockerfile
        both modified:   docker-compose.yml
        both modified:   docs/md/building.md
        both added:      examples/collection/polymorphic_collection.cc
        both added:      scripts/JSON_data_files_validator.py
        both modified:   scripts/workflows-azure.ini
        both modified:   src/CMakeLists.txt
        both modified:   src/vt/configs/arguments/args.cc
        both modified:   src/vt/context/runnable_context/collection.cc
        both modified:   src/vt/context/runnable_context/collection.h
        both modified:   src/vt/context/runnable_context/collection.impl.h
        both modified:   src/vt/context/runnable_context/lb_data.cc
        both modified:   src/vt/context/runnable_context/lb_data.h
        both modified:   src/vt/context/runnable_context/trace.cc
        both modified:   src/vt/context/runnable_context/trace.h
        both modified:   src/vt/messaging/active.cc
        deleted by us:   src/vt/messaging/async_op_hip.h
        both modified:   src/vt/runnable/make_runnable.h
        both modified:   src/vt/runnable/runnable.cc
        both modified:   src/vt/runnable/runnable.h
        both modified:   src/vt/runtime/runtime_get.cc
        both modified:   src/vt/scheduler/scheduler.cc
        both modified:   src/vt/scheduler/scheduler.h
        both modified:   src/vt/termination/termination.cc
        both modified:   src/vt/topos/location/location.h
        both modified:   src/vt/topos/location/location.impl.h
        both modified:   src/vt/vrt/collection/manager.impl.h
        both modified:   src/vt/vrt/context/context_vrtmanager.impl.h
        both added:      tests/perf/collection_local_send.cc
        both added:      tests/perf/collection_local_send_prealloc.cc
        both added:      tests/perf/make_runnable_micro.cc
        both added:      tests/perf/objgroup_local_send.cc
        both added:      tests/perf/ping_pong_am.cc
        both added:      tests/perf/reduce.cc
        both modified:   tests/unit/active/test_async_op_threads.cc
        both modified:   tests/unit/collection/test_collection_group.extended.cc
        both modified:   tests/unit/collection/test_lb.extended.cc
        both modified:   tests/unit/collection/test_list_insert.cc

Previously we've also had to do some hisotry rewriting to fix unsigned commit. I will take another look at simplifying this tomorrow, for now the most tempting option is some kind of force push directly to main 😅

PhilMiller · 2023-03-30T16:31:56Z

Rather than a force push, we could consider git checkout main; git merge -S theirs develop. If we've truly diverged, we need to do at least to figure out why, and actually address it. I'll talk to Jonathan today during our awake hours.

cz4rs · 2023-03-31T07:15:33Z

Rather than a force push, we could consider git checkout main; git merge -S theirs develop. If we've truly diverged, we need to do at least to figure out why, and actually address it. I'll talk to Jonathan today during our awake hours.

I have posted a draft PR with the results of git merge -X theirs develop: #2128 (comment). This resolves the conflicts (except for manual git add/remove on some files), but we end up with changes in the code as well.

cz4rs linked an issue Mar 28, 2023 that may be closed by this pull request

Create release 1.3.0 #2084

Closed

3 tasks

cz4rs marked this pull request as draft March 28, 2023 11:37

cz4rs and others added 27 commits March 30, 2023 09:46

#2053: CI: update GitHub Actions versions

3742b8d

#2053: CI: remove obsolete workflow step

14edf33

#2056: fcontext: fix typos in AsyncOp test

e5c4a0d

#2056: CI: enable fcontext in clang-11 build

33df7c2

#2062: pool: rename file to fix link on mac

b917603

#2037: Remove workers

6906499

#2037: Remove references to stdthread

06ab30d

#2037: Remove VT_USE_STD_THREAD

af0c74a

#2037: Remove TLS and worker from Context

ba55216

#2037: Remove no_workers

b5ac2f2

#2037: Remove openmp

139b838

#2037: Update CMake files and documentation

bebda6c

#2037: Remove unnecessary macros after workers deletion

7abe57e

#2037: Rework handling of messages buffer in context_vrtinfo

d6c1d34

#2037: Remove CMake functions for enabling / disabling fcontext

13d62cb

#2037: Remove null_atomic

5a09c1e

#2037: Remove null mutex

e2bfe11

#2045: CI: switch C++ standard to 17 on CI builds by default

71f74e1

#2045: CI: regenerate workflows

407eb0a

#2045: build: switch everything to C++17 by default

bf6f191

#2045: util: force use variable

85b236a

#2066: Remove C++ standard override for bundled libraries

a63a674

#2071: add back in no_workers, WorkerCountType, and the initializ…

8b20e67

…ation function that takes in the worker count but make them deprecated to avoid breaking existing code

#2071: remove WorkerCountType since using it in a deprecated declar…

04fa47b

…ation caused deprecation warnings on some compilers

#2033: lb: rewrite and fix bugs in OfflineLB/LBDataRestartReader

c6b7bc4

#2033: lb: fix bugs in LBDataHolder with assertions too strong

952d52a

#2033: lb: write new test for OfflineLB, remove bad old code

158a0ff

nlslatt and others added 12 commits March 30, 2023 09:46

#2098: schema: add metadata block to validator

51e9ee9

#2098: json appender: update documentation

3c5cfd7

#2098: schema: allow type to be in old position

34bbfa0

#2098: lb: only add physical node info when known

1fefa6d

#2046: build: remove detector as dependency

254f00a

#2046: build: change how sample project is built

d6f8e05

#2046: build: more changes

eb98c7f

#2119: cmake: install target for checkpoint when included in lib

64d2c6a

#2115: CI: use CMake 3.23.4

2e88823

#2115: require CMake 3.23

5861a7a

#2115: CI: fix check_containers script

875666d

#2115: CI: disable shallow fetch in Azure pipelines

fbc28c2

cz4rs marked this pull request as ready for review March 30, 2023 07:47

#2084: bump version number to 1.3.0

7ac436c

cz4rs force-pushed the 2084-release-1-3-0 branch from 2be3cb1 to 7ac436c Compare March 30, 2023 07:47

cz4rs requested review from lifflander, JacobDomagala, PhilMiller, nlslatt, nmm0, stmcgovern and thearusable March 30, 2023 07:48

cz4rs mentioned this pull request Apr 4, 2023

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

Merged

nmm0 mentioned this pull request Apr 4, 2023

Meeting Agenda [do not close] #925

Open

lifflander closed this May 30, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#2084: Create release `1.3.0` #2114

#2084: Create release `1.3.0` #2114

cz4rs commented Mar 27, 2023 •

edited

Loading

github-actions bot commented Mar 27, 2023 •

edited

Loading

cz4rs commented Mar 30, 2023

PhilMiller commented Mar 30, 2023

cz4rs commented Mar 30, 2023

PhilMiller commented Mar 30, 2023

cz4rs commented Mar 31, 2023

#2084: Create release 1.3.0 #2114

#2084: Create release 1.3.0 #2114

Conversation

cz4rs commented Mar 27, 2023 • edited Loading

github-actions bot commented Mar 27, 2023 • edited Loading

Pipelines results

cz4rs commented Mar 30, 2023

PhilMiller commented Mar 30, 2023

cz4rs commented Mar 30, 2023

PhilMiller commented Mar 30, 2023

cz4rs commented Mar 31, 2023

#2084: Create release `1.3.0` #2114

#2084: Create release `1.3.0` #2114

cz4rs commented Mar 27, 2023 •

edited

Loading

github-actions bot commented Mar 27, 2023 •

edited

Loading