Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
dridzal committed Nov 9, 2023
2 parents e15e397 + 1767fbf commit a5c7f67
Show file tree
Hide file tree
Showing 5,420 changed files with 3,212,053 additions and 511,420 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
32 changes: 2 additions & 30 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,11 @@

/packages/belos/ @trilinos/belos

/packages/claps/ @trilinos/claps

/packages/domi/ @trilinos/domi

/packages/epetra/ @trilinos/epetra

/packages/epetraext/ @trilinos/epetraext

/packages/fei/ @trilinos/fei

#/packages/galeri/ @trilinos/

/packages/globipack/ @trilinos/globipack
/packages/framework/ @trilinos/framework

/packages/ifpack/ @trilinos/ifpack

Expand All @@ -36,32 +28,20 @@

/packages/kokkos-kernels/ @trilinos/kokkos-kernels

/packages/komplex/ @trilinos/komplex

#/packages/meshinggenie/ @trilinos/

#/packages/minitensor/ @trilinos/

/packages/ml/ @trilinos/ml

/packages/moertel/ @trilinos/moertel

/packages/muelu/ @trilinos/muelu

/packages/new_package/ @trilinos/new_package

/packages/nox/ @trilinos/nox

/packages/optipack/ @trilinos/optipack

/packages/pamgen/ @trilinos/pamgen

/packages/panzer/ @trilinos/panzer

/packages/phalanx/ @trilinos/phalanx

#/packages/pike/ @trilinos/

/packages/piro/ @trilinos/piro

/packages/pliris/ @trilinos/pliris
Expand All @@ -72,8 +52,6 @@

/packages/rtop/ @trilinos/rtop

/packages/rythmos/ @trilinos/rythmos

/packages/sacado/ @trilinos/sacado

/packages/seacas/ @trilinos/seacas
Expand All @@ -94,17 +72,11 @@

/packages/teuchos/ @trilinos/teuchos

#/packages/ThreadPool/ @trilinos/

/packages/thyra/ @trilinos/thyra

/packages/tpetra/ @trilinos/tpetra

/packages/TriKota/ @trilinos/trikota

#/packages/trilinoscouplings/ @trilinos/

#/packages/trios/ @trilinos/
/packages/trilinoscouplings/ @trilinos/trilinoscouplings

/packages/triutils/ @trilinos/triutils

Expand Down
78 changes: 78 additions & 0 deletions .github/workflows/PR-gcc-openmpi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: PR-gcc-openmpi

on:
pull_request:
types:
- labeled
- opened
- synchronize
branches:
- master
- develop
workflow_dispatch:

jobs:
trilogpu02-gcc:
runs-on: [self-hosted, trilogpu02]
container:
image: registry-ex.sandia.gov/trilinos-project/trilinos-containers/rhel8/trilinos-pr-env:gcc-8.5.0
options: --hostname trilinos-container-gcc-8
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/[email protected]
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
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-openmpi_debug_shared_no-kokkos-arch_no-asan_complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables --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: CMakeCache.txt
if: always()
working-directory: /home/Trilinos/build
run: |
bash -l -c "cat CMakeCache.txt"
- name: build trilinos
working-directory: /home/Trilinos/build
run: bash -l -c "ninja"
- name: ctest
working-directory: /home/Trilinos/build
run: bash -l -c "ctest -j36"
20 changes: 20 additions & 0 deletions .github/workflows/detect-git-lfs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Check for git LFS pointers

on:
pull_request:

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Check out code
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Search for oids in modified lines
run: |
$GITHUB_WORKSPACE/commonTools/test/utilities/check-lfs-oids.sh \
origin/${{ github.event.pull_request.base.ref }} \
${{ github.event.pull_request.head.sha }}
20 changes: 20 additions & 0 deletions .github/workflows/detect-mpi-comm-world.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Check MPI_COMM_WORLD

on:
pull_request:

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Check out code
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Search for MPI_COMM_WORLD in modified lines
run: |
python $GITHUB_WORKSPACE/commonTools/test/utilities/check-mpi-comm-world-usage.py \
--base origin/${{ github.event.pull_request.base.ref }} \
--head ${{ github.event.pull_request.head.sha }}
23 changes: 23 additions & 0 deletions .github/workflows/tpetra_muelu_label_to_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,33 @@ permissions:
jobs:
assign_one_project:
permissions:
issues: write # for actions/github-script@v6
repository-projects: write # for srggrs/assign-one-project-github-action to assign issues and PRs to repo project
name: Assign to MueLu or Tpetra Project
runs-on: ubuntu-latest
steps:
- name: Add MueLu Label
uses: actions/github-script@v6
if: contains(github.event.issue.title, 'MueLu')
with:
script: |
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ["pkg: MueLu"]
})
- name: Add Tpetra Label
uses: actions/github-script@v6
if: contains(github.event.issue.title, 'Tpetra')
with:
script: |
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ["pkg: Tpetra"]
})
- name: Add to MueLu Project
uses: srggrs/[email protected]
if: contains(github.event.label.name, 'MueLu') || contains(github.event.issue.title, 'MueLu')
Expand Down
53 changes: 10 additions & 43 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,7 @@ INCLUDE(${CMAKE_CURRENT_LIST_DIR}/ProjectName.cmake)
PROJECT(${PROJECT_NAME} NONE)

# Set up to use ccache
if($ENV{CCACHE_NODISABLE})
find_program(CCACHE_PROGRAM ccache)
if(CCACHE_PROGRAM)
if(CMAKE_GENERATOR STREQUAL "Xcode")
message(FATAL_ERROR "ccache not supported with Xcode in Trilinos")
else()
set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
endif()
else()
message(FATAL_ERROR "ccache requested but not found")
endif()
endif()
include("${CMAKE_CURRENT_LIST_DIR}/cmake/UseCCache.cmake")

# Set an env so we know we are in configure
set(ENV{CMAKE_IS_IN_CONFIGURE_MODE} 1)
Expand All @@ -103,42 +91,21 @@ SET(${PROJECT_NAME}_ENABLE_CPACK_PACKAGING_DEFAULT ON)
# Don't allow disabled subpackages to be excluded from tarball
SET(${PROJECT_NAME}_EXCLUDE_DISABLED_SUBPACKAGES_FROM_DISTRIBUTION_DEFAULT FALSE)

# Set up C++ language standard selection (rest is handled by TriBITS)
SET(${PROJECT_NAME}_CMAKE_CXX_STANDARD_DEFAULT 17)
SET(${PROJECT_NAME}_CMAKE_CXX_STANDARDS_ALLOWED "(17|20|23)")
ADVANCED_SET(CMAKE_CXX_STANDARD ${${PROJECT_NAME}_CMAKE_CXX_STANDARD_DEFAULT}
CACHE STRING
"C++ standard number with values ${${PROJECT_NAME}_CMAKE_CXX_STANDARDS_ALLOWED} (default ${${PROJECT_NAME}_CMAKE_CXX_STANDARD_DEFAULT})")
IF (NOT CMAKE_CXX_STANDARD MATCHES "^${${PROJECT_NAME}_CMAKE_CXX_STANDARDS_ALLOWED}$")
MESSAGE(FATAL_ERROR
"CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} is not in the allowed set "
"${${PROJECT_NAME}_CMAKE_CXX_STANDARDS_ALLOWED}")
ENDIF ()

message(STATUS "The Current CXX Standard is : " ${CMAKE_CXX_STANDARD})

# Force off support for Makefile.export.* files while TriBITS is refactored to
# remove this (#8498)
SET(${PROJECT_NAME}_ENABLE_EXPORT_MAKEFILES OFF CACHE BOOL
"Support being removed from TriBITS (see trilinos/Trilinos#8498)" FORCE)

SET(Trilinos_USE_GNUINSTALLDIRS_DEFAULT ON)

SET(Trilinos_MUST_FIND_ALL_TPL_LIBS_DEFAULT TRUE)

# Some CMake and TriBiTS tweaks just for Trilinos
include(TrilinosTweaks)

# Do all of the processing for this Tribits project
TRIBITS_PROJECT()

INSTALL_BUILD_STATS_SCRIPTS()

# Install TriBITS so that other projects can use it.
ADVANCED_SET(${PROJECT_NAME}_INSTALL_TriBITS ON CACHE BOOL
"If ture, install TriBITS into <lib-install-dir>/cmake/tribits/")
IF (${PROJECT_NAME}_INSTALL_TriBITS)
ASSERT_DEFINED(Trilinos_SOURCE_DIR)
ASSERT_DEFINED(${PROJECT_NAME}_INSTALL_LIB_DIR)
INSTALL(
DIRECTORY "${Trilinos_SOURCE_DIR}/cmake/tribits"
DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake"
PATTERN "*.pyc" EXCLUDE
)
ENDIF()
# Install TriBITS so that other projects can use it
include(SetupTribitsInstall)

IF(${PROJECT_NAME}_ENABLE_YouCompleteMe)
INCLUDE(CodeCompletion)
Expand Down
1 change: 1 addition & 0 deletions PackagesList.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(Komplex) # 27030 targets
TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(Moertel) # 26995 targets
TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(TriKota) # 26995 targets
TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(Domi) # 26946 targets
TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(FEI)

#
# Disable certain packages on certain platforms.
Expand Down
Loading

0 comments on commit a5c7f67

Please sign in to comment.