Skip to content

Commit

Permalink
Merge 'trilinos/Trilinos:trilinos/develop' (444a5d0) into 'EM-Plasma/…
Browse files Browse the repository at this point in the history 
…Trilinos:develop' (8f92205).

* trilinos/develop: (35 commits)
  Piro: some fixes / additions relevant to Schwarz coupling in Albany-LCM.
  Tpetra: Fixed two errors in Tpetra::FECrsMatrix test (trilinos#9965)
  Revert "Merge Pull Request trilinos#9894 from bartlettroscoe/Trilinos/tribits-299-modern-cmake-targets-1"
  Panzer: fix compiler warning, add safety check to q8/q4 converter
  Panzer: allow for mpi subcomm in Q8 to Q4 mesh factory
  change calls for sems-[TPLname] to sems-archive-[TPLname].
  Automatic snapshot commit from tribits at 1241168
  NOX: update solver stats
  Tpetra: remove unnecessary broadcast
  Piro: correcting logic so code does not attempt to construct adjoint model when adjoint model passed in is null.
  Xpetra IO: More fixes for binary reading
  Panzer: add Quad8 to Quad4 mesh factory
  Ifpack2: rebaselining long double test.  Something in Trilinos changes that changed slightly the matrices / vectors defined in this problem.  Verified that precision of result given new matrix/vector is correct.
  Tempus: Fix Failing Tests Due to FPE
  Xpetra: fix bug in binary reader
  Tpetra: use exact nnz per row in matrix reader
  removed outdated information
  MueLu ML translation: Translate Hiptmair
  MueLu RefMaxwell: Use smoother factory for Hiptmair
  Ifpack2 Hiptmair: add subsmoothers to Hiptmair description
  ...
  • Loading branch information
EMPIRE Jenkins committed Dec 3, 2021
2 parents 8f92205 + 444a5d0 commit dadf5f4
Show file tree
Hide file tree
Showing 48 changed files with 2,706 additions and 817 deletions.
11 changes: 4 additions & 7 deletions cmake/std/PullRequestLinuxDriver.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ function bootstrap_modules() {
exit -1
fi
else
source /projects/sems/modulefiles/utils/sems-modules-init.sh
module unload sems-git
module unload sems-python
module load sems-git/2.10.1
source /projects/sems/modulefiles/utils/sems-archive-modules-init.sh
module unload sems-archive-git
module unload sems-archive-python
module load sems-archive-git/2.10.1

# module load sems-python/3.5.2 # Currently not on cloud nodes
# #pip3 install --user configparser
Expand Down Expand Up @@ -180,6 +180,3 @@ message_std "PRDriver> " "cd $(pwd)"
message_std "PRDriver> " "${test_cmd:?} --pullrequest-cdash-track='${PULLREQUEST_CDASH_TRACK:?}'"
${test_cmd} --pullrequest-cdash-track="${PULLREQUEST_CDASH_TRACK:?}"
exit $?



138 changes: 69 additions & 69 deletions cmake/std/pr_config/pullrequest.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ max-test-parallelism : 4


[SIERRA-PYTHON-3.6.3]
module-unload sems-python:
module-unload sems-archive-python:
setenv MANPATH: "/projects/sierra/linux_rh7/install/Python/3.6.3/share/man"
setenv PATH_TMP: "/projects/sierra/linux_rh7/install/Python/extras/bin:${PATH}"
setenv PATH: "/projects/sierra/linux_rh7/install/Python/3.6.3/share/bin:${PATH_TMP}"
Expand All @@ -168,22 +168,22 @@ module-purge:
[SEMS-ENV]
use MODULE-PURGE:
module-use: /projects/sems/modulefiles/projects
module-load sems-env:
module-load sems-archive-env:



[SEMS-DEFAULT]
module-load sems-openmpi : 1.10.1
module-load sems-boost : 1.63.0/base
module-load sems-zlib : 1.2.8/base
module-load sems-hdf5 : 1.10.6/parallel
module-load sems-netcdf : 4.7.3/parallel
module-load sems-parmetis : 4.0.3/parallel
module-load sems-scotch : 6.0.3/nopthread_64bit_parallel
module-load sems-superlu : 4.3/base
module-load sems-git : 2.10.1
module-load sems-cmake : 3.17.1
#module-load sems-python: 3.5.2
module-load sems-archive-openmpi : 1.10.1
module-load sems-archive-boost : 1.63.0/base
module-load sems-archive-zlib : 1.2.8/base
module-load sems-archive-hdf5 : 1.10.6/parallel
module-load sems-archive-netcdf : 4.7.3/parallel
module-load sems-archive-parmetis : 4.0.3/parallel
module-load sems-archive-scotch : 6.0.3/nopthread_64bit_parallel
module-load sems-archive-superlu : 4.3/base
module-load sems-archive-git : 2.10.1
module-load sems-archive-cmake : 3.17.1
#module-load sems-archive-python: 3.5.2
use SIERRA-PYTHON-3.6.3:
setenv OMP_NUM_THREADS : 2

Expand All @@ -202,7 +202,7 @@ module-load atdm-ninja_fortran: 1.7.2
[Trilinos_pullrequest_gcc_4.8.4]
use SEMS-ENV:
use ATDM-ENV:
module-load sems-gcc: 4.8.4
module-load sems-archive-gcc: 4.8.4
use SEMS-DEFAULT:
use ATDM-DEFAULT:

Expand All @@ -211,17 +211,17 @@ use ATDM-DEFAULT:
[Trilinos_pullrequest_gcc_4.9.3_SERIAL]
use SEMS-ENV:
use ATDM-ENV:
module-load sems-gcc: 4.9.3
module-load sems-archive-gcc: 4.9.3
use SEMS-DEFAULT:
use ATDM-DEFAULT:
module-remove sems-hdf5:
module-remove sems-netcdf:
module-remove sems-openmpi:
module-remove sems-parmetis:
module-remove sems-scotch:
module-load sems-hdf5: 1.10.6/base
module-load sems-netcdf: 4.7.3/base
module-load sems-metis: 5.1.0/base
module-remove sems-archive-hdf5:
module-remove sems-archive-netcdf:
module-remove sems-archive-openmpi:
module-remove sems-archive-parmetis:
module-remove sems-archive-scotch:
module-load sems-archive-hdf5: 1.10.6/base
module-load sems-archive-netcdf: 4.7.3/base
module-load sems-archive-metis: 5.1.0/base
setenv OMP_NUM_THREADS: 1


Expand All @@ -230,7 +230,7 @@ setenv OMP_NUM_THREADS: 1
[Trilinos_pullrequest_gcc_7.2.0]
use SEMS-ENV:
use ATDM-ENV:
module-load sems-gcc: 7.2.0
module-load sems-archive-gcc: 7.2.0
use SEMS-DEFAULT:
use ATDM-DEFAULT:

Expand All @@ -243,18 +243,18 @@ use Trilinos_pullrequest_gcc_7.2.0:

[Trilinos_pullrequest_gcc_7.2.0_serial]
use SEMS-ENV:
module-load sems-git: 2.10.1
module-load sems-gcc: 7.2.0
#module-load sems-python: 2.7.9
#module-load sems-python: 3.5.2
module-load sems-archive-git: 2.10.1
module-load sems-archive-gcc: 7.2.0
#module-load sems-archive-python: 2.7.9
#module-load sems-archive-python: 3.5.2
use SIERRA-PYTHON-3.6.3:
module-load sems-boost: 1.63.0/base
module-load sems-zlib: 1.2.8/base
module-load sems-hdf5: 1.10.6/base
module-load sems-netcdf: 4.7.3/base
module-load sems-metis: 5.1.0/base
module-load sems-superlu: 4.3/base
module-load sems-cmake: 3.17.1
module-load sems-archive-boost: 1.63.0/base
module-load sems-archive-zlib: 1.2.8/base
module-load sems-archive-hdf5: 1.10.6/base
module-load sems-archive-netcdf: 4.7.3/base
module-load sems-archive-metis: 5.1.0/base
module-load sems-archive-superlu: 4.3/base
module-load sems-archive-cmake: 3.17.1
use ATDM-ENV:
module-load atdm-ninja_fortran: 1.7.2
setenv OMP_NUM_THREADS: 2
Expand All @@ -264,25 +264,25 @@ setenv OMP_NUM_THREADS: 2
[Trilinos_pullrequest_gcc_8.3.0]
use SEMS-ENV:
use ATDM-ENV:
module-load sems-gcc: 8.3.0
module-load sems-ninja_fortran: 1.10.0
module-load sems-archive-gcc: 8.3.0
module-load sems-archive-ninja_fortran: 1.10.0
use SEMS-DEFAULT:
use ATDM-DEFAULT:
module-remove sems-boost:
module-load sems-boost: 1.66.0/base
module-remove sems-archive-boost:
module-load sems-archive-boost: 1.66.0/base



[Trilinos_pullrequest_intel_17.0.1]
use SEMS-ENV:
use ATDM-ENV:
module-load sems-gcc: 5.3.0
module-load sems-intel: 17.0.1
module-load sems-mpich: 3.2
module-load sems-archive-gcc: 5.3.0
module-load sems-archive-intel: 17.0.1
module-load sems-archive-mpich: 3.2
use SEMS-DEFAULT:
module-remove sems-openmpi:
module-remove sems-superlu:
module-load sems-superlu_dist: 5.2.2/32bit_parallel
module-remove sems-archive-openmpi:
module-remove sems-archive-superlu:
module-load sems-archive-superlu_dist: 5.2.2/32bit_parallel
use ATDM-DEFAULT:
setenv LDFLAGS: -lifcore

Expand All @@ -291,11 +291,11 @@ setenv LDFLAGS: -lifcore
[Trilinos_pullrequest_intel_19.0.5]
use SEMS-ENV:
use ATDM-ENV:
module-load sems-gcc: 6.1.0
module-load sems-intel: 19.0.5
module-load sems-mpich: 3.2
module-load sems-archive-gcc: 6.1.0
module-load sems-archive-intel: 19.0.5
module-load sems-archive-mpich: 3.2
use SEMS-DEFAULT:
module-remove sems-openmpi:
module-remove sems-archive-openmpi:
use ATDM-DEFAULT:
setenv LDFLAGS: -lifcore

Expand All @@ -304,8 +304,8 @@ setenv LDFLAGS: -lifcore
[Trilinos_pullrequest_clang_7.0.1]
use SEMS-ENV:
use ATDM-ENV:
module-load sems-gcc: 5.3.0
module-load sems-clang: 7.0.1
module-load sems-archive-gcc: 5.3.0
module-load sems-archive-clang: 7.0.1
use SEMS-DEFAULT:
use ATDM-DEFAULT:

Expand All @@ -314,29 +314,29 @@ use ATDM-DEFAULT:
[Trilinos_pullrequest_clang_9.0.0]
use SEMS-ENV:
use ATDM-ENV:
module-load sems-gcc: 5.3.0
module-load sems-clang: 9.0.0
module-load sems-archive-gcc: 5.3.0
module-load sems-archive-clang: 9.0.0
use SEMS-DEFAULT:
use ATDM-DEFAULT:



[Trilinos_pullrequest_clang_10.0.0]
use SEMS-ENV:
module-load sems-git: 2.10.1
module-load sems-gcc: 5.3.0
module-load sems-clang: 10.0.0
module-load sems-openmpi: 1.10.1
module-load sems-archive-git: 2.10.1
module-load sems-archive-gcc: 5.3.0
module-load sems-archive-clang: 10.0.0
module-load sems-archive-openmpi: 1.10.1
use SIERRA-PYTHON-3.6.3:
module-load sems-boost: 1.69.0/base
module-load sems-zlib: 1.2.8/base
module-load sems-hdf5: 1.10.6/parallel
module-load sems-netcdf: 4.7.3/parallel
module-load sems-parmetis: 4.0.3/parallel
module-load sems-scotch: 6.0.3/nopthread_64bit_parallel
module-load sems-superlu: 4.3/base
module-load sems-cmake: 3.17.1
module-load sems-ninja_fortran: 1.10.0
module-load sems-archive-boost: 1.69.0/base
module-load sems-archive-zlib: 1.2.8/base
module-load sems-archive-hdf5: 1.10.6/parallel
module-load sems-archive-netcdf: 4.7.3/parallel
module-load sems-archive-parmetis: 4.0.3/parallel
module-load sems-archive-scotch: 6.0.3/nopthread_64bit_parallel
module-load sems-archive-superlu: 4.3/base
module-load sems-archive-cmake: 3.17.1
module-load sems-archive-ninja_fortran: 1.10.0
setenv OMP_NUM_THREADS: 2


Expand Down Expand Up @@ -453,8 +453,8 @@ use Trilinos_pullrequest_gcc_8.3.0:
[Trilinos_pullrequest_python_3]
use SEMS-ENV:
use ATDM-ENV:
module-load sems-gcc: 7.2.0
module-load sems-archive-gcc: 7.2.0
use ATDM-DEFAULT:
module-load sems-git: 2.10.1
module-load sems-cmake: 3.17.1
module-load sems-archive-git: 2.10.1
module-load sems-archive-cmake: 3.17.1
use SIERRA-PYTHON-3.6.3:
40 changes: 20 additions & 20 deletions cmake/std/sems/PullRequestClang10.0.0TestingEnv.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,26 @@

module purge

source /projects/sems/modulefiles/utils/sems-modules-init.sh

module load sems-gcc/5.3.0
module load sems-clang/10.0.0
module load sems-openmpi/1.10.1
module load sems-boost/1.69.0/base
module load sems-zlib/1.2.8/base
module load sems-hdf5/1.10.6/parallel
module load sems-netcdf/4.7.3/parallel
module load sems-parmetis/4.0.3/parallel
module load sems-scotch/6.0.3/nopthread_64bit_parallel
module load sems-superlu/4.3/base

module load sems-cmake/3.17.1
module load sems-ninja_fortran/1.10.0

module load sems-git/2.10.1

module unload sems-python
module load sems-python/3.5.2
source /projects/sems/modulefiles/utils/sems-archive-modules-init.sh

module load sems-archive-gcc/5.3.0
module load sems-archive-clang/10.0.0
module load sems-archive-openmpi/1.10.1
module load sems-archive-boost/1.69.0/base
module load sems-archive-zlib/1.2.8/base
module load sems-archive-hdf5/1.10.6/parallel
module load sems-archive-netcdf/4.7.3/parallel
module load sems-archive-parmetis/4.0.3/parallel
module load sems-archive-scotch/6.0.3/nopthread_64bit_parallel
module load sems-archive-superlu/4.3/base

module load sems-archive-cmake/3.17.1
module load sems-archive-ninja_fortran/1.10.0

module load sems-archive-git/2.10.1

module unload sems-archive-python
module load sems-archive-python/3.5.2

# add the OpenMP environment variable we need
export OMP_NUM_THREADS=2
32 changes: 16 additions & 16 deletions cmake/std/sems/PullRequestClang7.0.1TestingEnv.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@

module purge

source /projects/sems/modulefiles/utils/sems-modules-init.sh

module load sems-git/2.10.1
module load sems-gcc/5.3.0
module load sems-clang/7.0.1
module load sems-openmpi/1.10.1
module load sems-boost/1.63.0/base
module load sems-zlib/1.2.8/base
module load sems-hdf5/1.10.6/parallel
module load sems-netcdf/4.7.3/parallel
module load sems-parmetis/4.0.3/parallel
module load sems-scotch/6.0.3/nopthread_64bit_parallel
module load sems-superlu/4.3/base
source /projects/sems/modulefiles/utils/sems-archive-modules-init.sh

module load sems-archive-git/2.10.1
module load sems-archive-gcc/5.3.0
module load sems-archive-clang/7.0.1
module load sems-archive-openmpi/1.10.1
module load sems-archive-boost/1.63.0/base
module load sems-archive-zlib/1.2.8/base
module load sems-archive-hdf5/1.10.6/parallel
module load sems-archive-netcdf/4.7.3/parallel
module load sems-archive-parmetis/4.0.3/parallel
module load sems-archive-scotch/6.0.3/nopthread_64bit_parallel
module load sems-archive-superlu/4.3/base

# Load the SEMS CMake Module
# - One of the SEMS modules will load CMake 3.4.x also,
# so this will pull in the SEMS cmake 3.10.3 version
# for Trilinos compatibility.
module load sems-cmake/3.17.1
module load sems-archive-cmake/3.17.1

# Using CMake and Ninja modules from the ATDM project space.
# SEMS does not yet supply a recent enough version of CMake
Expand All @@ -41,8 +41,8 @@ module load atdm-env
#module load atdm-cmake/3.10.1
module load atdm-ninja_fortran/1.7.2

module unload sems-python
module load sems-python/3.5.2
module unload sems-archive-python
module load sems-archive-python/3.5.2

# add the OpenMP environment variable we need
export OMP_NUM_THREADS=2
Loading

0 comments on commit dadf5f4

Please sign in to comment.