Skip to content

Commit

Permalink
Restrict adios2 to main until new release (#135)
Browse files Browse the repository at this point in the history
* Restrict adios2 to main until new release due to: ornladios/ADIOS2#4287

* Simplify try except

* Try new adios2 version

* Fix readpos

* Move to default and source installation

* Apply suggestions from code review
  • Loading branch information
jorgensd authored Oct 29, 2024
1 parent 81f1a08 commit 0a32e4e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test_package.yml
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
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: ["default", "v2.10.2"]
steps:
- uses: actions/checkout@v4

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

strategy:
matrix:
adios2: ["v2.10.1"]
adios2: ["v2.10.2"]
steps:
- uses: actions/checkout@v4

Expand Down
5 changes: 1 addition & 4 deletions src/adios4dolfinx/__init__.py
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
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

0 comments on commit 0a32e4e

Please sign in to comment.