Skip to content

Adding failrun status to geos_ats #3153

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

Closed
wants to merge 1 commit into from
Closed

Adding failrun status to geos_ats #3153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion inputFiles/solidMechanics/beamBending.ats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,14 @@ decks = [
partitions=partitions,
restart_step=0,
check_step=1,
restartcheck_params=restartcheck_params)
restartcheck_params=restartcheck_params),
TestDeck(name="beamBending_expect_failure",
description="Tests failure check.",
partitions=((1, 1, 1),),
restart_step=0,
check_step=1,
restartcheck_params=restartcheck_params,
curvecheck_params=curvecheck_params)
]

generate_geos_tests(decks)
54 changes: 54 additions & 0 deletions inputFiles/solidMechanics/beamBending_expect_failure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" ?>

<Problem>

<Included>
<File name="./beamBending_base.xml"/>
</Included>

<!-- SPHINX_Gravity -->
<Solvers
gravityVector="{ 0.0, 0.0, 0.0 }">
<!-- SPHINX_GravityEnd -->
<!-- SPHINX_SolidMechanicsSolver -->
<SolidMechanicsLagrangianSSLE
name="incorrectSolverName"
timeIntegrationOption="QuasiStatic"
discretization="FE1"
targetRegions="{ mesh1/Region2 }"
>
<!-- SPHINX_SolidMechanicsSolverEnd -->
<NonlinearSolverParameters
newtonTol="1.0e-6"
newtonMaxIter="8"/>
<LinearSolverParameters
directParallel="0"/>
</SolidMechanicsLagrangianSSLE>
</Solvers>

<!-- SPHINX_FEDiscretization -->
<NumericalMethods>
<FiniteElements>
<FiniteElementSpace
name="FE1"
order="1"/>
</FiniteElements>
</NumericalMethods>

<!-- SPHINX_FEDiscretizationEnd -->

<!-- SPHINX_BeamBendingMesh -->
<Mesh>
<InternalMesh
name="mesh1"
elementTypes="{ C3D8 }"
xCoords="{ 0, 80 }"
yCoords="{ 0, 8 }"
zCoords="{ 0, 4 }"
nx="{ 80 }"
ny="{ 8 }"
nz="{ 4 }"
cellBlockNames="{ cb1 }"/>
</Mesh>

</Problem>
3 changes: 3 additions & 0 deletions scripts/ci_build_and_test_in_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,9 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then
if grep -q "Overall status: PASSED" "$tempdir/log_check.txt"; then
echo "IntegratedTests passed. No rebaseline required."
INTEGRATED_TEST_EXIT_STATUS=0
elif grep -q "Overall status: FAIL RUN" "$tempdir/log_check.txt"; then
echo "Some integratedTests failed to run. Skipping rebaseline process."
INTEGRATED_TEST_EXIT_STATUS=1
else
echo "IntegratedTests failed. Rebaseline is required."

Expand Down
32 changes: 21 additions & 11 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ install( DIRECTORY ${PROJECT_BINARY_DIR}/include DESTINATION . )
# Generate version information
################################
include( cmake/GeosxVersion.cmake )
message( STATUS "Configuring GEOSX version ${GEOS_VERSION_FULL}" )
message( STATUS "Configuring GEOSX version ${GEOSX_VERSION_FULL}" )


################################
Expand All @@ -127,25 +127,35 @@ if( ENABLE_CUDA )
list( APPEND extraComponentsLinkList cuda )
endif()

if( ENABLE_CUDA AND ENABLE_CUDA_NVTOOLSEXT )
if( ENABLE_CUDA_NVTOOLSEXT )
list( APPEND extraComponentsLinkList CUDA::nvToolsExt )
endif()

if( ENABLE_HIP )
list( APPEND extraComponentsLinkList blt::hip )
endif()

if ( GEOSX_BUILD_SHARED_LIBS )
list( APPEND extraComponentsLinkList geosx_core )
else()
list( APPEND extraComponentsLinkList ${geosx_core_libs} )
endif()

blt_add_executable( NAME geosx
SOURCES main/main.cpp
DEPENDS_ON geosx_core
${extraComponentsLinkList}
DEPENDS_ON ${extraComponentsLinkList}
${externalComponentsLinkList} )

# Seems to be required on some CMake versions (e.g. 3.16) to get enforce device linking
if( ${ENABLE_HYPRE_DEVICE} STREQUAL "CUDA" )
set_target_properties( geosx PROPERTIES CUDA_RESOLVE_DEVICE_SYMBOLS TRUE )
endif()

# Removing all transitive link dependencies from geosx_core target to circumvent
# the BLT behavior which imposes all dependencies to be public
#set_target_properties(geosx_core PROPERTIES INTERFACE_LINK_LIBRARIES "")

target_include_directories( geosx PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )

# To change the runtime path during installation
set_target_properties( geosx PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" )
Expand Down Expand Up @@ -211,7 +221,7 @@ add_custom_target( geosx_generate_install_schema
COMMENT "Generating XML schema to install"
)

if( NOT GEOS_INSTALL_SCHEMA )
if( NOT GEOSX_INSTALL_SCHEMA )
set_target_properties(geosx_generate_install_schema PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
endif()

Expand All @@ -222,8 +232,8 @@ install( FILES ${CMAKE_BINARY_DIR}/schema.xsd
################################
# Add python environment setup
################################
# message(WARNING "Temporarily changing the geosPythonBranch to feature/packaging")
# set(GEOS_PYTHON_PACKAGES_BRANCH "feature/packaging" CACHE STRING "" FORCE)
message(WARNING "Temporarily changing the geosPythonBranch to feature/sherman/skipRebaselineFailRun")
set(GEOS_PYTHON_PACKAGES_BRANCH "feature/sherman/skipRebaselineFailRun" CACHE STRING "" FORCE)


if ( Python3_EXECUTABLE )
Expand Down Expand Up @@ -255,19 +265,19 @@ if ( Python3_EXECUTABLE )
set(GEOS_PYTHON_PACKAGES_BRANCH "main" CACHE STRING "" FORCE)
endif()

set( GEOS_PYTHON_TOOLS_BINS
set( GEOSX_PYTHON_TOOLS_BINS
"${CMAKE_BINARY_DIR}/bin/preprocess_xml"
"${CMAKE_BINARY_DIR}/bin/format_xml" )

add_custom_command( OUTPUT ${GEOS_PYTHON_TOOLS_BINS}
add_custom_command( OUTPUT ${GEOSX_PYTHON_TOOLS_BINS}
COMMAND bash ${CMAKE_SOURCE_DIR}/../scripts/setupPythonEnvironment.bash -p ${PYTHON_POST_EXECUTABLE} -b ${CMAKE_BINARY_DIR}/bin --python-pkg-branch ${GEOS_PYTHON_PACKAGES_BRANCH}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} )

add_custom_target( geosx_python_tools
DEPENDS ${GEOS_PYTHON_TOOLS_BINS} )
DEPENDS ${GEOSX_PYTHON_TOOLS_BINS} )

add_custom_target( geosx_python_tools_clean
COMMAND rm ${GEOS_PYTHON_TOOLS_BINS} )
COMMAND rm ${GEOSX_PYTHON_TOOLS_BINS} )

add_custom_target( geosx_python_tools_test
COMMAND ${CMAKE_BINARY_DIR}/python/geosx/bin/test_geosx_xml_tools
Expand Down
Loading