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

Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20200403_000610 branch to master #7121

Merged
merged 4 commits into from
Apr 8, 2020
Merged

Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20200403_000610 branch to master #7121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c89e7e
MueLu Maxwell test: Spring cleaning
cgcgcg Apr 1, 2020
b667742
cts1, tlcc2: Switch from Ninja to Unix Makefiles (#7094, ATDV-328)
bartlettroscoe Apr 2, 2020
055011d
Merge Pull Request #7109 from bartlettroscoe/Trilinos/7094-cts1-gnu-m…
trilinos-autotester Apr 2, 2020
a8c3c0c
Merge Pull Request #7106 from cgcgcg/Trilinos/maxwellTest
trilinos-autotester Apr 2, 2020
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 cmake/std/atdm/common/toss3/environment_new.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
echo "Using $ATDM_CONFIG_SYSTEM_NAME toss3 compiler stack $ATDM_CONFIG_COMPILER to build $ATDM_CONFIG_BUILD_TYPE code with Kokkos node type $ATDM_CONFIG_NODE_TYPE"

export ATDM_CONFIG_ENABLE_SPARC_SETTINGS=ON
export ATDM_CONFIG_USE_NINJA=ON
export ATDM_CONFIG_USE_NINJA=OFF
export ATDM_CONFIG_BUILD_COUNT=8
# export ATDM_CONFIG_CMAKE_JOB_POOL_LINK=2
# NOTE: Above, currently setting CMAKE_JOB_POOL_LINK results in a build
Expand Down
2 changes: 1 addition & 1 deletion cmake/std/atdm/common/toss3/environment_tlcc2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fi

echo "Using toss3 compiler stack $ATDM_CONFIG_COMPILER to build $ATDM_CONFIG_BUILD_TYPE code with Kokkos node type $ATDM_CONFIG_NODE_TYPE"

export ATDM_CONFIG_USE_NINJA=ON
export ATDM_CONFIG_USE_NINJA=OFF
export ATDM_CONFIG_BUILD_COUNT=8
# export ATDM_CONFIG_CMAKE_JOB_POOL_LINK=2
# NOTE: Above, currently setting CMAKE_JOB_POOL_LINK results in a build
Expand Down
18 changes: 18 additions & 0 deletions packages/muelu/test/maxwell/Belos.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<ParameterList name="Belos">
<ParameterList name="Block CG">
<Parameter name="Output Frequency" type="int" value="1"/>
<Parameter name="Output Style" type="int" value="1"/>
<Parameter name="Verbosity" type="int" value="33"/>
<Parameter name="Implicit Residual Scaling" type="string" value="None"/>
<Parameter name="Explicit Residual Scaling" type="string" value="None"/>
<Parameter name="Explicit Residual Test" type="bool" value="true"/>
</ParameterList>
<ParameterList name="Block GMRES">
<Parameter name="Output Frequency" type="int" value="1"/>
<Parameter name="Output Style" type="int" value="1"/>
<Parameter name="Verbosity" type="int" value="33"/>
<Parameter name="Implicit Residual Scaling" type="string" value="None"/>
<Parameter name="Explicit Residual Scaling" type="string" value="None"/>
<Parameter name="Explicit Residual Test" type="bool" value="true"/>
</ParameterList>
</ParameterList>
7 changes: 4 additions & 3 deletions packages/muelu/test/maxwell/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
ASSERT_DEFINED(
${PACKAGE_NAME}_ENABLE_Amesos2
${PACKAGE_NAME}_ENABLE_Belos
${PACKAGE_NAME}_ENABLE_ML
)

INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
Expand Down Expand Up @@ -29,7 +30,7 @@ IF (${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Amesos2)
NUM_MPI_PROCS 4
)

IF (${PACKAGE_NAME}_ENABLE_ML AND ${PACKAGE_NAME}_ENABLE_EPETRA)
IF (${PACKAGE_NAME}_ENABLE_ML AND ${PACKAGE_NAME}_ENABLE_Epetra)
TRIBITS_ADD_TEST(
Maxwell3D
NAME "Maxwell3D-Tpetra-ML-list"
Expand Down Expand Up @@ -59,7 +60,7 @@ IF (${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Amesos2)
NUM_MPI_PROCS 4
)

IF (${PACKAGE_NAME}_ENABLE_ML AND ${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK AND (NOT Xpetra_INT_LONG_LONG))
IF (${PACKAGE_NAME}_ENABLE_ML)
TRIBITS_ADD_TEST(
Maxwell3D
NAME "Maxwell3D-ML"
Expand All @@ -72,7 +73,7 @@ IF (${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Amesos2)


TRIBITS_COPY_FILES_TO_BINARY_DIR(Maxwell_cp
SOURCE_FILES M0.mat M1.mat S.mat D0.mat coords.mat Maxwell.xml Maxwell_ML.xml Maxwell_ML_MueLu.xml Maxwell_ML1.xml
SOURCE_FILES M0.mat M1.mat S.mat D0.mat coords.mat Belos.xml Maxwell.xml Maxwell_ML.xml Maxwell_ML_MueLu.xml Maxwell_ML1.xml
)

IF(HAVE_MUELU_COMPLEX)
Expand Down
Loading