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

Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20201210_000602 branch to master #8448

Merged
merged 14 commits into from
Dec 10, 2020
Merged

Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20201210_000602 branch to master #8448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
182acc1
Tpetra: fix apparent copy-paste bug in MultiVector unit tests
tasmith4 Nov 17, 2020
0ea0cc3
Tpetra: fix some const/sync/modify inconsistencies in MultiVector::dot
tasmith4 Dec 4, 2020
0543f3c
Tpetra: remove const from vector replace/sumInto functions, update so…
tasmith4 Dec 4, 2020
d4a2529
Tpetra: add modify/sync calls in MultiVector::replace/sumIntoLocalValue
tasmith4 Dec 4, 2020
021e77a
Tpetra: add missing sync in MultiVector tests
tasmith4 Dec 5, 2020
0554299
MueLu: regionMG remove rowMap and colMap from level container
pohm01 Dec 8, 2020
b829f98
MueLu: consolidate GetLumpedMatrixDiagonal
jhux2 Dec 8, 2020
f366185
MueLu: remove disabled code
jhux2 Dec 8, 2020
ff8a29c
Ifpack2: fix initialization error
jhux2 Dec 7, 2020
9883392
Merge pull request #8437 from pohm01/MueLu_regionMG_cleanup_level_sto…
pohm01 Dec 8, 2020
9c7e554
Merge Pull Request #8439 from trilinos/Trilinos/muelu-consolidate-lum…
trilinos-autotester Dec 8, 2020
887d5d5
Framework: Issue 8429 - TestingEnv Fixes
Dec 8, 2020
e29f0be
Merge Pull Request #8442 from william76/Trilinos/issue_8429
trilinos-autotester Dec 9, 2020
543f0f8
Merge Pull Request #8427 from trilinos/Trilinos/tasmit/multivector-norm
trilinos-autotester Dec 9, 2020
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
10 changes: 8 additions & 2 deletions cmake/std/sems/PullRequestClang10.0.0TestingEnv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,28 @@
# $ module purge
# or Trilinos/cmake/unload_sems_dev_env.sh

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/10.0.0
module load sems-openmpi/1.10.1
module load sems-python/2.7.9
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

# add the OpenMP environment variable we need
export OMP_NUM_THREADS=2
7 changes: 5 additions & 2 deletions cmake/std/sems/PullRequestClang7.0.1TestingEnv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
# $ module purge
# or Trilinos/cmake/unload_sems_dev_env.sh

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-python/2.7.9
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-cmake/3.12.2

# Load the SEMS CMake Module
# - One of the SEMS modules will load CMake 3.4.x also,
Expand All @@ -41,5 +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

# add the OpenMP environment variable we need
export OMP_NUM_THREADS=2
10 changes: 7 additions & 3 deletions cmake/std/sems/PullRequestClang9.0.0TestingEnv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@
# $ module purge
# or Trilinos/cmake/unload_sems_dev_env.sh

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/9.0.0
module load sems-openmpi/1.10.1
module load sems-python/2.7.9
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-cmake/3.12.2

# 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.12.2
module load sems-cmake/3.10.3

# Using CMake and Ninja modules from the ATDM project space.
# SEMS does not yet supply a recent enough version of CMake
Expand All @@ -41,5 +41,9 @@ 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


# add the OpenMP environment variable we need
export OMP_NUM_THREADS=2
9 changes: 7 additions & 2 deletions cmake/std/sems/PullRequestGCC4.8.4TestingEnv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
# $ module purge
# or Trilinos/cmake/unload_sems_dev_env.sh

module purge

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

module load sems-gcc/4.8.4
module load sems-openmpi/1.10.1
module load sems-python/2.7.9
module load sems-git/2.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
Expand All @@ -29,5 +29,10 @@ module load sems-superlu/4.3/base
module load sems-cmake/3.10.3
module load sems-ninja_fortran/1.8.2

module load sems-git/2.10.1

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

# add the OpenMP environment variable we need
export OMP_NUM_THREADS=2
10 changes: 8 additions & 2 deletions cmake/std/sems/PullRequestGCC4.9.3TestingEnv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,28 @@

# usage: $ source PullRequestGCC4.9.3TestingEnv.sh

module purge

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

module load sems-gcc/4.9.3
module load sems-openmpi/1.10.1
module load sems-python/2.7.9
module load sems-git/2.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-cmake/3.12.2
module load sems-ninja_fortran/1.8.2

module load sems-git/2.10.1

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

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

Expand Down
11 changes: 9 additions & 2 deletions cmake/std/sems/PullRequestGCC4.9.3TestingEnvSERIAL.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,27 @@

# usage: $ source PullRequestGCC4.9.3TestingEnv.sh

module purge

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

module load sems-gcc/4.9.3
module load sems-python/2.7.9
module load sems-git/2.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/base
module load sems-netcdf/4.7.3/base
module load sems-metis/5.1.0/base
# module load sems-scotch/6.0.3/nopthread_64bit_parallel
module load sems-superlu/4.3/base

module load sems-cmake/3.12.2
module load sems-ninja_fortran/1.8.2

module load sems-git/2.10.1

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


# add the OpenMP environment variable we need
export OMP_NUM_THREADS=2
11 changes: 9 additions & 2 deletions cmake/std/sems/PullRequestGCC7.2.0SerialTestingEnv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,26 @@

# usage: $ source PullRequestGCC7.2.0TestingEnv.sh

module purge

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

module load sems-gcc/7.2.0
module load sems-python/2.7.9
module load sems-git/2.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/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.12.2
module load sems-ninja_fortran/1.8.2

# Boost loads sems-python/2.7.x as a side effect.
module unload sems-python
module load sems-python/3.5.2

module load sems-git/2.10.1

# add the OpenMP environment variable we need
export OMP_NUM_THREADS=2
14 changes: 11 additions & 3 deletions cmake/std/sems/PullRequestGCC7.2.0TestingEnv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,30 @@

# usage: $ source PullRequestGCC7.2.0TestingEnv.sh

module purge

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

module load sems-gcc/7.2.0
module load sems-openmpi/1.10.1
module load sems-python/2.7.9
module load sems-git/2.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-cmake/3.12.2

module load sems-cmake/3.10.3
module load sems-ninja_fortran/1.8.2

module load sems-git/2.10.1

# Note: sems-boost also loads sems-python/2.7.x, we need to
# unload it here.
module unload sems-python
module load sems-python/3.5.2

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

13 changes: 11 additions & 2 deletions cmake/std/sems/PullRequestGCC8.3.0TestingEnv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,30 @@

# usage: $ source PullRequestGCC8.3.0TestingEnv.sh

module purge

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

module load sems-gcc/8.3.0
module load sems-openmpi/1.10.1
module load sems-python/2.7.9
module load sems-git/2.10.1
module load sems-boost/1.66.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


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


10 changes: 8 additions & 2 deletions cmake/std/sems/PullRequestIntel17.0.1TestingEnv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,31 @@
# After the environment is no longer needed, it can be purged using
# $ module purge
# or Trilinos/cmake/unload_sems_dev_env.sh

module purge

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

export SEMS_FORCE_LOCAL_COMPILER_VERSION=4.9.3
module load sems-gcc/5.3.0
module load sems-intel/17.0.1
module load sems-mpich/3.2
module load sems-python/2.7.9
module load sems-git/2.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-cmake/3.12.2
module load sems-ninja_fortran/1.8.2

module load sems-git/2.10.1

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

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

10 changes: 8 additions & 2 deletions cmake/std/sems/PullRequestIntel19.0.5TestingEnv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,29 @@
# $ module purge
# or Trilinos/cmake/unload_sems_dev_env.sh

module purge

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

export SEMS_FORCE_LOCAL_COMPILER_VERSION=4.9.3
module load sems-gcc/6.1.0
module load sems-intel/19.0.5
module load sems-mpich/3.2
module load sems-python/2.7.9
module load sems-git/2.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-cmake/3.12.2
module load sems-ninja_fortran/1.8.2

module load sems-git/2.10.1

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

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