Skip to content

Commit

Permalink
Klbudzin disable arm 64 (Temporarily) (#529)
Browse files Browse the repository at this point in the history
The github runner machines for arm 64 went down and we are disabling these tests for now since we don't the passwords for the machines/ are unaware of which machines they were on.

* DMPlex View output has been changed to be outputted in an ordered manner, these tests were effected.
  • Loading branch information
klbudzin authored Sep 10, 2024
1 parent 4e5ff40 commit d8f6f57
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 22 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/DependencyDockerBuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ jobs:
needs: [ get-timestamp ]
strategy:
matrix:
arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ]
arch: [ { runson: ubuntu-latest, id: -amd64 } ]
#arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ]
compiler: [ { id: -gcc }, { id: -clang } ]
indices: [ { index64bit: 0, id: "" }, { index64bit: 1, id: "-index64" } ]
include:
Expand Down Expand Up @@ -87,7 +88,8 @@ jobs:
strategy:
max-parallel: 1
matrix:
arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ]
arch: [ { runson: ubuntu-latest, id: -amd64 } ]
#arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ]
compiler: [ { id: -gcc }, { id: -clang } ]
indices: [ { index64bit: 0, id: "" }, { index64bit: 1, id: "-index64" } ]
include:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/PullRequestWorkflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ jobs:
strategy:
fail-fast: false
matrix:
arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ]
arch: [ { runson: ubuntu-latest, id: -amd64 } ]
#arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ]
compiler: [ { cc: gcc, cxx: g++, id: -gcc }, { cc: clang, cxx: clang++, id: -clang } ]
indices: [ { index64bit: 0, id: "" }, { index64bit: 1, id: "-index64" } ]
petscConfig: [ arch-ablate-opt ]
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/RegressionTestWorkflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ jobs:
strategy:
fail-fast: false
matrix:
arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ]
arch: [ { runson: ubuntu-latest, id: -amd64 } ]
#arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ]
compiler: [ { id: -gcc }, { id: -clang } ]
indices: [ { index64bit: 0, id: "" }, { index64bit: 1, id: "-index64" } ]
petscConfig: [ arch-ablate-opt ]
Expand Down Expand Up @@ -51,4 +52,4 @@ jobs:
run: |
echo Tests unsuccessful!
exit 1
- run: echo All tests Successful!
- run: echo All tests Successful!
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.18.4)
include(config/petscCompilers.cmake)

# Set the project details
project(ablateLibrary VERSION 0.12.32)
project(ablateLibrary VERSION 0.12.33)

# Load the Required 3rd Party Libaries
pkg_check_modules(PETSc REQUIRED IMPORTED_TARGET GLOBAL PETSc)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Labels:
interiorCells: 1 strata with value/size (1 (1155))
boundaryCells: 1 strata with value/size (1 (387))
boundaryFaces: 1 strata with value/size (1 (64))
ghost: 2 strata with value/size (2 (24), 1 (50))
ghost: 2 strata with value/size (1 (50), 2 (24))
flowRegion: 1 strata with value/size (1 (1100))
Timestep: 0000 time = (.*) dt = (.*)<expects> z n1e-10
Timestep: 0001 time = (.*) dt = (.*)<expects> n1e-10 n1e-09
Expand Down
18 changes: 9 additions & 9 deletions tests/integrationTests/inputs/domain/dmViewFromOptions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,10 @@ DM Object: (.*) 1 MPI process<expects> *
Number of 1-cells per rank: 12
Number of 2-cells per rank: 4
Labels:
marker: 4 strata with value/size (4 (5), 2 (5), 1 (5), 3 (5))
Face Sets: 4 strata with value/size (4 (2), 2 (2), 1 (2), 3 (2))
marker: 4 strata with value/size (1 (5), 2 (5), 3 (5), 4 (5))
Face Sets: 4 strata with value/size (1 (2), 2 (2), 3 (2), 4 (2))
depth: 3 strata with value/size (0 (9), 1 (12), 2 (4))
celltype: 3 strata with value/size (4 (4), 0 (9), 1 (12))
celltype: 3 strata with value/size (0 (9), 1 (12), 4 (4))
Field velocity:
adjacency FEM
Field pressure:
Expand All @@ -178,10 +178,10 @@ DM Object: (.*) 1 MPI process<expects> *
Number of 1-cells per rank: 12
Number of 2-cells per rank: 4
Labels:
marker: 4 strata with value/size (4 (5), 2 (5), 1 (5), 3 (5))
Face Sets: 4 strata with value/size (4 (2), 2 (2), 1 (2), 3 (2))
marker: 4 strata with value/size (1 (5), 2 (5), 3 (5), 4 (5))
Face Sets: 4 strata with value/size (1 (2), 2 (2), 3 (2), 4 (2))
depth: 3 strata with value/size (0 (9), 1 (12), 2 (4))
celltype: 3 strata with value/size (4 (4), 0 (9), 1 (12))
celltype: 3 strata with value/size (0 (9), 1 (12), 4 (4))
Field velocity:
adjacency FEM
Field pressure:
Expand All @@ -195,10 +195,10 @@ DM Object: (.*) 1 MPI process<expects> *
Number of 1-cells per rank: 12
Number of 2-cells per rank: 4
Labels:
marker: 4 strata with value/size (4 (5), 2 (5), 1 (5), 3 (5))
Face Sets: 4 strata with value/size (4 (2), 2 (2), 1 (2), 3 (2))
marker: 4 strata with value/size (1 (5), 2 (5), 3 (5), 4 (5))
Face Sets: 4 strata with value/size (1 (2), 2 (2), 3 (2), 4 (2))
depth: 3 strata with value/size (0 (9), 1 (12), 2 (4))
celltype: 3 strata with value/size (4 (4), 0 (9), 1 (12))
celltype: 3 strata with value/size (0 (9), 1 (12), 4 (4))
Field velocity:
adjacency FEM
Field pressure:
Expand Down
6 changes: 3 additions & 3 deletions tests/integrationTests/inputs/domain/extrudeBoundaryTest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ extrudedMesh in 2 dimensions:
Number of 1-cells per rank: 57
Number of 2-cells per rank: 24
Labels:
celltype: 3 strata with value/size (4 (24), 0 (34), 1 (57))
celltype: 3 strata with value/size (0 (34), 1 (57), 4 (24))
depth: 3 strata with value/size (0 (34), 1 (57), 2 (24))
marker: 4 strata with value/size (4 (27), 2 (11), 1 (27), 3 (11))
Face Sets: 4 strata with value/size (4 (12), 2 (4), 1 (12), 3 (4))
marker: 4 strata with value/size (1 (27), 2 (11), 3 (11), 4 (27))
Face Sets: 4 strata with value/size (1 (12), 2 (4), 3 (4), 4 (12))
interiorCells: 1 strata with value/size (1 (81))
boundaryCells: 1 strata with value/size (1 (51))
boundaryRegion: 1 strata with value/size (1 (8))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exampleAxisymmetricMesh in 3 dimensions:
Number of 2-cells per rank: 24200 (23380)
Number of 3-cells per rank: 8000 (800)
Labels:
celltype: 6 strata with value/size (0 (8241), 7 (7200), 8 (800), 3 (820), 1 (24440), 4 (23380))
celltype: 6 strata with value/size (0 (8241), 1 (24440), 3 (820), 4 (23380), 7 (7200), 8 (800))
depth: 4 strata with value/size (0 (8241), 1 (24440), 2 (24200), 3 (8000))
boundary: 1 strata with value/size (1 (4762))
upperCap: 1 strata with value/size (1 (801))
Expand Down
4 changes: 2 additions & 2 deletions tests/unitTests/outputs/domain/dmPlex_NoArguments
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ box in 2 dimensions:
Number of 1-cells per rank: 16
Number of 2-cells per rank: 8
Labels:
celltype: 3 strata with value/size (0 (9), 3 (8), 1 (16))
celltype: 3 strata with value/size (0 (9), 1 (16), 3 (8))
depth: 3 strata with value/size (0 (9), 1 (16), 2 (8))
marker: 1 strata with value/size (1 (16))
Face Sets: 1 strata with value/size (1 (8))
Face Sets: 4 strata with value/size (1 (2), 2 (2), 3 (2), 4 (2))

0 comments on commit d8f6f57

Please sign in to comment.