Skip to content

Commit

Permalink
merge branch develop
Browse files Browse the repository at this point in the history
Signed-off-by: srkenno <[email protected]>
  • Loading branch information
skennon10 committed Dec 17, 2024
2 parents ca09ba9 + e4bd7dd commit 5dd8609
Show file tree
Hide file tree
Showing 2,083 changed files with 78,319 additions and 35,530 deletions.
56 changes: 30 additions & 26 deletions .github/workflows/AT2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ on:
- opened
- synchronize
branches:
- master
- develop
- master
- develop
workflow_dispatch:

# Cancels any in progress 'workflows' associated with this PR
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
mkdir -p /home/Trilinos/src/Trilinos
mkdir -p /home/Trilinos/build
- name: Clone trilinos
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Repo status
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
printf "\n\n\n"
echo "image: ${AT2_IMAGE:-unknown}"
echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}"
python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/PullRequestLinuxDriverTest.py \
--target-branch-name ${{ github.event.pull_request.base.ref }} \
Expand All @@ -103,18 +103,20 @@ jobs:
--workspace-dir /home/runner/_work/Trilinos \
--source-dir ${GITHUB_WORKSPACE} \
--build-dir /home/Trilinos/build \
--dashboard-build-name `cat /etc/hostname` \
--dashboard-build-name=PR-${{ github.event.pull_request.number }}_${AT2_IMAGE}_debug_shared \
--ctest-driver /home/runner/_work/Trilinos/Trilinos/cmake/SimpleTesting/cmake/ctest-driver.cmake \
--ctest-drop-site sems-cdash-son.sandia.gov/cdash \
--filename-subprojects ./package_subproject_list.cmake \
--filename-packageenables ./packageEnables.cmake
--filename-packageenables ./packageEnables.cmake \
--max-cores-allowed=29 \
--num-concurrent-tests=16
- name: Summary
if: ${{ !cancelled() }}
shell: bash -l {0}
working-directory: /home/Trilinos/build
run: |
echo "## Image" >> $GITHUB_STEP_SUMMARY
echo "image: ${AT2_IMAGE:-unknown}" >> $GITHUB_STEP_SUMMARY
echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}" >> $GITHUB_STEP_SUMMARY
echo "## CDash Links" >> $GITHUB_STEP_SUMMARY
echo "### Current Build" >> $GITHUB_STEP_SUMMARY
AT2_URL=$(</home/runner/AT2_URL.txt)
Expand Down Expand Up @@ -151,7 +153,7 @@ jobs:
mkdir -p /home/Trilinos/src/Trilinos
mkdir -p /home/Trilinos/build
- name: Clone trilinos
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Repo status
Expand Down Expand Up @@ -183,7 +185,7 @@ jobs:
printf "\n\n\n"
echo "image: ${AT2_IMAGE:-unknown}"
echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}"
python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/PullRequestLinuxDriverTest.py \
--target-branch-name ${{ github.event.pull_request.base.ref }} \
Expand All @@ -194,18 +196,20 @@ jobs:
--workspace-dir /home/runner/_work/Trilinos \
--source-dir ${GITHUB_WORKSPACE} \
--build-dir /home/Trilinos/build \
--dashboard-build-name `cat /etc/hostname` \
--dashboard-build-name=PR-${{ github.event.pull_request.number }}_${AT2_IMAGE}_release-debug_shared \
--ctest-driver /home/runner/_work/Trilinos/Trilinos/cmake/SimpleTesting/cmake/ctest-driver.cmake \
--ctest-drop-site sems-cdash-son.sandia.gov/cdash \
--filename-subprojects ./package_subproject_list.cmake \
--filename-packageenables ./packageEnables.cmake
--filename-packageenables ./packageEnables.cmake \
--max-cores-allowed=29 \
--num-concurrent-tests=16
- name: Summary
if: ${{ !cancelled() }}
shell: bash -l {0}
working-directory: /home/Trilinos/build
run: |
echo "## Image" >> $GITHUB_STEP_SUMMARY
echo "image: ${AT2_IMAGE:-unknown}" >> $GITHUB_STEP_SUMMARY
echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}" >> $GITHUB_STEP_SUMMARY
echo "## CDash Links" >> $GITHUB_STEP_SUMMARY
echo "### Current Build" >> $GITHUB_STEP_SUMMARY
AT2_URL=$(</home/runner/AT2_URL.txt)
Expand All @@ -217,7 +221,7 @@ jobs:
echo "https://github.com/trilinos/Trilinos/wiki/Containers" >> $GITHUB_STEP_SUMMARY
echo "https://gitlab-ex.sandia.gov/trilinos-project/trilinos-containers/-/wikis/Containers-at-Sandia" >> $GITHUB_STEP_SUMMARY
cuda11-uvm-EXPERIMENTAL:
cuda11-EXPERIMENTAL:
needs: pre-checks
runs-on: [self-hosted, cuda-11.4.2_gcc-10.3.0_openmpi-4.1.6]
if: ${{ needs.pre-checks.outputs.should_skip != 'true' && (github.event.action == 'synchronize' || github.event.action == 'opened' || github.event.review.state == 'APPROVED') }}
Expand All @@ -242,7 +246,7 @@ jobs:
mkdir -p /home/Trilinos/src/Trilinos
mkdir -p /home/Trilinos/build
- name: Clone trilinos
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Repo status
Expand Down Expand Up @@ -273,31 +277,32 @@ jobs:
printf "\n\n\n"
echo "image: ${AT2_IMAGE:-unknown}"
echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}"
type python
python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/PullRequestLinuxDriverTest.py \
--target-branch-name ${{ github.event.pull_request.base.ref }} \
--genconfig-build-name rhel8_cuda-gcc-openmpi_release_static_Ampere80_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_no-package-enables \
--genconfig-build-name rhel8_cuda-11-gcc-openmpi_release_static_Ampere80_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables \
--pullrequest-number ${{ github.event.pull_request.number }} \
--pullrequest-env-config-file ${GITHUB_WORKSPACE}/packages/framework/pr_tools/trilinos_pr.ini \
--pullrequest-gen-config-file ${GITHUB_WORKSPACE}/packages/framework/GenConfig/src/gen-config.ini \
--workspace-dir /home/runner/_work/Trilinos \
--source-dir ${GITHUB_WORKSPACE} \
--build-dir /home/Trilinos/build \
--dashboard-build-name `cat /etc/hostname` \
--dashboard-build-name=PR-${{ github.event.pull_request.number }}_${AT2_IMAGE}_release_static \
--ctest-driver /home/runner/_work/Trilinos/Trilinos/cmake/SimpleTesting/cmake/ctest-driver.cmake \
--ctest-drop-site sems-cdash-son.sandia.gov/cdash \
--filename-subprojects ./package_subproject_list.cmake \
--filename-packageenables ./packageEnables.cmake \
--max-cores-allowed=96 \
--num-concurrent-tests=96
--max-cores-allowed=56 \
--num-concurrent-tests=112 \
--slots-per-gpu=8
- name: Summary
if: ${{ !cancelled() }}
shell: bash -l {0}
working-directory: /home/Trilinos/build
run: |
echo "## Image" >> $GITHUB_STEP_SUMMARY
echo "image: ${AT2_IMAGE:-unknown}" >> $GITHUB_STEP_SUMMARY
echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}" >> $GITHUB_STEP_SUMMARY
echo "## CDash Links" >> $GITHUB_STEP_SUMMARY
echo "### Current Build" >> $GITHUB_STEP_SUMMARY
AT2_URL=$(</home/runner/AT2_URL.txt)
Expand Down Expand Up @@ -334,7 +339,7 @@ jobs:
mkdir -p /home/Trilinos/src/Trilinos
mkdir -p /home/Trilinos/build
- name: Clone trilinos
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Repo status
Expand Down Expand Up @@ -365,7 +370,7 @@ jobs:
printf "\n\n\n"
echo "image: ${AT2_IMAGE:-unknown}"
echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}"
type python
python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/PullRequestLinuxDriverTest.py \
--target-branch-name ${{ github.event.pull_request.base.ref }} \
Expand All @@ -376,18 +381,18 @@ jobs:
--workspace-dir /home/runner/_work/Trilinos \
--source-dir ${GITHUB_WORKSPACE} \
--build-dir /home/Trilinos/build \
--dashboard-build-name `cat /etc/hostname` \
--dashboard-build-name=PR-${{ github.event.pull_request.number }}_${AT2_IMAGE}_framework-tests \
--ctest-driver /home/runner/_work/Trilinos/Trilinos/cmake/SimpleTesting/cmake/ctest-driver.cmake \
--ctest-drop-site sems-cdash-son.sandia.gov/cdash \
--filename-subprojects ./package_subproject_list.cmake \
--filename-packageenables ./packageEnables.cmake \
--skip-create-packageenables \
- name: Summary
if: ${{ !cancelled() }}
shell: bash -l {0}
working-directory: /home/Trilinos/build
run: |
echo "## Image" >> $GITHUB_STEP_SUMMARY
echo "image: ${AT2_IMAGE:-unknown}" >> $GITHUB_STEP_SUMMARY
echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}" >> $GITHUB_STEP_SUMMARY
echo "## CDash Links" >> $GITHUB_STEP_SUMMARY
echo "### Current Build" >> $GITHUB_STEP_SUMMARY
AT2_URL=$(</home/runner/AT2_URL.txt)
Expand All @@ -398,4 +403,3 @@ jobs:
echo "## Helpful Links" >> $GITHUB_STEP_SUMMARY
echo "https://github.com/trilinos/Trilinos/wiki/Containers" >> $GITHUB_STEP_SUMMARY
echo "https://gitlab-ex.sandia.gov/trilinos-project/trilinos-containers/-/wikis/Containers-at-Sandia" >> $GITHUB_STEP_SUMMARY
2 changes: 1 addition & 1 deletion .github/workflows/clang_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: DoozyX/clang-format-lint-action@c71d0bf4e21876ebec3e5647491186f8797fde31 # v0.18.2
with:
source: './packages/muelu ./packages/tempus ./packages/teko ./packages/xpetra'
Expand Down
119 changes: 71 additions & 48 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -1,90 +1,113 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL: Linear Solvers"
name: "CodeQL Security Scan"

on:
#push:
# branches: [ "muelu-sync-workflow" ]
pull_request:
branches: [ "develop" ]
branches:
- develop
types:
- opened
- synchronize
schedule:
- cron: '41 23 * * 2'

# Cancels any in progress workflows associated with this PR
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

permissions:
contents: read

jobs:
analyze:
name: Analyze (${{ matrix.language }})
# Runner size impacts CodeQL analysis time. To learn more, please see:
# - https://gh.io/recommended-hardware-resources-for-running-codeql
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners (GitHub.com only)
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
runs-on: [self-hosted, gcc-10.3.0_openmpi-4.1.6]
if: ${{ github.event.action == 'synchronize' || github.event.action == 'opened' }}

permissions:
# required for all workflows
security-events: write

# only required for workflows in private repositories
actions: read
contents: read

strategy:
fail-fast: false
matrix:
include:
- language: c-cpp
build-mode: manual
#- language: python
# build-mode: none
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
# Use `c-cpp` to analyze code written in C, C++ or both
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
# 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
defaults:
run:
shell: bash -l {0}

steps:
- name: Checkout repository
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
config: |
query-filters:
- exclude:
tags: cpp/integer-multiplication-cast-to-long
- name: Print environment
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: |
env
- name: Module list
run: |
module list
printenv PATH
- if: matrix.build-mode == 'manual'
name: Configure Trilinos
name: Get dependencies
working-directory: ./packages/framework
run: |
mkdir -p trilinos_build
cd trilinos_build
cmake -G 'Unix Makefiles' -DTrilinos_ENABLE_TESTS=OFF -DTrilinos_ENABLE_Epetra=OFF -DTrilinos_ENABLE_AztecOO=OFF -DTrilinos_ENABLE_Ifpack=OFF -DTrilinos_ENABLE_ML=OFF -D Trilinos_ENABLE_Triutils=OFF -DTrilinos_ENABLE_Tpetra=ON -DTrilinos_ENABLE_MueLu=ON -DTrilinos_ENABLE_Krino=OFF ..
./get_dependencies.sh --container
- if: matrix.build-mode == 'manual'
name: Build Trilinos
name: Generate CMake fragments
run: |
cd trilinos_build
make -j 2
git fetch origin ${GITHUB_BASE_REF}
mkdir -p trilinos_build && cd trilinos_build
source ${GITHUB_WORKSPACE}/packages/framework/GenConfig/gen-config.sh --force --cmake-fragment genconfig_fragment.cmake rhel8_gcc-openmpi_debug_shared_no-kokkos-arch_no-asan_complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
${GITHUB_WORKSPACE}/commonTools/framework/get-changed-trilinos-packages.sh origin/${GITHUB_BASE_REF} HEAD package_enables.cmake package_subprojects.cmake
- if: matrix.build-mode == 'manual'
name: Configure and build Trilinos
working-directory: ./trilinos_build
run: |
cmake -C genconfig_fragment.cmake -C package_enables.cmake \
-DTrilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES=OFF \
-DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES=OFF \
-DTrilinos_ENABLE_SECONDARY_TESTED_CODE=OFF \
-DTrilinos_ENABLE_Amesos=OFF \
-DTrilinos_ENABLE_AztecOO=OFF \
-DTrilinos_ENABLE_Epetra=OFF \
-DTrilinos_ENABLE_EpetraExt=OFF \
-DTrilinos_ENABLE_Ifpack=OFF \
-DTrilinos_ENABLE_Intrepid=OFF \
-DTrilinos_ENABLE_Isorropia=OFF \
-DTrilinos_ENABLE_ML=OFF \
-DTrilinos_ENABLE_NewPackage=OFF \
-DTrilinos_ENABLE_Pliris=OFF \
-DTrilinos_ENABLE_PyTrilinos=OFF \
-DTrilinos_ENABLE_ShyLU_DDCore=OFF \
-DTrilinos_ENABLE_ThyraEpetraAdapters=OFF \
-DTrilinos_ENABLE_ThyraEpetraExtAdapters=OFF \
-DTrilinos_ENABLE_Triutils=OFF ..
ninja -j 16
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
with:
category: "/language:${{matrix.language}}"
6 changes: 3 additions & 3 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
with:
egress-policy: audit

- name: 'Checkout Repository'
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: 'Dependency Review'
uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0
2 changes: 1 addition & 1 deletion .github/workflows/detect-git-lfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0

Expand Down
Loading

0 comments on commit 5dd8609

Please sign in to comment.