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.

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_20190124_010614 branch to master #4255

Merged
merged 116 commits into from
Jan 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
9a4773e
Zoltan2: Initial directory setup
MicheldeMessieres Apr 28, 2017
a11eaf7
Zoltan2: Directory Updates
MicheldeMessieres Jul 19, 2017
958db68
Zoltan2: Fixes variable size handling
MicheldeMessieres Jul 22, 2017
ba7c0d4
Zoltan2: Add aggregate mode
MicheldeMessieres Jul 26, 2017
d4dbbc0
Zoltan2: Updates for directory mechanics
MicheldeMessieres Aug 2, 2017
da6655d
Zoltan2: Directory update for performance testing
MicheldeMessieres Aug 24, 2017
3fd10a6
Zoltan2: Changes indices_to and indices_from back to ptrs
MicheldeMessieres Sep 5, 2017
43d55e5
Zoltan2: Fix directory lid option
MicheldeMessieres Sep 5, 2017
819cc42
Zoltan2: Refactor directory to use ArrayRCP
MicheldeMessieres Sep 7, 2017
eafd21e
Zoltan2: Turn off debug level
MicheldeMessieres Sep 8, 2017
165b59c
Zoltan2: Updates for directory
MicheldeMessieres Sep 28, 2017
07552ab
Zoltan2: Directory updates for unique ids
MicheldeMessieres Oct 18, 2017
8a4355d
Zoltan2: Directory update API to use ptr and length
MicheldeMessieres Jan 17, 2018
1ea95db
Zoltan2: Implement directory for globalWeightedCutsMessagesByPart
MicheldeMessieres Dec 20, 2017
50d403f
Zoltan2: TaskMapping use Directory
MicheldeMessieres Feb 27, 2018
547d632
Zoltan2: Update metric test
MicheldeMessieres May 7, 2018
6badb1c
Merge branch 'develop' into zoltan2Directory
MicheldeMessieres Jun 19, 2018
1b150a9
Zoltan2: Strip development code from directory
MicheldeMessieres Jun 19, 2018
fc49a92
Zoltan2: Remove imbalance check on metric test.
MicheldeMessieres Jun 19, 2018
7ec40d2
Xpetra: fix another compile problem
jhux2 Oct 25, 2018
8d531c0
Ctest: More rocketman
csiefer2 Oct 25, 2018
66e1913
ATDM: Add mention of needing to use bash -l for non-bash users
bartlettroscoe Oct 25, 2018
a6e7533
PyTrilinos: Update import of Teuchos.RCP
wfspotz Nov 28, 2018
c5aa8fd
zoltan: Removed a gcc7.2 warning
kddevin Dec 12, 2018
7412b8c
Merge remote-tracking branch 'github/develop' into develop
wfspotz Jan 7, 2019
3dfb41c
Merge remote-tracking branch 'github/develop' into develop
wfspotz Jan 7, 2019
a3e773f
Automatic snapshot commit from tribits at adbf3c1
bartlettroscoe Jan 12, 2019
a8fd7a9
Merge remote-tracking branch 'github/develop' into develop
wfspotz Jan 14, 2019
8795be6
Tpetra: Add BlockVector view constructor from Vector
wfspotz Jan 8, 2019
91016cb
Tpetra: Add test of BlockVector constructor
wfspotz Jan 14, 2019
0ffc52b
Taking into account the flag EpetraExt_USING_HDF5.
Jan 16, 2019
fbf93ac
Using Xpetra_UseDefaultTypes
Jan 16, 2019
885bead
Using only KokkosSerialWrapperNode.
Jan 16, 2019
bc6ac48
Using default node type again.
Jan 17, 2019
a9b2842
Teuchos: Remove Unused Parameter Warnings
jmgate Aug 17, 2018
21662e7
MiniEM: Solver config changes for Epetra and ML
cgcgcg Dec 4, 2018
14c07b3
MiniEM: Fix Cuda issue
cgcgcg Dec 15, 2018
7d410d5
MiniEM: Switch default current to RANDOM instead of Gaussian Pulse
cgcgcg Jan 17, 2019
f6c180e
Thyra Belos adapter: Add timers
cgcgcg Jan 16, 2019
0c13528
kokkos-kernels: Use new Fortran mangling system for BLAS wrappers
Jan 17, 2019
76d10cc
kokkos-kernels: Attempt to fix Makefile build for Fortran mangling
Jan 17, 2019
d6eed11
MueLu RefMaxwell: Silence warnings about unused variables
cgcgcg Dec 16, 2018
f443846
MueLu RefMaxwell: Use MueLu's residual function
cgcgcg Dec 16, 2018
e176884
MueLu: Modifications for runs with stacked timer enabled
cgcgcg Dec 12, 2018
5c409c3
Tpetra: Fix test of BlockVector ctor
wfspotz Jan 17, 2019
c922fc1
Merge Pull Request #3316 from jmgate/Trilinos/teuchos-remove-unused-p…
trilinos-autotester Jan 18, 2019
882d842
Merge pull request #4188 from wfspotz/tpetra_block
wfspotz Jan 18, 2019
3a32119
Add infrastructure for testing cuda build
ZUUL42 Dec 13, 2018
7993516
Removing sems module init for cuda & fix workspace ref
ZUUL42 Jan 10, 2019
c476288
Fix MPI and sems init calls for cuda
ZUUL42 Jan 10, 2019
04bfef8
MPI_NAME -> MPI_VENDOR
ZUUL42 Jan 10, 2019
6daed62
Setting KOKKOS_ARCH
jwillenbring Jan 11, 2019
aa161c9
Fixing CUDA configuration
jwillenbring Jan 11, 2019
a5b2204
Added BLAS and LAPACK options.
jwillenbring Jan 11, 2019
cb2edca
Explicitly disabling Scotch and ParMetis.
jwillenbring Jan 11, 2019
df416a1
Adding Netcdf library configuration.
jwillenbring Jan 11, 2019
60b4424
Disabled SuperLU and boostlib
jwillenbring Jan 11, 2019
969e5a5
Disabled SEACAS for now.
jwillenbring Jan 15, 2019
915ed4a
Disabled Moertel.
jwillenbring Jan 16, 2019
14c493a
Disabling shared libs and Komplex
jwillenbring Jan 17, 2019
b5aebc2
Disabled debug to match ATDM build
jwillenbring Jan 17, 2019
1fc7808
Set Tpetra_INST_SERIAL=ON to match atdm build.
jwillenbring Jan 17, 2019
c504c36
Turning off Debug symbols.
jwillenbring Jan 17, 2019
559a7e4
Turning off secondary tested code.
jwillenbring Jan 17, 2019
5fefffa
Disable a failing test.
jwillenbring Jan 18, 2019
1fbde49
Disabled remaining failed tests.
jwillenbring Jan 18, 2019
b6b52ae
Merge branch 'develop' into zoltan2Directory
kddevin Jan 18, 2019
6819810
MueLu RepartitionHeuristicFactory: Disable repartitioning on single rank
cgcgcg Jan 16, 2019
2990493
MueLu Hierarchy: Remove unneeded initialization
cgcgcg Dec 16, 2018
e0dd853
Ifpack2 MTGS: Use cached MV
cgcgcg Dec 16, 2018
2d6fa5c
zoltan2: update Metric.cpp after develop merge
kddevin Jan 18, 2019
7d23328
zoltan2: fix Zoltan2_TaskMapping.hpp merge errors
kddevin Jan 18, 2019
d57029b
Automatic snapshot commit from tribits at de606e5
bartlettroscoe Jan 19, 2019
75662e6
Merge Pull Request #4218 from trilinos/Trilinos/tribits_github_snapshot
trilinos-autotester Jan 20, 2019
fddeb3c
Zoltan2: Fix strict-aliasing rules warning
MicheldeMessieres Jan 21, 2019
24aa0cb
Zoltan2: Fix shadow warnings for gid_t
MicheldeMessieres Jan 21, 2019
0464d2e
Zoltan2: Remove some unused kokkos code that was in progress
MicheldeMessieres Jan 21, 2019
a88c7c0
Zoltan2: Cosmetic formatting clean up
MicheldeMessieres Jan 21, 2019
446c10d
Zoltan2: Remove errant #endif
MicheldeMessieres Jan 21, 2019
3f3b1cc
MiniTensor: Attempt to fix #4220
Jan 21, 2019
4c4ecbf
Merge Pull Request #4213 from cgcgcg/Trilinos/miniem
trilinos-autotester Jan 21, 2019
8339bf5
Belos: Remove Unused Parameter Warnings
jmgate Aug 16, 2018
3e26a55
Tpetra - fix warning error from mismatched virtual functions
Jan 21, 2019
3b1b7a5
Changing test default to use RHS as initial vector for Hybrid Gmres
hkthorn Jan 21, 2019
01fb63c
Merge pull request #4224 from trilinos/Fix-4220
mhoemmen Jan 21, 2019
b1ff56b
Merge remote-tracking branch 'upstream/develop' into tpetra-develop
Jan 21, 2019
26ce0f0
Added check for cuda build for if node is ride
ZUUL42 Jan 21, 2019
d8cad58
Added check for cuda build for if node is ride
ZUUL42 Jan 21, 2019
7b60b19
Merge pull request #3315 from jmgate/belos-remove-unused-parameter-wa…
jmgate Jan 21, 2019
75f4490
Tpetra,Teuchos: Fix #4225
Jan 21, 2019
24c2eb2
Merge pull request #4228 from trilinos/Fix-KokkosKernels-BLAS-mangling
mhoemmen Jan 22, 2019
9c08e09
Merge Pull Request #4227 from trilinos/Trilinos/zoltan_fix4032
trilinos-autotester Jan 22, 2019
76f67cd
Merge Pull Request #1533 from Tech-XCorp/Trilinos/zoltan2Directory
trilinos-autotester Jan 22, 2019
0a86dc7
Deleting the test 'TwoLevelPreconditionerBlockInputFiles' and using K…
Jan 22, 2019
c79e41c
Merge pull request #4204 from searhein/fix-#3541
searhein Jan 22, 2019
ee13381
Tpetra: Remove Unused Parameter Warnings
jmgate Jan 21, 2019
d6aedcf
Revert "Merge pull request #4228 from trilinos/Fix-KokkosKernels-BLAS…
Jan 22, 2019
47f9cbe
Tpetra - fix failing test
Jan 22, 2019
cd70753
Merge Pull Request #4241 from trilinos/Trilinos/Revert-PR-4228
trilinos-autotester Jan 22, 2019
543f024
Merge pull request #4233 from trilinos/Fix-4225
mhoemmen Jan 22, 2019
b21407a
Merge pull request #4239 from jmgate/tpetra-remove-unused-parameter-w…
mhoemmen Jan 22, 2019
bc321af
Anasazi: Remove Unused Parameter Warnings
jmgate Jan 22, 2019
608b32f
TriUtils: Remove Unused Parameter Warnings
jmgate Jan 22, 2019
29a053d
Piro: Remove Unused Parameter Warnings
jmgate Jan 22, 2019
4b10240
Stratimikos: Remove Unused Parameter Warnings
jmgate Jan 22, 2019
2cce0c2
Panzer: Remove Unused Parameter Warnings
jmgate Jan 22, 2019
146d7c0
RTOp: Remove Unused Parameter Warnings
jmgate Jan 22, 2019
d1a3286
Merge pull request #4229 from hkthorn/develop
hkthorn Jan 23, 2019
804d35f
Merge Pull Request #4243 from jmgate/Trilinos/remove-unused-parameter…
trilinos-autotester Jan 23, 2019
27f706e
Merge pull request #4226 from kyungjoo-kim/tpetra-develop
kyungjoo-kim Jan 23, 2019
09facb2
Merge pull request #4217 from jwillenbring/ride_build_pr
jwillenbring Jan 23, 2019
d05d0a0
Another check for Tpetra_DefaultNode.
Jan 23, 2019
720d3a2
Removing duplicated Import_Tpetra.
Jan 23, 2019
f5713c2
Zoltan2: Fix Directory for CUDA and Albany builds
MicheldeMessieres Jan 23, 2019
bb251b1
Merge Pull Request #4248 from searhein/Trilinos/fix-#3541
trilinos-autotester Jan 23, 2019
cfce99e
Merge pull request #4252 from Tech-XCorp/fixDirectoryCuda
MicheldeMessieres Jan 24, 2019
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
98 changes: 98 additions & 0 deletions cmake/std/PullRequestLinuxCuda9.2TestingSettings.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# This file contains the options needed to both run the pull request testing
# for Trilinos for the CUDA 9.2 pull request testing builds, and to reproduce
# the errors reported by those builds. Prior to using this this file, the
# appropriate set of modules must be loaded and path must be augmented.
# (See the sems/PullRequestCuda9.2TestingEnv.sh files.)

# Usage: cmake -C PullRequestLinuxCUDA9.2TestingSettings.cmake

# Misc options typically added by CI testing mode in TriBITS

# Use the below option only when submitting to the dashboard
set (CTEST_USE_LAUNCHERS ON CACHE BOOL "Set by default for PR testing")

# Options necessary for CUDA build
set (TPL_ENABLE_MPI ON CACHE BOOL "Set by default for CUDA PR testing")
set (TPL_ENABLE_CUDA ON CACHE BOOL "Set by default for CUDA PR testing")
set (Kokkos_ENABLE_Cuda ON CACHE BOOL "Set by default for CUDA PR testing")
set (Kokkos_ENABLE_Cuda_UVM ON CACHE BOOL "Set by default for CUDA PR testing")
set (KOKKOS_ARCH Power8 CACHE STRING "Set by default for CUDA PR testing")

# TPL settings specific to CUDA build
set (TPL_BLAS_LIBRARIES "-L${BLAS_ROOT}/lib -lblas -lgfortran -lgomp -lm" CACHE STRING "Set by default for CUDA PR testing")
set (TPL_LAPACK_LIBRARIES "-L${LAPACK_ROOT}/lib -llapack -lgfortran -lgomp" CACHE STRING "Set by default for CUDA PR testing")
set (BUILD_SHARED_LIBS OFF CACHE BOOL "Set by default for CUDA PR testing")
set (Tpetra_INST_SERIAL ON CACHE BOOL "Set by default for CUDA PR testing")
set (Trilinos_ENABLE_SECONDARY_TESTED_CODE OFF CACHE BOOL "Set by default for CUDA PR testing")
set (TPL_ENABLE_Scotch OFF CACHE BOOL "Set by default for CUDA PR testing")
# Parmetis is available on ride and could be enabled for the CUDA PR build
set (TPL_ENABLE_ParMETIS OFF CACHE BOOL "Set by default for CUDA PR testing")
set (TPL_Netcdf_LIBRARIES "-L${BOOST_ROOT}/lib;-L${NETCDF_ROOT}/lib;-L${NETCDF_ROOT}/lib;-L${PNETCDF_ROOT}/lib;-L${HDF5_ROOT}/lib;${BOOST_ROOT}/lib/libboost_program_options.a;${BOOST_ROOT}/lib/libboost_system.a;${NETCDF_ROOT}/lib/libnetcdf.a;${PNETCDF_ROOT}/lib/libpnetcdf.a;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl" CACHE STRING "Set by default for CUDA PR testing")
# SuperLU is available on ride and could be enabled for the CUDA PR build
set (TPL_ENABLE_SuperLU OFF CACHE BOOL "Set by default for CUDA PR testing")
set (TPL_ENABLE_BoostLib OFF CACHE BOOL "Set by default for CUDA PR testing")
set (Trilinos_ENABLE_Moertel OFF CACHE BOOL "Disable for CUDA PR testing")
set (Trilinos_ENABLE_Komplex OFF CACHE BOOL "Disable for CUDA PR testing")

# Temporary options to clean up build
set (Trilinos_ENABLE_SEACAS OFF CACHE BOOL "Temporary disable for CUDA PR testing")
set (Trilinos_ENABLE_DEBUG OFF CACHE BOOL "Temporary disable for CUDA PR testing")
set (Trilinos_ENABLE_DEBUG_SYMBOLS OFF CACHE BOOL "Temporary disable for CUDA PR testing")
set (STK_ENABLE_TESTS OFF CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_interfacepartitionofunity_DIM2_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_interfacesets_DIM2_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_localpartitionofunitybasis_EPETRA_MPI_1_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_GDSWP_DIM2_DPN1_ORD0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_GDSWP_DIM2_DPN1_ORD1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_GDSWP_DIM2_DPN2_ORD0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_GDSWP_DIM2_DPN2_ORD1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_RGDSWP_DIM2_DPN1_ORD0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_RGDSWP_DIM2_DPN1_ORD1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_RGDSWP_DIM2_DPN2_ORD0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_RGDSWP_DIM2_DPN2_ORD1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLBP_NB2_GDSW_DIM2_DPN1_ORD0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLBP_NB2_GDSW_DIM2_DPN1_ORD1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLBP_NB2_GDSW_DIM2_DPN2_ORD0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLBP_NB2_GDSW_DIM2_DPN2_ORD1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLBP_NB3_GDSW_DIM2_DPN1_ORD0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLBP_NB3_GDSW_DIM2_DPN1_ORD1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLBP_NB3_GDSW_DIM2_DPN2_ORD0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLBP_NB3_GDSW_DIM2_DPN2_ORD1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLP_GDSW_DIM2_DPN1_ORD0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLP_GDSW_DIM2_DPN1_ORD1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLP_GDSW_DIM2_DPN2_ORD0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLP_GDSW_DIM2_DPN2_ORD1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLP_IPOUHarmonic_DIM2_DPN1_ORD0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLP_IPOUHarmonic_DIM2_DPN1_ORD1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLP_IPOUHarmonic_DIM2_DPN2_ORD0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLP_IPOUHarmonic_DIM2_DPN2_ORD1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLP_RGDSW_DIM2_DPN1_ORD0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLP_RGDSW_DIM2_DPN1_ORD1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLP_RGDSW_DIM2_DPN2_ORD0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_TLP_RGDSW_DIM2_DPN2_ORD1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_stokes_hdf5_TLBP_GDSW_O0_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ShyLU_DDFROSch_test_thyra_xpetra_stokes_hdf5_TLBP_GDSW_O1_EPETRA_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ROL_example_PDE-OPT_0ld_adv-diff-react_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ROL_example_PDE-OPT_0ld_adv-diff-react_example_02_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ROL_example_PDE-OPT_0ld_poisson_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ROL_example_PDE-OPT_0ld_stefan-boltzmann_example_03_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ROL_example_PDE-OPT_navier-stokes_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ROL_example_PDE-OPT_navier-stokes_example_02_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ROL_example_PDE-OPT_nonlinear-elliptic_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ROL_example_PDE-OPT_nonlinear-elliptic_example_02_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ROL_example_PDE-OPT_obstacle_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ROL_example_PDE-OPT_topo-opt_poisson_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (ROL_test_elementwise_TpetraMultiVector_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (TpetraCore_Core_initialize_where_tpetra_initializes_kokkos_MPI_1_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (TpetraCore_Core_initialize_where_tpetra_initializes_mpi_and_user_initializes_kokkos_MPI_2_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (TpetraCore_Core_initialize_where_user_initializes_kokkos_MPI_1_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (TpetraCore_Core_initialize_where_user_initializes_mpi_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (TpetraCore_Core_ScopeGuard_where_tpetra_initializes_kokkos_MPI_1_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (TpetraCore_Core_ScopeGuard_where_tpetra_initializes_mpi_and_user_initializes_kokkos_MPI_2_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (TpetraCore_Core_ScopeGuard_where_user_initializes_kokkos_MPI_1_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (TpetraCore_Core_ScopeGuard_where_user_initializes_mpi_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (TrilinosCouplings_Example_Maxwell_MueLu_MPI_1_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
set (TrilinosCouplings_Example_Maxwell_MueLu_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")

include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake")

23 changes: 23 additions & 0 deletions cmake/std/PullRequestLinuxCudaDriver.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash -l

if [ "${BSUB_CTEST_TIME_LIMIT}" == "" ] ; then
export BSUB_CTEST_TIME_LIMIT=12:00
fi

if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then
export Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE
fi

# comment out sh and add what we need individually.
#source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME

set -x

#TODO: review appropriate job size
bsub -x -Is -q rhel7F -n 16 -J $JOB_NAME -W $BSUB_CTEST_TIME_LIMIT \
$WORKSPACE/Trilinos/cmake/std/PullRequestLinuxDriver.sh

# NOTE: Above, this bsub command should grab a single rhel7F (Firestone,
# Dual-Socket POWER8, 8 cores per socket, K80 GPUs) node. The option '-x'
# makes sure that only this job runs on that node. The options '-n 16' and
# '-q rhel7G' should make bsub allocate a single one of these nodes.
19 changes: 14 additions & 5 deletions cmake/std/PullRequestLinuxDriver-Merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,23 @@ echo -e ""
: ${BUILD_NUMBER:?}
: ${WORKSPACE:?}

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

declare -i ierror=0
#Have to keep loading git
module load sems-git/2.10.1

cuda_regex=".*(_cuda_).*"
ride_regex=".*(ride).*"
if [[ ${JOB_BASE_NAME:?} =~ ${cuda_regex} ]]; then
if [[ ${NODE_NAME:?} =~ ${ride_regex} ]]; then
echo -e "Job is CUDA"
module load git/2.10.1
else
echo -e "ERROR: Unable to find matching environment for CUDA job not on Ride."
exit -1
fi
else
source /projects/sems/modulefiles/utils/sems-modules-init.sh
module load sems-git/2.10.1
fi

#--------------------------------------------
# Get Trilinos scripts and PR merge repo dirs
Expand Down Expand Up @@ -220,5 +231,3 @@ fi
# Return to previous directory
popd &> /dev/null
echo -e "Set CWD = `pwd`"


53 changes: 38 additions & 15 deletions cmake/std/PullRequestLinuxDriver-Test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#
# Functions
#
#

# Test the branch constraints for a Pull Request:
# - Only pull requests from trilinos/Trilnos::develop are allowed
Expand Down Expand Up @@ -146,17 +146,27 @@ echo -e ""
: ${TRILINOS_TARGET_BRANCH:?}
: ${TRILINOS_SOURCE_SHA:?}
: ${PULLREQUESTNUM:?}
: ${NODE_NAME:?}
: ${JOB_BASE_NAME:?}
: ${BUILD_NUMBER:?}
: ${WORKSPACE:?}

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

declare -i ierror=0
#Have to keep loading git
module load sems-git/2.10.1


cuda_regex=".*(_cuda_).*"
ride_regex=".*(ride).*"
if [[ ${JOB_BASE_NAME:?} =~ ${cuda_regex} ]]; then
if [[ ${NODE_NAME:?} =~ ${ride_regex} ]]; then
echo -e "Job is CUDA"
module load git/2.10.1
else
echo -e "ERROR: Unable to find matching environment for CUDA job not on Ride."
exit -1
fi
else
source /projects/sems/modulefiles/utils/sems-modules-init.sh
module load sems-git/2.10.1
fi

#--------------------------------------------
# Apply Guards
Expand Down Expand Up @@ -222,7 +232,7 @@ elif [ "Trilinos_pullrequest_gcc_4.9.3" == "${JOB_BASE_NAME:?}" ] ; then
fi
elif [ "Trilinos_pullrequest_gcc_4.9.3_SERIAL" == "${JOB_BASE_NAME:?}" ] ; then
# TODO: Update this to use a 4.9.3 SERIAL testing environment script.
source ${TRILINOS_DRIVER_SRC_DIR}/cmake/std/sems/PullRequestGCC4.9.3TestingEnvSERIAL.sh
source ${TRILINOS_DRIVER_SRC_DIR}/cmake/std/sems/PullRequestGCC4.9.3TestingEnvSERIAL.sh
ierror=$?
if [[ $ierror != 0 ]]; then
echo -e "There was an issue loading the gcc environment. The error code was: $ierror"
Expand All @@ -242,6 +252,13 @@ elif [ "Trilinos_pullrequest_gcc_7.3.0" == "${JOB_BASE_NAME:?}" ] ; then
echo -e "There was an issue loading the gcc environment. The error code was: $ierror"
exit $ierror
fi
elif [ "Trilinos_pullrequest_cuda_9.2" == "${JOB_BASE_NAME:?}" ] ; then
source ${TRILINOS_DRIVER_SRC_DIR}/cmake/std/sems/PullRequestCuda9.2TestingEnv.sh
ierror=$?
if [[ $ierror != 0 ]]; then
echo -e "There was an issue loading the cuda environment. The error code was: $ierror"
exit $ierror
fi
elif [ "Trilinos_pullrequest_intel_17.0.1" == "${JOB_BASE_NAME:?}" ] ; then
source ${TRILINOS_DRIVER_SRC_DIR}/cmake/std/sems/PullRequestIntel17.0.1TestingEnv.sh
ierror=$?
Expand All @@ -264,11 +281,18 @@ module list
# This crashes for the serial case since MPI variables are not set
# - See Issue #3625
# - wcm: bugfix #3673
regex=".*(_SERIAL)$"
if [[ ! ${JOB_BASE_NAME:?} =~ ${regex} ]]; then
echo -e "MPI type = sems-${SEMS_MPI_NAME:?}/${SEMS_MPI_VERSION:?}"
else
serial_regex=".*(_SERIAL)$"
if [[ ${JOB_BASE_NAME:?} =~ ${serial_regex} ]]; then
echo -e "Job is SERIAL"
elif [[ ${JOB_BASE_NAME:?} =~ ${cuda_regex} ]]; then
if [[ ${NODE_NAME:?} =~ ${ride_regex} ]]; then
echo -e "Job is CUDA"
echo -e "MPI type = sems-${MPI_VENDOR:?}/${MPI_VERSION:?}"
else
echo -e "MPI Vendor and Versions may not be set correctly for CUDA job not on Ride."
fi
else
echo -e "MPI type = sems-${SEMS_MPI_NAME:?}/${SEMS_MPI_VERSION:?}"
fi

CDASH_TRACK="Pull Request"
Expand Down Expand Up @@ -311,7 +335,7 @@ cmake -P packageEnables.cmake

build_name="PR-$PULLREQUESTNUM-test-$JOB_BASE_NAME-$BUILD_NUMBER"

#This should be runnable from anywhere, but all the tests so far have been from the
#This should be runnable from anywhere, but all the tests so far have been from the
#same dir the simple_testing.cmake file was in.
cd TFW_testing_single_configure_prototype &> /dev/null
echo -e "Set CWD = `pwd`"
Expand All @@ -330,6 +354,8 @@ else
CONFIG_SCRIPT=PullRequestLinuxGCC7.2.0TestingSettings.cmake
elif [ "Trilinos_pullrequest_gcc_7.3.0" == "${JOB_BASE_NAME:?}" ]; then
CONFIG_SCRIPT=PullRequestLinuxGCC7.3.0TestingSettings.cmake
elif [ "Trilinos_pullrequest_cuda_9.2" == "${JOB_BASE_NAME:?}" ]; then
CONFIG_SCRIPT=PullRequestLinuxCuda9.2TestingSettings.cmake
fi
fi

Expand All @@ -354,6 +380,3 @@ fi
# Reset to known directory location.
# - ${WORKSPACE} is set by Jenkins and points to the root workspace directory.
cd ${WORKSPACE:?}



20 changes: 20 additions & 0 deletions cmake/std/sems/PullRequestCuda9.2TestingEnv.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This script can be used to load the appropriate environment for the
# PR build on ride using CUDA.

# usage: $ source PullRequestCUDA9.2TestingEnv.sh

#No SEMS NFS mount on ride
#source /projects/sems/modulefiles/utils/sems-modules-init.sh
module load git/2.10.1
module load devpack/20180521/openmpi/2.1.2/gcc/7.2.0/cuda/9.2.88
module swap openblas/0.2.20/gcc/7.2.0 netlib/3.8.0/gcc/7.2.0
#export OMPI_CXX=`which g++`
export OMPI_CXX=$WORKSPACE/Trilinos/packages/kokkos/bin/nvcc_wrapper
export OMPI_CC=`which gcc`
export OMPI_FC=`which gfortran`
export NVCC_WRAPPER_DEFAULT_COMPILER=`which g++`
export CUDA_LAUNCH_BLOCKING=1

# Use manually installed cmake and ninja to try to avoid module loading
# problems (see TRIL-208)
export PATH=/ascldap/users/rabartl/install/white-ride/cmake-3.11.2/bin:/ascldap/users/rabartl/install/white-ride/ninja-1.8.2/bin:$PATH
4 changes: 2 additions & 2 deletions cmake/tribits/core/config_tests/FiniteValue.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ IF (CMAKE_VERBOSE_MAKEFILE)
IF (NOT FINITE_VALUE_HAVE_GLOBAL_ISNAN AND
NOT FINITE_VALUE_HAVE_STD_ISNAN )
message("****************************************************")
message("** Warning: Your compiler doesn't support isnan() or")
message("** NOTE: Your compiler doesn't support isnan() or")
message("** std::isnan()")
message("** We will supply a default checker but it is ")
message("** *NOT* guaranteed to work on your platform")
Expand Down Expand Up @@ -137,7 +137,7 @@ IF (CMAKE_VERBOSE_MAKEFILE)
IF (NOT FINITE_VALUE_HAVE_GLOBAL_ISINF AND
NOT FINITE_VALUE_HAVE_STD_ISINF )
message("****************************************************")
message("** Warning: Your compiler doesn't support isinf() or")
message("** NOTE: Your compiler doesn't support isinf() or")
message("** std::isinf()")
message("** We will supply a default checker but it is ")
message("** *NOT* guaranteed to work on your platform")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ FUNCTION(TRIBITS_APPEND_FORWARD_DEP_PACKAGES PACKAGE_NAME LIST_TYPE)
IF (${PROJECT_NAME}_VERBOSE_CONFIGURE)
MESSAGE(
"\n***"
"\n*** WARNING: The package ${DEP_PKG} has forward dependent package"
"\n*** NOTE: The package ${DEP_PKG} has forward dependent package"
" ${PACKAGE_NAME}, but that dependency is being ignored because the package"
" ${DEP_PKG} is missing!"
"\n***\n" )
Expand Down Expand Up @@ -1086,7 +1086,7 @@ FUNCTION(TRIBITS_PRIVATE_PRINT_DISABLE
IF (${PROJECT_NAME}_DISABLE_ENABLED_FORWARD_DEP_PACKAGES)
MESSAGE(
" ***\n"
" *** WARNING: Setting ${ENABLE_BEING_DISABLED_VAR_NAME}=OFF"
" *** NOTE: Setting ${ENABLE_BEING_DISABLED_VAR_NAME}=OFF"
" which was '${${ENABLE_BEING_DISABLED_VAR_NAME}}' because"
" ${PACKAGE_WITH_SOMETHING_BEING_DISABLED} has"
" a required ${DEP_TYPE_STR} dependence on disabled"
Expand Down Expand Up @@ -1640,7 +1640,7 @@ MACRO(TRIBITS_PRIVATE_POSTPROCESS_OPTIONAL_TPL_ENABLE PACKAGE_NAME OPTIONAL_DEP_
)
MESSAGE(
"\n***"
"\n*** WARNING: Setting ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}=OFF"
"\n*** NOTE: Setting ${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL}=OFF"
" which was ON since TPL_ENABLE_${OPTIONAL_DEP_TPL}=OFF"
"\n***\n"
)
Expand Down
Loading