Skip to content

Commit f988397

Browse files
wdeconinckwdeconinck
committed
Merge branch 'release/0.42.0'
* release/0.42.0: (51 commits) Update Changelog Version 0.42.0 Fix OpenMP related bug in DistributionArray pluto: Respect FORTRAN cmake feature pluto: Add documentation to pluto/README.md Add test to track and trace atlas::Field pluto: MemoryPoolResource to correctly use the default alignment for tracing pluto: restore pluto::label after scope ends Make use of configurable pluto default memory_resources within atlas::array Setup pluto trace in atlas initialise, and add pluto memory report as part of atlas finalise pluto: Make HostMemoryResource a memory_resource instead of async_memory_resource pluto: Update examples pluto: pluto::release() to release memory from all pluto memory pools pluto: Update memory_pool_resource lifetimes (no destruction), add memory_tracking, add tracing pluto: Add memory_tracker pluto: Fix memory pool deallocation for memory allocated with upstream resource which happens when bytes > largest_required_pool_block pluto: add compat memory_resource == operator pluto: Add missing include GHA: Install qhull with -DCMAKE_POLICY_VERSION_MINIMUM=3.5 Use pluto in atlas where possible instead of hic calls ...
2 parents a50e28f + 269a422 commit f988397

File tree

201 files changed

+11653
-877
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+11653
-877
lines changed

‎.github/workflows/build-hpc.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,14 @@ jobs:
5959
- fftw
6060
- qhull
6161
- eigen
62-
cmake_options: -DMPI_SLOTS=4 -DENABLE_WARNING_AS_ERROR=ON
62+
cmake_options: -DMPI_SLOTS=4 -DENABLE_WARNING_AS_ERROR=ON -DENABLE_PMR=OFF
63+
# ENABLE_PMR=OFF because the default host-compiler (gcc 8.5) is not std::pmr capable
6364

6465
runs-on: [self-hosted, linux, hpc]
6566
env:
6667
GH_TOKEN: ${{ github.token }}
6768
steps:
68-
- uses: ecmwf-actions/reusable-workflows/ci-hpc-generic@v2
69+
- uses: ecmwf/reusable-workflows/ci-hpc-generic@v2
6970
with:
7071
site: ${{ matrix.site }}
7172
troika_user: ${{ secrets[matrix.troika_user_secret] }}
@@ -192,6 +193,7 @@ jobs:
192193
193194
echo "::group::Test $name"
194195
export ATLAS_FINALISES_MPI=1
196+
export ECKIT_MPI_WORKAROUND_SEGV_AT_EXIT=1
195197
echo "+ ctest --test-dir build --output-on-failure {{ ctest_options }}"
196198
ctest --test-dir build --output-on-failure {{ ctest_options }}
197199
echo "::endgroup::"

‎.github/workflows/build-wheel-wrapper.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# (C) Copyright 2024- ECMWF.
2+
#
3+
# This software is licensed under the terms of the Apache Licence Version 2.0
4+
# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
5+
# In applying this licence, ECMWF does not waive the privileges and immunities
6+
# granted to it by virtue of its status as an intergovernmental organisation
7+
# nor does it submit to any jurisdiction.
8+
9+
10+
name: Build Python Wrapper Wheel
11+
12+
on:
13+
# Trigger the workflow manually
14+
workflow_dispatch: ~
15+
16+
# Allow to be called from another workflow
17+
workflow_call: ~
18+
19+
# TODO automation trigger
20+
21+
jobs:
22+
python-wrapper-wheel:
23+
name: Python Wrapper Wheel
24+
uses: ecmwf/reusable-workflows/.github/workflows/python-wrapper-wheel.yml@main
25+
with:
26+
wheel_directory: python/atlaslib-ecmwf
27+
secrets: inherit

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ jobs:
260260
261261
- name: Build & Test
262262
id: build-test
263-
uses: ecmwf-actions/build-package@v2
263+
uses: ecmwf/build-package@v2
264264
with:
265265
self_coverage: ${{ matrix.coverage }}
266266
force_build: true
@@ -274,7 +274,7 @@ jobs:
274274
dependency_cmake_options: |
275275
ecmwf/eckit: "-G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DENABLE_TESTS=OFF -DENABLE_ECKIT_CMD=OFF -DENABLE_ECKIT_SQL=OFF -DENABLE_WARNINGS=OFF"
276276
ecmwf/fckit: "-G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DENABLE_TESTS=OFF"
277-
cmake_options: "-G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DATLAS_BITS_LOCAL=64 -DENABLE_WARNING_AS_ERROR=ON ${{ matrix.cmake_options }}"
277+
cmake_options: "-G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DATLAS_BITS_LOCAL=64 -DENABLE_WARNING_AS_ERROR=ON -DENABLE_PMR=ON ${{ matrix.cmake_options }}"
278278
ctest_options: "${{ matrix.ctest_options }}"
279279

280280
- name: Verify tools

‎.github/workflows/cd.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ on:
77

88
jobs:
99
deploy:
10-
uses: ecmwf-actions/reusable-workflows/.github/workflows/create-package.yml@v2
10+
uses: ecmwf/reusable-workflows/.github/workflows/create-package.yml@v2
1111
secrets: inherit

‎.github/workflows/check-release-version.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ on:
88

99
jobs:
1010
check_version:
11-
uses: ecmwf-actions/reusable-workflows/.github/workflows/check-release-version.yml@v2
11+
uses: ecmwf/reusable-workflows/.github/workflows/check-release-version.yml@v2

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
downstream-ci:
2626
name: downstream-ci
2727
if: ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
28-
uses: ecmwf-actions/downstream-ci/.github/workflows/downstream-ci.yml@main
28+
uses: ecmwf/downstream-ci/.github/workflows/downstream-ci.yml@main
2929
with:
3030
atlas: ecmwf/atlas@${{ github.event.pull_request.head.sha || github.sha }}
3131
secrets: inherit
@@ -40,10 +40,10 @@ jobs:
4040
pull-requests: write
4141
steps:
4242
- name: Dispatch private downstream CI
43-
uses: ecmwf-actions/dispatch-private-downstream-ci@v1
43+
uses: ecmwf/dispatch-private-downstream-ci@v1
4444
with:
4545
token: ${{ secrets.GH_REPO_READ_TOKEN }}
46-
owner: ecmwf-actions
46+
owner: ecmwf
4747
repository: private-downstream-ci
4848
event_type: downstream-ci
4949
payload: '{"atlas": "ecmwf/atlas@${{ github.event.pull_request.head.sha || github.sha }}"}'
@@ -52,7 +52,7 @@ jobs:
5252
downstream-ci-hpc:
5353
name: downstream-ci-hpc
5454
if: ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
55-
uses: ecmwf-actions/downstream-ci/.github/workflows/downstream-ci-hpc.yml@main
55+
uses: ecmwf/downstream-ci/.github/workflows/downstream-ci-hpc.yml@main
5656
with:
5757
atlas: ecmwf/atlas@${{ github.event.pull_request.head.sha || github.sha }}
5858
secrets: inherit
@@ -67,10 +67,10 @@ jobs:
6767
pull-requests: write
6868
steps:
6969
- name: Dispatch private downstream CI
70-
uses: ecmwf-actions/dispatch-private-downstream-ci@v1
70+
uses: ecmwf/dispatch-private-downstream-ci@v1
7171
with:
7272
token: ${{ secrets.GH_REPO_READ_TOKEN }}
73-
owner: ecmwf-actions
73+
owner: ecmwf
7474
repository: private-downstream-ci
7575
event_type: downstream-ci-hpc
7676
payload: '{"atlas": "ecmwf/atlas@${{ github.event.pull_request.head.sha || github.sha }}"}'
@@ -86,7 +86,7 @@ jobs:
8686
if: ${{ always() && !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
8787
steps:
8888
- name: Trigger Teams notification
89-
uses: ecmwf-actions/notify-teams@v1
89+
uses: ecmwf/notify-teams@v1
9090
with:
9191
incoming_webhook: ${{ secrets.MS_TEAMS_INCOMING_WEBHOOK }}
9292
needs_context: ${{ toJSON(needs) }}

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
publish:
12-
uses: ecmwf-actions/reusable-workflows/.github/workflows/cd-docs.yml@v2
12+
uses: ecmwf/reusable-workflows/.github/workflows/cd-docs.yml@v2
1313
secrets: inherit
1414
with:
1515
config: .github/docs-config.yml

‎.github/workflows/label-public-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ on:
77

88
jobs:
99
label:
10-
uses: ecmwf-actions/reusable-workflows/.github/workflows/label-pr.yml@v2
10+
uses: ecmwf/reusable-workflows/.github/workflows/label-pr.yml@v2

‎.github/workflows/notify-new-issue.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Notify new issue
13-
uses: ecmwf-actions/notify-teams-issue@v1
13+
uses: ecmwf/notify-teams-issue@v1
1414
with:
1515
incoming_webhook: ${{ secrets.MS_TEAMS_INCOMING_WEBHOOK }}

‎.github/workflows/notify-new-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Notify new PR
14-
uses: ecmwf-actions/notify-teams-pr@v1
14+
uses: ecmwf/notify-teams-pr@v1
1515
with:
1616
incoming_webhook: ${{ secrets.MS_TEAMS_INCOMING_WEBHOOK }}

0 commit comments

Comments
 (0)