Kokkos + KokkosKernels Promotion To Version 2.5.00 #2078
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cmake/ProjectCompilerPostConfig.cmake now invokes the kokkos build system to get additional compiler information that is useful for advanced architectures. This enables the useful information that Kokkos calculates can be more widely available.
Origin repo remote tracking branch: 'github/master' Origin repo remote repo URL: 'github = [email protected]:TriBITSPub/TriBITS.git' At commit: commit 6fa3d698d55fbb26ffc687aef2779c90b977b5f6 Author: Scott Kruger <[email protected]> Date: Fri Jul 14 13:00:29 2017 -0600 Summary: Enable post-processing of config of compilers (#207, #1400)
#1400) This required a small change to TriBITS to allow the OpenMP flags to be simply skipped. I also adde an if statement to avoid adding any of the Kokkos flags or changing any of this logic when KOKKOS_ARCH is equal to "None". This is likely important to maintain backward compatiblity.
Origin repo remote tracking branch: 'github/master' Origin repo remote repo URL: 'github = [email protected]:TriBITSPub/TriBITS.git' At commit: commit b9d3531a128d7b8118c7eb4e5b5b890049fbe00a Author: Roscoe A. Bartlett <[email protected]> Date: Fri Dec 1 16:30:15 2017 -0700 Summary: Allow overridding OpenMP flags to empty (#1400)
This should be the last changes needed for TriBITS to enable the Kokkos configuration of Trilinos.
The simplified table format should be easier to maintain. I also added some more detail to describe the behavior of the system and when it gets turned on and when it does not.
I saw this while working on #1400. Some of the documentation was wrong or just badly formatted.
This will catch the current problem of using a var that is no longer defined which is part of #1400.
modified: CMakeLists.txt
In source code files also
A very old version of a macro name was still used in a few places.
From repository at [email protected]:kokkos/kokkos At commit: commit 62e760fa7d3b9e65ac170c8ca1ef5c1b39c8e818 Merge: dfe685f ec7ad6d Author: crtrott <[email protected]> Date: Fri Dec 15 10:59:13 2017 -0700 Merge branch 'develop' for 2.5.00 Part of Kokkos C++ Performance Portability Programming EcoSystem 2.5
…cc273d04af From repository at [email protected]:kokkos/kokkos-kernels At commit: commit 00b16484786e45bb4cf5ce3ab659b2cc273d04af Merge: e4c645e 04d5876 Author: crtrott <[email protected]> Date: Fri Dec 15 10:38:16 2017 -0700 Merge remote-tracking branch 'origin/develop' release 2.5.00
TestingResults White CUDAErrors and test failures are a strict subset of the ones encountered on the develop branch with the same configuration. Build Errors:None General Test Results:Failed Tests |
TestingResults White OpenMPErrors and test failures are a strict subset of the ones encountered on the develop branch with the same configuration. A good comparison is not possible due to massive errors on the develop branch which we fixed on the promotion branch (508 tests not run or failed on develop vs 72 test failures on promotion). Build Errors:None General Test Results:Failed Tests |
|
Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request. |
|
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_autotester_test
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3
Jenkins Parameters
Using Repos:
Pull Request Author: crtrott |
TestingResults Shepard PthreadErrors and test failures are a strict subset of the ones encountered on the develop branch with the same configuration. Build Errors:Massive amount of 'undefined reference' errors on both develop and kokkos-promotion. General Test Results:Failed Tests |
TestingResults Shepard SerialErrors and test failures are a strict subset of the ones encountered on the develop branch with the same configuration. Build Errors:None General Test Results:Failed TestsIntermittent Test FailuresTestingResults Shepard SerialErrors and test failures are a strict subset of the ones encountered on the develop branch with the same configuration. Build Errors:None General Test Results:Failed TestsIntermittent Test FailuresThe following test fails on develop and kokkos-promotion occasionally: |
|
Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED Pull Request Auto Testing has PASSED (click to expand)Build InformationTest Name: Trilinos_autotester_test
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3
Jenkins Parameters
|
|
Status Flag 'Pre-Merge Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging |
|
All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur... |
csiefer2
approved these changes
Dec 15, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@trilinos/kokkos
@trilinos/kokkos-kernels
Description
This merges Kokkos and KokkosKernels versions 2.5.00 into Trilinos. As a consequence a significant change to the build-system is made, where Kokkos will run its make system to generate cxx-flags as well as the config file.
Kokkos Changelog
2.5.00 (2017-12-15)
Full Changelog
Part of the Kokkos C++ Performance Portability Programming EcoSystem 2.5
Implemented enhancements:
Fixed bugs:
##KokkosKernels ChangeLog
2.5.00 (2017-12-15)
Full Changelog
Implemented enhancements:
Fixed bugs:
Related Issues
How Has This Been Tested?
This set of changes has been tested on Shepard and White with Intel 17, GCC 5.3, NVCC 8.
Configurations according to kokkos-kernels/scripts/trilinos-integration test scripts.
A detailed list of test failures is provided below. No additional test failures compared to the current
trilinos/develop branch were observed. Both individual packages are passing their comprehensive
nightly test suites. This includes testing of more than 200 configuration spanning 25+ compiler versions and 9 hardware platforms ( Intel Skylake, Intel SandyBridge, Intel Haswell, Intel Haswell + NVIDIA K40, Intel KNL, ARM, Power8, Power8 + K80, Power8 + P100).
Checklist