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

Merge trilinos/develop into e3sm-project/develop #112

Merged
merged 10 commits into from
Mar 6, 2024
Merged

Merge trilinos/develop into e3sm-project/develop #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8c2144f
Add use of `dashboard_build_name` for kokkos integration nightly
achauphan Feb 28, 2024
4d4fe46
Stratimikos Belos adapapter: Handle special case for MvTimesMatAddMv
cgcgcg Feb 29, 2024
625f252
Update build name output based on `dashboard_build_name` value
achauphan Mar 4, 2024
927fff6
Remove redundant unittest related to build name output in PR scripts
achauphan Mar 4, 2024
c01ad3b
Removed new line
achauphan Mar 4, 2024
895fa05
Remove PR naming blocks
sebrowne Mar 4, 2024
617df91
Merge Pull Request #12794 from sebrowne/Trilinos/uvm_updates
trilinos-autotester Mar 5, 2024
df142af
Merge pull request #12784 from achauphan/kokkos-nightly-build-name
achauphan Mar 5, 2024
204363f
Merge pull request #12791 from cgcgcg/stratimikosBelosFix
cgcgcg Mar 5, 2024
b788248
Merge remote-tracking branch 'upstream/develop' into develop
bartgol Mar 6, 2024
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
153 changes: 0 additions & 153 deletions packages/framework/ini-files/config-specs.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,36 +832,12 @@ opt-set-cmake-var Xpetra_ENABLE_DEPRECATED_CODE BOOL : OFF
# PACKAGE-ENABLES
#

[PACKAGE-ENABLES|PR]
opt-set-cmake-var Trilinos_ENABLE_MueLu BOOL : ON
opt-set-cmake-var Trilinos_ENABLE_Xpetra BOOL : ON
opt-set-cmake-var Trilinos_ENABLE_Zoltan2Core BOOL : ON
opt-set-cmake-var Trilinos_ENABLE_Zoltan2Sphynx BOOL : ON
opt-set-cmake-var Trilinos_ENABLE_Zoltan2 BOOL : ON
# Commented out due to: "make[2]: execvp: /bin/sh: Argument list too long" when compiling packages/panzer/adapters-stk
# opt-set-cmake-var Trilinos_ENABLE_BUILD_STATS BOOL : ON

[PACKAGE-ENABLES|ALL]
opt-set-cmake-var Trilinos_ENABLE_ALL_PACKAGES BOOL : ON

[PACKAGE-ENABLES|PR-SERIAL]
opt-set-cmake-var Trilinos_ENABLE_NOX BOOL : ON
opt-set-cmake-var Trilinos_ENABLE_PanzerAdaptersSTK BOOL : ON
opt-set-cmake-var Trilinos_ENABLE_PanzerDiscFE BOOL : ON
opt-set-cmake-var Trilinos_ENABLE_PanzerDofMgr BOOL : ON

[PACKAGE-ENABLES|PR-FRAMEWORK]
opt-set-cmake-var Trilinos_ENABLE_TrilinosFrameworkTests BOOL : ON

# Commented out due to: "make[2]: execvp: /bin/sh: Argument list too long" when compiling packages/panzer/adapters-stk
# opt-set-cmake-var Trilinos_ENABLE_BUILD_STATS BOOL : ON

[PACKAGE-ENABLES|PR-FRAMEWORK-ATDM]
use PACKAGE-ENABLES|PR
use PACKAGE-ENABLES|PR-FRAMEWORK
opt-set-cmake-var Trilinos_ENABLE_TrilinosATDMConfigTests BOOL : ON
opt-set-cmake-var Trilinos_ENABLE_TrilinosBuildStats BOOL : ON

[PACKAGE-ENABLES|RDC-MINIMAL]
opt-set-cmake-var Trilinos_ENABLE_Amesos BOOL : ON
opt-set-cmake-var Trilinos_ENABLE_Amesos2 BOOL : ON
Expand Down Expand Up @@ -1660,18 +1636,6 @@ use USE-FPIC|YES
use USE-MPI|YES
use USE-PT|YES

[RHEL7_SEMS_USE-ASAN|NO_USE-FPIC|NO_USE-MPI|YES_USE-PT|NO_PACKAGE-ENABLES|PR]
use RHEL7_SEMS_USE-ASAN|NO_USE-FPIC|NO_USE-MPI|YES_USE-PT|NO
use PACKAGE-ENABLES|PR

[RHEL7_SEMS_USE-ASAN|NO_USE-FPIC|YES_USE-MPI|YES_USE-PT|NO_PACKAGE-ENABLES|PR]
use RHEL7_SEMS_USE-ASAN|NO_USE-FPIC|YES_USE-MPI|YES_USE-PT|NO
use PACKAGE-ENABLES|PR

[RHEL7_SEMS_USE-ASAN|NO_USE-FPIC|NO_USE-MPI|YES_USE-PT|NO_PACKAGE-ENABLES|PR-SERIAL]
use RHEL7_SEMS_USE-ASAN|NO_USE-FPIC|NO_USE-MPI|YES_USE-PT|NO
use PACKAGE-ENABLES|PR-SERIAL

[RHEL7_SEMS_USE-ASAN|NO_USE-FPIC|NO_USE-MPI|NO_USE-PT|NO]
use RHEL7
use USE-ASAN|NO
Expand Down Expand Up @@ -1967,58 +1931,6 @@ use PACKAGE-ENABLES|ALL
use rhel7_sems-gnu-8.3.0-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
use PACKAGE-ENABLES|ALL-NO-EPETRA

[rhel7_sems-gnu-8.3.0-openmpi-1.10.1-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_pr]
#uses sems-archive modules
use RHEL7_SEMS_COMPILER|GNU
use NODE-TYPE|OPENMP-NO-SERIAL
use BUILD-TYPE|RELEASE-DEBUG
use RHEL7_SEMS_LIB-TYPE|STATIC
use KOKKOS-ARCH|NO-KOKKOS-ARCH
use RHEL7_SEMS_USE-ASAN|NO_USE-FPIC|NO_USE-MPI|YES_USE-PT|NO_PACKAGE-ENABLES|PR
use USE-COMPLEX|NO
use USE-RDC|NO
use USE-UVM|NO
use USE-DEPRECATED|YES

use COMMON

opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS STRING : --bind-to;none --mca btl vader,self
opt-set-cmake-var Tpetra_INST_SERIAL BOOL FORCE : ON
opt-set-cmake-var CMAKE_CXX_EXTENSIONS BOOL : OFF
opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D BOOL : ON
opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -fno-strict-aliasing -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-parentheses -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-inline -Wno-nonnull-compare -Wno-address -Werror -Werror=shadow -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS

use GCC_OPENMP_PACKAGE_SPECIFIC_WARNING_FLAGS

use RHEL7_POST

[rhel7_sems-gnu-8.3.0-openmpi-1.10.1-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-off_pr]
#uses sems-archive modules
use RHEL7_SEMS_COMPILER|GNU
use NODE-TYPE|OPENMP
use BUILD-TYPE|RELEASE-DEBUG
use RHEL7_SEMS_LIB-TYPE|STATIC
use KOKKOS-ARCH|NO-KOKKOS-ARCH
use RHEL7_SEMS_USE-ASAN|NO_USE-FPIC|NO_USE-MPI|YES_USE-PT|NO_PACKAGE-ENABLES|PR
use USE-COMPLEX|NO
use USE-RDC|NO
use USE-UVM|NO
use USE-DEPRECATED|NO

use COMMON

opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS STRING : --bind-to;none --mca btl vader,self
opt-set-cmake-var Tpetra_INST_SERIAL BOOL FORCE : ON
opt-set-cmake-var CMAKE_CXX_EXTENSIONS BOOL : OFF
opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D BOOL : ON
opt-set-cmake-var Trilinos_ENABLE_Moertel BOOL : OFF
opt-set-cmake-var Trilinos_ENABLE_ShyLU_DDBDDC BOOL : OFF
opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -fno-strict-aliasing -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-parentheses -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-inline -Wno-nonnull-compare -Wno-address -Werror -Werror=shadow -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS

use GCC_OPENMP_PACKAGE_SPECIFIC_WARNING_FLAGS

use RHEL7_POST

[rhel7_sems-gnu-8.3.0-openmpi-1.10.1-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables]
#uses sems-archive modules
use RHEL7_SEMS_COMPILER|GNU
Expand Down Expand Up @@ -2404,17 +2316,8 @@ use SEMS_COMMON_CUDA_11
use RHEL7_POST
use CUDA11-RUN-SERIAL-TESTS

# This is temporarily disabled because it seems to be particularly sensitive to the spack-built
# MPI issue (TRILFRAME-552)
opt-set-cmake-var ROL_example_PinT_parabolic-control_AugmentedSystem_test_MPI_2_DISABLE BOOL FORCE : ON


[rhel7_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.0.5_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_pr]
use rhel7_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.0.5_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_no-package-enables
use PACKAGE-ENABLES|PR
opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : OFF


[rhel7_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.0.5_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_rdc_uvm_deprecated-on_all]
# uses sems-v2 modules
use rhel7_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.0.5_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_no-package-enables
Expand Down Expand Up @@ -2833,62 +2736,6 @@ use RHEL7_POST
use rhel7_sems-v2-gnu-8.3.0-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
use PACKAGE-ENABLES|ALL

[rhel7_sems-gnu-8.3.0-openmpi-1.10.7-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_pr]
# uses sems-v2 modules
use RHEL7_SEMS_COMPILER|GNU
use NODE-TYPE|OPENMP-NO-SERIAL
use BUILD-TYPE|RELEASE-DEBUG
use RHEL7_SEMS_V2_LIB-TYPE|STATIC
use KOKKOS-ARCH|NO-KOKKOS-ARCH
use USE-ASAN|NO
use USE-COMPLEX|NO
use USE-FPIC|NO
use USE-MPI|YES
use USE-PT|NO
use USE-RDC|NO
use USE-UVM|NO
use USE-DEPRECATED|YES
use PACKAGE-ENABLES|PR

use COMMON_SPACK_TPLS

opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS STRING : --bind-to;none --mca btl vader,self
opt-set-cmake-var Tpetra_INST_SERIAL BOOL FORCE : ON
opt-set-cmake-var CMAKE_CXX_EXTENSIONS BOOL : OFF
opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D BOOL : ON
opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -fno-strict-aliasing -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-parentheses -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-inline -Wno-nonnull-compare -Wno-address -Werror -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS

use RHEL7_POST

[rhel7_sems-gnu-8.3.0-openmpi-1.10.7-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-off_pr]
# uses sems-v2 modules
use RHEL7_SEMS_COMPILER|GNU
use NODE-TYPE|OPENMP
use BUILD-TYPE|RELEASE-DEBUG
use RHEL7_SEMS_V2_LIB-TYPE|STATIC
use KOKKOS-ARCH|NO-KOKKOS-ARCH
use USE-ASAN|NO
use USE-COMPLEX|NO
use USE-FPIC|NO
use USE-MPI|YES
use USE-PT|NO
use USE-RDC|NO
use USE-UVM|NO
use USE-DEPRECATED|NO
use PACKAGE-ENABLES|PR

use COMMON_SPACK_TPLS

opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS STRING : --bind-to;none --mca btl vader,self
opt-set-cmake-var Tpetra_INST_SERIAL BOOL FORCE : ON
opt-set-cmake-var CMAKE_CXX_EXTENSIONS BOOL : OFF
opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D BOOL : ON
opt-set-cmake-var Trilinos_ENABLE_Moertel BOOL : OFF
opt-set-cmake-var Trilinos_ENABLE_ShyLU_DDBDDC BOOL : OFF
opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -fno-strict-aliasing -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-parentheses -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-inline -Wno-nonnull-compare -Wno-address -Werror -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS

use RHEL7_POST

[rhel7_sems-gnu-8.3.0-openmpi-1.10.7-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables]
# uses sems-v2 modules
use RHEL7_SEMS_COMPILER|GNU
Expand Down
2 changes: 1 addition & 1 deletion packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationBase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ def pullrequest_build_name(self):
"""
if self.arg_pullrequest_cdash_track == "Pull Request":
output = "PR-{}-test-{}-{}".format(self.arg_pullrequest_number, self.arg_pr_genconfig_job_name, self.arg_jenkins_job_number)
elif self.arg_pullrequest_cdash_track == "Nightly":
elif self.arg_dashboard_build_name != "__UNKNOWN__":
output = self.arg_dashboard_build_name
else:
output = self.arg_pr_genconfig_job_name
Expand Down
28 changes: 15 additions & 13 deletions packages/framework/pr_tools/trilinosprhelpers/unittests/test_TrilinosPRConfigurationBase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,6 @@ def dummy_args_non_pr_track(self):
return args


def dummy_args_nightly_track(self):
args = copy.deepcopy(self.dummy_args())
args.pullrequest_cdash_track = "Nightly"
return args


def dummy_args_master_pass(self):
"""
Modify arguments to test a develop->master with a valid
Expand Down Expand Up @@ -357,19 +351,27 @@ def test_TrilinosPRConfigurationBaseBuildNameGCC720(self):

def test_TrilinosPRConfigurationBaseBuildNameNonPRTrack(self):
args = self.dummy_args_non_pr_track()

pr_config = trilinosprhelpers.TrilinosPRConfigurationBase(args)

build_name = pr_config.pullrequest_build_name
print("--- build_name = {}".format(build_name))
expected_build_name = args.genconfig_build_name
expected_build_name = args.dashboard_build_name
self.assertEqual(build_name, expected_build_name)


def test_TrilinosPRConfigurationBaseBuildNameNightlyTrack(self):
args = self.dummy_args_nightly_track()
def test_TrilinosPRConfigurationBaseBuildNameDefaultDashboardName(self):
"""
Test the build name output when dashboard_build_name contains
the default Jenkins parameter value, '__UNKNOWN__'.
"""
args = self.dummy_args_non_pr_track()
args.dashboard_build_name = "__UNKNOWN__"

pr_config = trilinosprhelpers.TrilinosPRConfigurationBase(args)
build_name = pr_config.pullrequest_build_name
expected_build_name = args.dashboard_build_name
self.assertEqual(build_name, expected_build_name)

result_build_name = pr_config.pullrequest_build_name
expected_build_name = args.genconfig_build_name
self.assertEqual(expected_build_name, result_build_name)


def test_TrilinosPRConfigurationBaseDashboardModelPRTrack(self):
Expand Down
29 changes: 18 additions & 11 deletions packages/stratimikos/adapters/belos/src/BelosThyraAdapter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,17 +290,24 @@ namespace Belos {

const int m = B.numRows();
const int n = B.numCols();
auto vs = A.domain();
// Create a view of the B object!
Teuchos::RCP< const TMVB >
B_thyra = vs->createCachedMembersView(
RTOpPack::ConstSubMultiVectorView<ScalarType>(
0, m, 0, n,
arcpFromArrayView(arrayView(&B(0,0), B.stride()*B.numCols())), B.stride()
)
);
// perform the operation via A: mv <- alpha*A*B_thyra + beta*mv
Thyra::apply<ScalarType>(A, Thyra::NOTRANS, *B_thyra, Teuchos::outArg(mv), alpha, beta);
// Check if B is 1-by-1, in which case we can just call MvAddMv()
if ((m == 1) && (n == 1)) {
using Teuchos::tuple; using Teuchos::ptrInArg; using Teuchos::inoutArg;
const ScalarType alphaNew = alpha * B(0, 0);
Thyra::linear_combination<ScalarType>(tuple(alphaNew)(), tuple(ptrInArg(A))(), beta, inoutArg(mv));
} else {
// perform the operation via A: mv <- alpha*A*B_thyra + beta*mv
auto vs = A.domain();
// Create a view of the B object!
Teuchos::RCP< const TMVB >
B_thyra = vs->createCachedMembersView(
RTOpPack::ConstSubMultiVectorView<ScalarType>(
0, m, 0, n,
arcpFromArrayView(arrayView(&B(0,0), B.stride()*B.numCols())), B.stride()
)
);
Thyra::apply<ScalarType>(A, Thyra::NOTRANS, *B_thyra, Teuchos::outArg(mv), alpha, beta);
}
}

/*! \brief Replace \c mv with \f$\alpha A + \beta B\f$.
Expand Down
Loading