Skip to content

Commit

Permalink
rbf support fixture update and other updates (#516)
Browse files Browse the repository at this point in the history
* Updated expected cells for a few tests.

* Removed some comments

* formatting and test update for petsc change

* version bump

* updated some github action dependencies to remove deprecation warning

* updated some github action dependencies to remove deprecation warning

---------

Co-authored-by: David Salac <[email protected]>
  • Loading branch information
mmcgurn and dsalac authored Feb 15, 2024
1 parent 653a5e9 commit 14f6541
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/PublishDoc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:
# checkout the latest commit of the code
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

# setup docker image of ablate
- name: Set up Docker Buildx
Expand All @@ -48,7 +48,7 @@ jobs:
# now build the pages with the standard Build with Jekyll actions
- name: Setup Pages
uses: actions/configure-pages@v2
uses: actions/configure-pages@v3
- name: Build with Jekyll
uses: actions/jekyll-build-pages@v1
with:
Expand All @@ -69,4 +69,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v2
6 changes: 3 additions & 3 deletions .github/workflows/PullRequestWorkflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
run: echo "VERSION=$(docker run --rm framework-test-image-${{matrix.tensorFlowConfig}}-${{ matrix.petscConfig }}${{matrix.compiler.id}}${{matrix.indices.id}} cmake --build --preset=ablate-print-version 2>&1 | head -n 1 )" >> $GITHUB_ENV

- name: Checking the version number for the repo
uses: mukunku/tag-exists-action@v1.4.0
uses: mukunku/tag-exists-action@v1.6.0
id: checkVersionNumber
with:
tag: 'v${{env.VERSION}}'
Expand All @@ -72,7 +72,7 @@ jobs:
# check to see if any of the regression tests have changed
- name: Get changed files in the regression test folder
id: check-regression-test-files
uses: tj-actions/changed-files@v35
uses: tj-actions/changed-files@v42
with:
files: tests/regressionTests/**

Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
- name: 'Upload the ablate.dev Artifact'
# right now this can only run on github hosted machines
if: ${{ matrix.arch.runson == 'ubuntu-latest' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ablate.dev.${{matrix.tensorFlowConfig}}-${{ matrix.petscConfig }}${{matrix.compiler.id}}${{matrix.indices.id}}.zip
path: ablate.dev.${{matrix.tensorFlowConfig}}-${{ matrix.petscConfig }}${{matrix.compiler.id}}${{matrix.indices.id}}.zip
Expand Down
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.22)
project(ablateLibrary VERSION 0.12.23)

# Load the Required 3rd Party Libaries
pkg_check_modules(PETSc REQUIRED IMPORTED_TARGET GLOBAL PETSc)
Expand Down
4 changes: 2 additions & 2 deletions tests/integrationTests/inputs/domain/extrudeBoundaryTest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Labels:
interiorCells: 1 strata with value/size (1 (81))
boundaryCells: 1 strata with value/size (1 (51))
boundaryRegion: 1 strata with value/size (1 (8))
Vec Object: label_value 1 MPI process
Vec Object: interiorCells 1 MPI process
type: seq
1.
1.
Expand Down Expand Up @@ -872,7 +872,7 @@ Label 'boundaryRegion':
[0]: 77 (1)
[0]: 79 (1)
[0]: 81 (1)
Vec Object: label_value 1 MPI process
Vec Object: interiorCells 1 MPI process
type: seq
length=24
ResultFiles:
Expand Down
5 changes: 2 additions & 3 deletions tests/unitTests/utilities/petscSupportTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "environment/runEnvironment.hpp"
#include "gtest/gtest.h"
#include "mpiTestFixture.hpp"
#include "petscTestErrorChecker.hpp"
#include "utilities/petscSupport.hpp"
#include "utilities/petscUtilities.hpp"

Expand Down Expand Up @@ -469,7 +468,7 @@ INSTANTIATE_TEST_SUITE_P(
.useCells = PETSC_TRUE,
.returnNeighborVertices = PETSC_FALSE,
.expectedSizeOfList = {12, 11},
.expectedList = {{38, 40, 41, 45, 56, 58, 60, 71, 113, 114, 132, 141}, {82, 83, 84, 86, 95, 96, 97, 99, 102, 138, 141}}},
.expectedList = {{38, 40, 41, 45, 56, 58, 60, 71, 135, 136, 154, 163}, {24, 38, 52, 53, 62, 102, 112, 123, 124, 125, 128}}},
(RBFSupportParameters_NeighborCells){.mpiTestParameter = testingResources::MpiTestParameter("2DTriDistanceVertMPI", 2),
.meshFaces = {10, 10},
.meshStart = {0.0, 0.0},
Expand All @@ -483,7 +482,7 @@ INSTANTIATE_TEST_SUITE_P(
.useCells = PETSC_FALSE,
.returnNeighborVertices = PETSC_FALSE,
.expectedSizeOfList = {12, 11},
.expectedList = {{38, 40, 41, 45, 56, 58, 60, 71, 113, 114, 132, 141}, {82, 83, 84, 86, 95, 96, 97, 99, 102, 138, 141}}},
.expectedList = {{38, 40, 41, 45, 56, 58, 60, 71, 135, 136, 154, 163}, {24, 38, 52, 53, 62, 102, 112, 123, 124, 125, 128}}},
(RBFSupportParameters_NeighborCells){.mpiTestParameter = testingResources::MpiTestParameter("2DQuadLevelVert"),
.meshFaces = {10, 10},
.meshStart = {0.0, 0.0},
Expand Down

0 comments on commit 14f6541

Please sign in to comment.