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_20190115_020612 branch to master #4192

Merged
merged 9 commits into from
Jan 16, 2019
Merged

Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20190115_020612 branch to master #4192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f910505
Issue #4154 Upgrading Windows nightly build to CMake 3.12.0
jwillenbring Jan 10, 2019
108c7f8
Made nan's quiet to hide FPEs
Jan 12, 2019
1e959b9
Merge Pull Request #4167 from jwillenbring/Trilinos/win1-cmake-3.12.0…
trilinos-autotester Jan 14, 2019
c5faedc
Testing: update rocketman crontab
jhux2 Jan 14, 2019
25fce22
Tpetra: Fix #4186 (BlockCrsMatrix packAndPrepareNew build error)
Jan 14, 2019
e4fff75
Tpetra::BlockCrsMatrix: Remove unused typedef
Jan 14, 2019
fa493f2
Merge Pull Request #4180 from trilinos/Trilinos/quiet-nan
trilinos-autotester Jan 15, 2019
40dc926
Merge Pull Request #4185 from trilinos/Trilinos/jhu-c5faedc
trilinos-autotester Jan 15, 2019
49bc5dc
Merge Pull Request #4187 from trilinos/Trilinos/Fix-4186
trilinos-autotester Jan 15, 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
9 changes: 8 additions & 1 deletion cmake/ctest/drivers/rocketman/crontab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ SHELL=/bin/bash

# nightly tests

0 22 * * * cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; eval `python ./setSshEnv.py`; cd /home/nightlyTesting/trilinos; git pull > /dev/null 2>&1; cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; ./cron_driver.sh &> /home/nightlyTesting/cron_driver.log; cd /home/nightlyTesting; /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman/sendTestSummary.sh cron_driver.log
0 22 * * * cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; eval `python ./setSshEnv.py`; cd /home/nightlyTesting/trilinos; git pull > /dev/null 2>&1; cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; ./cron_driver.sh &> /home/nightlyTesting/cron_driver.log; cd /home/nightlyTesting; /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman/sendTestSummary.sh cron_driver.log

0 11 * * * cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; eval `python ./setSshEnv.py`; cd /home/nightlyTesting/trilinos; git pull > /dev/null 2>&1; cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; ./cron_driver.sh &> /home/nightlyTesting/cron_driver.log; cd /home/nightlyTesting; /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman/sendTestSummary.sh cron_driver.log

#05 13 29 10 * cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; eval `python ./setSshEnv.py`; cd /home/nightlyTesting/trilinos; git pull > /dev/null 2>&1; cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; ./cron_driver.sh &> /home/nightlyTesting/cron_driver.log; cd /home/nightlyTesting; /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman/sendTestSummary.sh cron_driver.log


#25 11 22 6 5 cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; eval `python ./setSshEnv.py`; cd /home/nightlyTesting/trilinos; git pull > /dev/null 2>&1; cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; ./cron_driver.sh &> /home/nightlyTesting/cron_driver.log; cd /home/nightlyTesting; /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman/sendTestSummary.sh cron_driver.log

#
@reboot /home/jhu/bin/send-reboot-email.sh
Expand Down
2 changes: 1 addition & 1 deletion cmake/ctest/drivers/windows/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ be worthwhile to browse the scripts for these locations. Alternatively, you coul
and install the software wherever you want - just be sure to copy and update the build scripts
with the correct locations.

**[CMake][1]** - required to setup the build configuration. (Tested using version 3.8.1)
**[CMake][1]** - required to setup the build configuration. (Tested using version 3.8.1, later upgraded to 3.12.0)

**[Ninja][2]** - required to parallelize the build on Windows. (Tested using version 1.7.2)

Expand Down
2 changes: 1 addition & 1 deletion cmake/ctest/drivers/windows/create_windows_package.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ setlocal
rem Set the location of Git, Ninja, etc.
set SEMS_DIR=C:\projects\sems\install\win-x86_64
set NINJA_DIR=%SEMS_DIR%\utility\ninja\1.7.2
set CMAKE_DIR=%SEMS_DIR%\utility\cmake\3.8.1\bin
set CMAKE_DIR=%SEMS_DIR%\utility\cmake\3.12.0\bin
set GIT_EXE=%SEMS_DIR%\utility\git\2.13.0\cmd\git.exe
set PATH=%NINJA_DIR%;%PATH%

Expand Down
2 changes: 1 addition & 1 deletion cmake/ctest/drivers/windows/task_driver_windows.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ setlocal
rem Set the location of Git, Ninja, etc.
set SEMS_DIR=C:\projects\sems\install\win-x86_64
set NINJA_DIR=%SEMS_DIR%\utility\ninja\1.7.2
set CTEST_EXE=%SEMS_DIR%\utility\cmake\3.8.1\bin\ctest.exe
set CTEST_EXE=%SEMS_DIR%\utility\cmake\3.12.0\bin\ctest.exe
set GIT_EXE=%SEMS_DIR%\utility\git\2.13.0\cmd\git.exe
set PATH=%NINJA_DIR%;%PATH%
set TRILINOS_REPOSITORY_LOCATION=https://gitlab-ex.sandia.gov/trilinos-project/Trilinos.git
Expand Down
4 changes: 2 additions & 2 deletions packages/teuchos/core/src/Teuchos_ScalarTraits.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ bool Teuchos::operator&&(const qd_real &a, const qd_real &b) {
#ifndef __sun
// This is an intentional computation of NaN.
namespace Teuchos {
const float flt_nan = std::numeric_limits<float>::signaling_NaN();
const double dbl_nan = std::numeric_limits<double>::signaling_NaN();
const float flt_nan = std::numeric_limits<float>::quiet_NaN();
const double dbl_nan = std::numeric_limits<double>::quiet_NaN();
}
#endif
Loading