-
Notifications
You must be signed in to change notification settings - Fork 578
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
Base CMakeLists.txt cleanup, reduced tarball testing, CI enable tweak, TriBITS update (#11545, #11976) #12044
Base CMakeLists.txt cleanup, reduced tarball testing, CI enable tweak, TriBITS update (#11545, #11976) #12044
Conversation
Origin repo remote tracking branch: 'github/master' Origin repo remote repo URL: 'github = [email protected]:TriBITSPub/TriBITS.git' Git describe: vera-release-3.5-start-1802-g6d9eaef0 At commit: commit 24e96fe74bfca6c42b8aedb96468ee4ed22a8062 Author: Roscoe A. Bartlett <[email protected]> Date: Tue Jun 27 08:14:20 2023 -0600 Summary: Print out <Package>_DIR and error out if not set (#63)
Origin repo remote tracking branch: 'github/master' Origin repo remote repo URL: 'github = [email protected]:TriBITSPub/TriBITS.git' Git describe: vera-release-3.5-start-1806-ge88b8af8 At commit: commit 1a9b519a5cd6005d299be5d07c8823a6a87c974e Author: Roscoe A. Bartlett <[email protected]> Date: Tue Jun 27 17:28:15 2023 -0600 Summary: Only submit warning for existing ignored package dir in WARNING mode (#11976)
This reverts commit 40e37d9. There is a better fix in TriBITS 'master' that will be merged in from the snapshot branch. I needed to revert this or it would be a conflict.
This reverts commit 7c630d7. I am going to remove the exclude entry instead and put in excludes for the wrapper TriBITS package CMakeLists.txt and cmake/Dependencies.cmake files instead so that it will not show up as a TriBITS package.
This allows the TrilinosBuildStats test package to be removed but still keep the build_stats files to provide that functionality to tarball customers.
Cleaning up the base CMakeLists.txt file some
Cleaning up the base CMakeLists.txt file.
We removed autotools files from the Trilinos tarball 14 years ago because those we kept those around but they were out of date and we did not want customers using them. But since they have been stripped out of every Trilinos package (except Zoltan), there is no value in including this. Also, the latest TriBITS snapshot removed this macro. The only package that still has old autotools files in Zoltan. These have been stripped out of every other Trilinos package. For Zolan, we now leave the autotools files in the tarball. However, I did not remove the usage TRIBITS_EXCLUDE_AUTOTOOLS_FILES() from Kokkos or KokkosKernels so I could avoid the proces of having to get these changes into the latest Kokkos 4.1 release. I will post PRs to pull out the usage of TRIBITS_EXCLUDE_AUTOTOOLS_FILES() from the 'develop' branches of the native repos so this can be cleaned up later. For now, I will create an empty macro TRIBITS_EXCLUDE_AUTOTOOLS_FILES() to allow these packages to be unchanged.
…TriBITS#299) Support for Makefile.export.* files was removed from TriBITS and snaphsotted into Trilinos a long time ago. This support was removed in the Trilinos 14.0 release. There is no reason to keep this cache variable anymore. It just clutters up the base CMakeLists.txt file.
Cleaning up the base CMakeLists.txt file
Put misc hacks and stuff in there to clean up the base Trilinos/CMakeLists.txt file.
…ribits-update This pulls in the new TriBITS PRs: * TriBITSPub/TriBITS#583 * TriBITSPub/TriBITS#585 * TriBITSPub/TriBITS#586 * TriBITSPub/TriBITS#587 * TriBITSPub/TriBITS#588 * TriBITSPub/TriBITS#590
It appears that no Tpetra tests even use this file so why is it being copied from Anasazi_SOURCE_DIR? Well, when you create a reduced tarball with Tpetra and without Anasazi, the packages/anasazi directory does not even exist and the varaible Anasazi_SOURCE_DIR does not exist.
…12024) This sets up a test that would have caught the problem in #11976 and will provide some protection for reduced tarball creation going forward. NOTE: Currently, this test will only be added if configure settings are passed through `-D${CMAKE_PROJECT_NAME}_CONFIGURE_OPTIONS_FILE=<cache-file>.cmake`. There is no way to pass that file (or thoses files) through `-C <cache-file>.make`.
* Now TrilinosInstallTests will be enabled if any Trilinos package gets enabled. * Removed dependence of TrilinosInstallTests on Tpetra. This should give more consistent installation testing with Trilinos. Prior to this commit, only changes to Tpetra and packages upstream from Tpetra would trigger the enable of the TrilinosInstallTests package and the running of these tests. Now, any change to any Trilinos packge will trigger some installation testing. See new TrilinosInstallTests/READMME.md file for details.
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_PR_gcc-8.3.0
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_gcc-8.3.0-serial
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_gcc-8.3.0-debug
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_clang-11.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_python3
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_cuda-11.4.2-uvm-off
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_intel-2021.3
Jenkins Parameters
Using Repos:
Pull Request Author: bartlettroscoe |
NOTICE: The AutoTester has encountered an internal error (usually a Communications Timeout), testing will be restarted, previous tests may still be running but will be ignored by the AutoTester... |
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_PR_gcc-8.3.0
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_gcc-8.3.0-serial
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_gcc-8.3.0-debug
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_clang-11.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_python3
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_cuda-11.4.2-uvm-off
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_intel-2021.3
Jenkins Parameters
Using Repos:
Pull Request Author: bartlettroscoe |
Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED Pull Request Auto Testing has PASSED (click to expand)Build InformationTest Name: Trilinos_PR_gcc-8.3.0
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_gcc-8.3.0-serial
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_gcc-8.3.0-debug
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_clang-11.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_python3
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_cuda-11.4.2-uvm-off
Jenkins Parameters
Build InformationTest Name: Trilinos_PR_intel-2021.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... |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will admit to not going through this in excruciating detail, but what I saw matches the description of the change, and all of that sounds fine to me.
Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ sebrowne ]! |
Status Flag 'Pull Request AutoTester' - AutoMerge IS ENABLED, but the Label AT: AUTOMERGE is not set. Either set Label AT: AUTOMERGE or manually merge the PR... |
Addresses:
Description
This PR branch does some cleanup, addresses a few issues, and updates the TriBITS snapshot in Trilinos. In more detail:
CMakeLists.txt
file is cleaned up by moving the details to several individual*.cmake
filestribits_exclude_autotools_files()
commonTools/build_stats
in reduced tarballInstructions for reviewers