TriBITS Snapshot 2022-12-12 working toward TriBITSPub/TriBITS#63 #11380
Conversation
Origin repo remote tracking branch: 'github/master' Origin repo remote repo URL: 'github = [email protected]:TriBITSPub/TriBITS.git' Git describe: Vera4.0-RC1-start-1400-g07aeef0f At commit: commit 07aeef0f9f10d928b614214c1c8b38af0eecc6d4 Author: Roscoe A. Bartlett <[email protected]> Date: Mon Dec 12 19:20:48 2022 -0700 Summary: Remove assert of local matches cache export var (trilinos#551)
…TS#63) I resolved the conflicts in: * cmake/tribits/common_tpls/FindTPLHDF5.cmake * cmake/tribits/common_tpls/FindTPLNetcdf.cmake by going with what was in in the snapshot tribits_github_snapshot. (Those commits are more current.)
bartlettroscoe
added
the
TriBITS
|
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
Using Repos:
Pull Request Author: bartlettroscoe |
|
Status Flag 'Pull Request AutoTester' - Jenkins Testing: 1 or more Jobs FAILED Note: Testing will normally be attempted again in approx. 2 Hrs 30 Mins. If a change to the PR source branch occurs, the testing will be attempted again on next available autotester run. Pull Request Auto Testing has FAILED (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
|
|
FYI: Last PR iteration failed due to one timing out test But note that we are getting over 1300 I will need to make those go away before I merge this PR. |
…riBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…riBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…SPub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…b/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…iBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…ub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…BITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…b/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
…ub/TriBITS#429) The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() instead and use raw CMake include_directories() where that is the behavior you want.
ok, sounds fine. I couldn't remember if you ended up getting access to sierra gitlab a while back. |
@alanw0, I seem to have access to the cee-gitlab repo for Sierra base so I will try posting a MR for the (trivial) changes for STK, Krino, and Percept. |
@alanw0, it looks like the snapshots don't contain the SHA1s from the originating git repo so it is not clear how to apply the patches back to the Sierra base repo. For example, the latest STK snapshot commit only shows: A date in git is not well defined. Is this the commit or author date of the commit of the top commit in the repo? Is this the time on the wall that the snapshot was created from the main branch of the originating repo? What branch? The 'master' branch? It is not clear. What is needed is the SHA1 for the originating git repo. Such a snapshot commit is generated using a tool like snapshot-dir.py. For example, for the TriBITS snapshots you see commits like: That leaves no ambiguity at all about what version was snapshotted in and where it came from. |
|
@bartlettroscoe our snapshotting script does inject a small breadcrumb that may be helpful. Take a look at packages/stk/stk_util/stk_util/registry/ProductRegistry.cpp and search for STK_VERSION_STRING. We drop a little info in there which (I think) contains the sha1 from the sierra base repo at the time of the snapshot. |
|
@alanw0, given that these charges are created by just running some simple refactoring scripts, I will just run those scripts on the subdirs in the Sierra base repo to create the commits. But it would be good to define the process of bringing back the commits to make it fool-proof. |
@alanw0, but what about for Krino and Percept? Those don't contain that file. |
|
@alanw0, what is the date time stamp in a commit like a14f1d2: represent? |
we clearly need some better tracking info, I'll see what we can do. |
|
It would appear that the native Sierra repo copy of percept does not contain any CMakeLists.txt files? Therefore, there is nothing to sync back? How is the snapshotting done if this is not an exact copy? |
@alanw0, if the script that does the snapshotting pulls from the 'master' branch in the cee-gitlab repo for Sierra right before it creates the snapshot, then we should be able to determine what version of the repo this came from by looking at But if a pull from the cee-gitlab repo is not done immediately before the snapshot is created, then a newer merge commit may have been pushed to the 'master' branch after the last pull but before the snapshotting script was run locally. This is why using a date stamp is ill-defined. |
|
With PRs and MRs for all of these changes posted on the native repos (see Tasks above), this is ready to merge. All that is needed is to merge those PRs and MRs. |
|
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... |
|
All of the external PRs and MRs have been created, and of those, all but the KokkosKernels PR kokkos/kokkos-kernels#1635 have been merged. Therefore, to avoid the testing going stale, I will merge this PR. NOTE: There is some more breaks in backward compatibility in the new items in tribits/CHANGELOG.md. |
|
There are some problems reported with these TriBITS changes in #11426 and sandialabs/Albany#879. Therefore, I will put in a PR to back out this merge commit for now so we can keep things clean during the holiday break. |
…/TriBITS#63"" This reverts commit ae19a59. This brings back the version of TriBITS snapshotted in Trilinos PR trilinos#11380.
…/TriBITS#63"" This reverts commit ae19a59. This brings back the version of TriBITS snapshotted in Trilinos PR trilinos/Trilinos#11380.
…/TriBITS#63"" This reverts commit ae19a59. This brings back the version of TriBITS snapshotted in Trilinos PR trilinos/Trilinos#11380.
…/TriBITS#63"" This reverts commit ae19a59. This brings back the version of TriBITS snapshotted in Trilinos PR trilinos/Trilinos#11380.
…/TriBITS#63"" This reverts commit ae19a59. This brings back the version of TriBITS snapshotted in Trilinos PR trilinos/Trilinos#11380.
…/TriBITS#63"" This reverts commit ae19a59. This brings back the version of TriBITS snapshotted in Trilinos PR trilinos/Trilinos#11380.
Description
Update of TriBITS containing a number of refactorings and extensions working toward TriBITSPub/TriBITS#63 (and EPIC TriBITSPub/TriBITS#367). Some other issues are addressed as well like getting rid of deprecated usage of some TriBITS functionality.
This includes the TriBITS PRs and direct commits (from most recent to least recent):
NOTE: In addition, this contains individual commits for each Trilinos package to remove the usage of the deprecated TriBITS macros
include_directories()andset_and_inc_dirs(). The large number of commits and files changed is due to those updates.NOTE: I will apply the changes to the external repos to those repos (i.e. for KokkosKernals, SEACAS, and Sierra).
Testing
I tested locally on SNL RHEL7 machine 'crf450' with:
which posted to CDash here.
Full run_trilinos_pr_bulids.py output for clang-11.0.1 build: (click to expand)
Tasks