Skip to content
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

Restrict adios2 to main until new release #135

Merged
merged 6 commits into from
Oct 29, 2024
Merged

Restrict adios2 to main until new release #135

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc3bf9d
Restrict adios2 to main until new release due to: https://github.com/…
jorgensd Sep 19, 2024
3fc6469
Simplify try except
jorgensd Sep 23, 2024
7faca58
Try new adios2 version
jorgensd Oct 29, 2024
2729a92
Fix readpos
jorgensd Oct 29, 2024
7d1681a
Move to default and source installation
jorgensd Oct 29, 2024
a8a67a0
Apply suggestions from code review
jorgensd Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test_package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
artifact_name: "legacy_checkpoint_mpich"

test-code:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
[create-datasets, create-legacy-datasets, check-formatting, get_image_tag]
container: ghcr.io/fenics/dolfinx/dolfinx:${{ needs.get_image_tag.outputs.image }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_package_openmpi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

strategy:
matrix:
adios2: ["default", "v2.9.2", "v2.10.1"]
adios2: ["master", "v2.10.2"]
jorgensd marked this conversation as resolved.
Show resolved Hide resolved
steps:
- uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_redhat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

strategy:
matrix:
adios2: ["v2.10.1"]
adios2: ["master", "v2.10.2"]
jorgensd marked this conversation as resolved.
Show resolved Hide resolved
steps:
- uses: actions/checkout@v4

Expand Down
5 changes: 1 addition & 4 deletions src/adios4dolfinx/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@

meta = metadata("adios4dolfinx")
__version__ = meta["Version"]
try:
__author__ = meta["Author"]
except KeyError:
pass
__author__ = meta.get("Author", "")
__license__ = meta["License"]
__email__ = meta["Author-email"]
__program_name__ = meta["Name"]
Expand Down
2 changes: 1 addition & 1 deletion src/adios4dolfinx/legacy_readers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def read_dofmap_legacy(
# Extract dofmap data
global_dofs = np.zeros_like(cells, dtype=np.int64)
input_cell_positions = cells - local_cell_range[0]
read_pos = in_offsets[input_cell_positions].astype(np.int32) + dof_pos - in_offsets[0]
read_pos = (in_offsets[input_cell_positions] + dof_pos - in_offsets[0]).astype(np.int32)
global_dofs = mapped_dofmap[read_pos]
del input_cell_positions, read_pos

Expand Down
Loading