Skip to content

Commit

Permalink
Merge Pull Request trilinos#12948 from trilinos/Trilinos/master_merge…
Browse files Browse the repository at this point in the history
…_20240419_175840

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20240419_175840 branch to master'
PR Author: trilinos-autotester
  • Loading branch information
trilinos-autotester authored Apr 20, 2024
2 parents 23ccc58 + 259cbb3 commit c1660db
Show file tree
Hide file tree
Showing 358 changed files with 13,283 additions and 4,082 deletions.
67 changes: 63 additions & 4 deletions .github/workflows/AT2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
bash -l -c "module list"
printenv PATH
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
uses: styfle/cancel-workflow-action@0.12.1
with:
access_token: ${{ github.token }}
- name: make dirs
Expand All @@ -41,7 +41,7 @@ jobs:
mkdir -p /home/Trilinos/src/Trilinos
mkdir -p /home/Trilinos/build
- name: Clone trilinos
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
uses: actions/checkout@v4.1.2
with:
fetch-depth: 0
- name: Repo status
Expand Down Expand Up @@ -70,7 +70,66 @@ jobs:
bash -l -c "cmake -C PR-configuration.cmake -C package-enables.cmake ${GITHUB_WORKSPACE}"
- name: build trilinos
working-directory: /home/Trilinos/build
run: bash -l -c "ninja -j36"
run: bash -l -c "ninja -j16"
- name: ctest
working-directory: /home/Trilinos/build
run: bash -l -c "ctest -j36"
run: bash -l -c "ctest -j16"

gcc830-serial-EXPERIMENTAL:
runs-on: [self-hosted, gcc-8.3.0_serial]
if: ${{ github.event.action == 'synchronize' || github.event.action == 'opened' || github.event.review.state == 'APPROVED' }}
steps:
- name: env
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: |
env
- name: module list
shell: bash
run: |
bash -l -c "module list"
printenv PATH
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.12.1
with:
access_token: ${{ github.token }}
- name: make dirs
working-directory: /
run: |
mkdir -p /home/Trilinos/src/Trilinos
mkdir -p /home/Trilinos/build
- name: Clone trilinos
uses: actions/checkout@v4.1.2
with:
fetch-depth: 0
- name: Repo status
run: |
git fetch --all
pwd
ls -lhat
git status
git branch -vv
git branch -a
- name: get dependencies
working-directory: ./packages/framework
run: |
bash -l -c "./get_dependencies.sh --container"
- name: Generate PR cmake fragment
working-directory: /home/Trilinos/build
run: |
bash -l -c "source ${GITHUB_WORKSPACE}/packages/framework/GenConfig/gen-config.sh rhel8_gcc-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 --force --cmake-fragment PR-configuration.cmake ${GITHUB_WORKSPACE}"
- name: Generate enable packages cmake fragment
working-directory: /home/Trilinos/build
run: |
bash -l -c "TRILINOS_DIR=${GITHUB_WORKSPACE} ${GITHUB_WORKSPACE}/commonTools/framework/get-changed-trilinos-packages.sh HEAD origin/develop package-enables.cmake ctest-labels.cmake" || bash -l -c "cat TribitsDumpDepsXmlScript.log"
- name: configure trilinos
working-directory: /home/Trilinos/build
run: |
bash -l -c "cmake -C PR-configuration.cmake -C package-enables.cmake ${GITHUB_WORKSPACE}"
- name: build trilinos
working-directory: /home/Trilinos/build
run: bash -l -c "ninja -j16"
- name: ctest
working-directory: /home/Trilinos/build
run: bash -l -c "ctest -j16"

2 changes: 1 addition & 1 deletion .github/workflows/clang_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
- uses: DoozyX/clang-format-lint-action@1566bcec081dcb246ab02e7c5f9786c0b629dd4d # v0.16.2
- uses: DoozyX/clang-format-lint-action@11b773b1598aa4ae3b32f023701bca5201c3817d # v0.17
with:
source: './packages/muelu ./packages/tempus ./packages/teko ./packages/xpetra'
exclude: './packages/tempus/examples'
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ on:
schedule:
- cron: '41 23 * * 2'

permissions:
contents: read

jobs:
analyze:
name: Analyze (${{ matrix.language }})
Expand Down Expand Up @@ -55,11 +58,11 @@ jobs:
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
Expand All @@ -82,6 +85,6 @@ jobs:
make -j 2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
with:
category: "/language:${{matrix.language}}"
4 changes: 2 additions & 2 deletions .github/workflows/spack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
runs-on: [self-hosted, gcc-10.3.0_openmpi-4.1.6]
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # 0.11.0
with:
access_token: ${{ github.token }}
- name: Clone Trilinos
uses: actions/checkout@v4
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 1
- name: Spack build
Expand Down
18 changes: 9 additions & 9 deletions PackagesList.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ TRIBITS_REPOSITORY_DEFINE_PACKAGES(
RTOp packages/rtop PT
Sacado packages/sacado PT
MiniTensor packages/minitensor PT
Epetra packages/epetra PT
Epetra packages/epetra ST
SCOREClion SCOREC/lion ST
SCORECpcu SCOREC/pcu ST
SCORECgmi SCOREC/gmi ST
Expand All @@ -80,22 +80,22 @@ TRIBITS_REPOSITORY_DEFINE_PACKAGES(
AvatarT packages/avatart EX
Zoltan packages/zoltan PT
Shards packages/shards PT
Triutils packages/triutils PT
EpetraExt packages/epetraext PT
Triutils packages/triutils ST
EpetraExt packages/epetraext ST
Tpetra packages/tpetra PT
TrilinosSS packages/common/auxiliarySoftware/SuiteSparse PT # Auxiliary software.
Domi packages/domi PT
Thyra packages/thyra PT
Xpetra packages/xpetra PT
Isorropia packages/isorropia PT
Isorropia packages/isorropia ST
Pliris packages/pliris ST
AztecOO packages/aztecoo PT
AztecOO packages/aztecoo ST
Galeri packages/galeri PT
Amesos packages/amesos PT
Amesos packages/amesos ST
Pamgen packages/pamgen PT
Zoltan2Core packages/zoltan2/core PT
Ifpack packages/ifpack PT
ML packages/ml PT
Ifpack packages/ifpack ST
ML packages/ml ST
Belos packages/belos PT
ShyLU_Node packages/shylu/shylu_node PT
Amesos2 packages/amesos2 PT
Expand All @@ -107,7 +107,7 @@ TRIBITS_REPOSITORY_DEFINE_PACKAGES(
FEI packages/fei PT
Teko packages/teko PT
TriKota packages/TriKota ST
Intrepid packages/intrepid PT
Intrepid packages/intrepid ST
Intrepid2 packages/intrepid2 PT
Compadre packages/compadre ST
STK packages/stk PT # Depends on boost
Expand Down
2 changes: 1 addition & 1 deletion ProjectName.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SET(PROJECT_NAME Trilinos)

SET(${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE_DEFAULT ON)
SET(${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE_DEFAULT OFF)

SET(${PROJECT_NAME}_GENERATE_REPO_VERSION_FILE_DEFAULT ON)

Expand Down
18 changes: 18 additions & 0 deletions RELEASE_NOTES
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@

###############################################################################
# #
# Trilinos Release 16.0 Release Notes TBD May/June, 2024 #
# #
###############################################################################

Framework

- Marked all deprecated packages as 'Secondary Tested'.
- Reset default for `Trilinos_ENABLE_SECONDARY_TESTED_CODE` to `OFF`.
This will cause the previously-mentioned deprecated packages to NOT be
automatically enabled to help guide users away from them. The old
behavior can be restored by setting the variable back to `ON`, but note
that the recommended best practice is to explicitly enable packages that
the user is depending on (e.g. if you depend on ThyraEpetraAdapters, enable
that explicitly instead of Thyra and Epetra and allowing TriBITS to enable
the adapters).

###############################################################################
# #
# Trilinos Release 15.1.0 Release Notes February 26, 2024 #
Expand Down
2 changes: 1 addition & 1 deletion packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ initialize ()
int block_size = List_.get<int>("partitioner: block size");
TEUCHOS_TEST_FOR_EXCEPT_MSG
(block_size == -1, "A pointwise matrix and block_size = -1 were given as inputs.");
A_bcrs = Tpetra::convertToBlockCrsMatrix(*Teuchos::rcp_dynamic_cast<const crs_matrix_type>(A_), block_size);
A_bcrs = Tpetra::convertToBlockCrsMatrix(*Teuchos::rcp_dynamic_cast<const crs_matrix_type>(A_), block_size, false);
A_ = A_bcrs;
hasBlockCrsMatrix_ = true;
Kokkos::DefaultExecutionSpace().fence();
Expand Down
2 changes: 1 addition & 1 deletion packages/ifpack2/src/Ifpack2_BlockTriDiContainer_def.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ namespace Ifpack2 {
(block_size == -1, "A pointwise matrix and block_size = -1 were given as inputs.");
{
IFPACK2_BLOCKHELPER_TIMER("BlockTriDiContainer::setA::convertToBlockCrsMatrix");
impl_->A = Tpetra::convertToBlockCrsMatrix(*Teuchos::rcp_dynamic_cast<const crs_matrix_type>(matrix), block_size);
impl_->A = Tpetra::convertToBlockCrsMatrix(*Teuchos::rcp_dynamic_cast<const crs_matrix_type>(matrix), block_size, false);
IFPACK2_BLOCKHELPER_TIMER_FENCE(typename BlockHelperDetails::ImplType<MatrixType>::execution_space)
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/kokkos-kernels/blas/tpls/KokkosBlas_Cuda_tpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
#include <Kokkos_Core.hpp>
#include <KokkosKernels_config.h>
#include <KokkosBlas_Cuda_tpl.hpp>
#include <KokkosBlas_Magma_tpl.hpp>
22 changes: 0 additions & 22 deletions packages/kokkos-kernels/blas/tpls/KokkosBlas_Cuda_tpl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,4 @@ CudaBlasSingleton& CudaBlasSingleton::singleton() {
} // namespace KokkosBlas
#endif // defined (KOKKOSKERNELS_ENABLE_TPL_CUBLAS)

#if defined(KOKKOSKERNELS_ENABLE_TPL_MAGMA)
#include <KokkosBlas_tpl_spec.hpp>

namespace KokkosBlas {
namespace Impl {

MagmaSingleton::MagmaSingleton() {
magma_int_t stat = magma_init();
if (stat != MAGMA_SUCCESS) Kokkos::abort("MAGMA initialization failed\n");

Kokkos::push_finalize_hook([&]() { magma_finalize(); });
}

MagmaSingleton& MagmaSingleton::singleton() {
static MagmaSingleton s;
return s;
}

} // namespace Impl
} // namespace KokkosBlas
#endif // defined(KOKKOSKERNELS_ENABLE_TPL_MAGMA)

#endif // KOKKOSBLAS_CUDA_TPL_HPP_
41 changes: 41 additions & 0 deletions packages/kokkos-kernels/blas/tpls/KokkosBlas_Magma_tpl.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
//@HEADER
// ************************************************************************
//
// Kokkos v. 4.0
// Copyright (2022) National Technology & Engineering
// Solutions of Sandia, LLC (NTESS).
//
// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions.
// See https://kokkos.org/LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//@HEADER
#ifndef KOKKOSBLAS_MAGMA_TPL_HPP_
#define KOKKOSBLAS_MAGMA_TPL_HPP_

#if defined(KOKKOSKERNELS_ENABLE_TPL_MAGMA)
#include <KokkosBlas_magma.hpp>

namespace KokkosBlas {
namespace Impl {

MagmaSingleton::MagmaSingleton() {
magma_int_t stat = magma_init();
if (stat != MAGMA_SUCCESS) Kokkos::abort("MAGMA initialization failed\n");

Kokkos::push_finalize_hook([&]() { magma_finalize(); });
}

MagmaSingleton& MagmaSingleton::singleton() {
static MagmaSingleton s;
return s;
}

} // namespace Impl
} // namespace KokkosBlas
#endif // defined(KOKKOSKERNELS_ENABLE_TPL_MAGMA)

#endif // KOKKOSBLAS_MAGMA_TPL_HPP_
37 changes: 37 additions & 0 deletions packages/kokkos-kernels/blas/tpls/KokkosBlas_magma.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
//@HEADER
// ************************************************************************
//
// Kokkos v. 4.0
// Copyright (2022) National Technology & Engineering
// Solutions of Sandia, LLC (NTESS).
//
// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions.
// See https://kokkos.org/LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//@HEADER

#ifndef KOKKOSBLAS_MAGMA_HPP_
#define KOKKOSBLAS_MAGMA_HPP_

// If LAPACK TPL is enabled, it is preferred over magma's LAPACK
#ifdef KOKKOSKERNELS_ENABLE_TPL_MAGMA
#include "magma_v2.h"

namespace KokkosBlas {
namespace Impl {

struct MagmaSingleton {
MagmaSingleton();

static MagmaSingleton& singleton();
};

} // namespace Impl
} // namespace KokkosBlas
#endif // KOKKOSKERNELS_ENABLE_TPL_MAGMA

#endif // KOKKOSBLAS_MAGMA_HPP_
17 changes: 0 additions & 17 deletions packages/kokkos-kernels/blas/tpls/KokkosBlas_tpl_spec.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -214,21 +214,4 @@ inline rocblas_operation trans_mode_kk_to_rocblas(const char kkMode[]) {

#endif // KOKKOSKERNELS_ENABLE_TPL_ROCBLAS

// If LAPACK TPL is enabled, it is preferred over magma's LAPACK
#ifdef KOKKOSKERNELS_ENABLE_TPL_MAGMA
#include "magma_v2.h"

namespace KokkosBlas {
namespace Impl {

struct MagmaSingleton {
MagmaSingleton();

static MagmaSingleton& singleton();
};

} // namespace Impl
} // namespace KokkosBlas
#endif // KOKKOSKERNELS_ENABLE_TPL_MAGMA

#endif // KOKKOSBLAS_TPL_SPEC_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
#include <Kokkos_Core.hpp>
#include <KokkosKernels_config.h>
#include <KokkosLapack_Cuda_tpl.hpp>
#include <KokkosLapack_Magma_tpl.hpp>
Loading

0 comments on commit c1660db

Please sign in to comment.