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

TriBITS Snapshot 2022-12-12 working toward TriBITSPub/TriBITS#63 #11380

Merged

Conversation

bartlettroscoe
Copy link
Member

@bartlettroscoe bartlettroscoe commented Dec 13, 2022

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() and set_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:

$ ssh crf450

$ cd ~/Trilinos.base/BUILDS/PR/pr_builds/

$ ./run_trilinos_pr_builds.py  \
  -b tribits-master-2022-12-12 \
  -c Trilinos_TRIBITS_DIR:STRING=cmake/tribits \
  -p ALL_PACKAGES -j 16 -r clang-11.0.1

...

Configure PASSED!

Build PASSED!

100% tests passed, 0 tests failed out of 3466

...

which posted to CDash here.

Full run_trilinos_pr_bulids.py output for clang-11.0.1 build: (click to expand)
=================================
Running set of Trilinos PR builds
=================================

Tue Dec 20 11:38:23 MST 2022

***
*** Repo status and versions:
***

Trilinos Src Dir: /home/rabartl/Trilinos.base/Trilinos

---------------------------------------------------------------------------------------------------------------------------------
| ID | Repo Dir                         | Branch                      | Tracking Branch                            | C  | M | ? |
|----|----------------------------------|-----------------------------|--------------------------------------------|----|---|---|
|  0 | Trilinos (Base)                  | tribits-snapshot-2022-12-12 | rab-github/tribits-snapshot-2022-12-12-tmp | 21 |   |   |
|  1 | packages/framework/GenConfig     | HEAD                        |                                            |    |   |   |
|  2 | packages/framework/son-ini-files | master                      | origin/master                              |    |   |   |
|  3 | packages/framework/srn-ini-files | master                      | origin/master                              |    |   |   |
|  4 | TriBITS                          | master                      | github/master                              |    |   |   |
|  5 | TriBITS/TriBITSDoc               | master                      | github/master                              |    |   |   |
|  6 | run_trilinos_pr_builds           | master                      | glex-rabartl/master                        |    |   |   |
---------------------------------------------------------------------------------------------------------------------------------

(tip: to see a legend, pass in --dist-legend.)

Repository versions:
*** Base Git Repo: Trilinos
aacf63de2ae034fe46a257fa094c6dd6eb06fcd1 [Tue Dec 20 11:36:43 2022 -0700] <[email protected]>
Merge branch 'tribits_github_snapshot' into tribits-snapshot-2022-12-12 (#11411)
*** Git Repo: packages/framework/GenConfig
924a08af66f0a0573b5dd1128179731489339aec [Wed Jun 15 15:55:48 2022 +0000] <[email protected]>
Merge branch 'del-gen-symlinks' into 'master'
*** Git Repo: packages/framework/son-ini-files
6c30e48f45bf0d839f0fdbc143f4f3f69cae671a [Mon Jul 18 16:33:38 2022 +0000] <[email protected]>
Merge branch 'cuda-11-config' into 'master'
*** Git Repo: packages/framework/srn-ini-files
d1c76f866658ffa18051cb18f6a6584f544a01ae [Tue Dec 13 11:07:01 2022 -0700] <[email protected]>
Merge branch 'TRILFRAME-495' into 'master'
*** Git Repo: TriBITS
3879de003986ced56bd5ffcb10149fbd3746e6c5 [Tue Dec 20 13:34:23 2022 -0500] <[email protected]>
Merge pull request #555 from bartlettroscoe/554-add-run-serial (#554)
*** Git Repo: TriBITS/TriBITSDoc
70d9dca0c622d3f320b71185c135461291c354c2 [Mon Jul 26 13:02:26 2021 -0600] <[email protected]>
Add back update_repos_and_publish_web_docs.sh (TriBITSPub/TriBITS#386)
*** Git Repo: run_trilinos_pr_builds
3ab406f14d8467bdb7b50c595c7268d7f9380022 [Mon Dec 12 16:17:05 2022 -0700] <[email protected]>
Update the set of PR builds

See results on CDash at:

    https://testing.sandia.gov/cdash/index.php?project=Trilinos&filtercount=3&showfilters=1&filtercombine=and&field1=groupname&compare1=61&value1=Experimental&field2=buildname&compare2=65&value2=tribits-master-2022-12-12_&field3=buildstarttime&compare3=84&value3=now

Final set of builds: clang-11.0.1

Generating the build directory and scripts: clang-11.0.1

  full-build-name: 'rhel7_sems-clang-11.0.1-openmpi-1.10.1-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables'

***
*** Running configure, build, and test for PR build 'clang-11.0.1'
***

Full build name: rhel7_sems-clang-11.0.1-openmpi-1.10.1-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables

Tue Dec 20 11:38:25 MST 2022

Running: source load-env.sh --ci-mode &> load-env.out

Running: ./do-configure &> configure.out


real    1m46.999s
user    1m9.689s
sys     0m40.232s

Running: make dashboard &> make.dashbaord.out

real    154m49.682s
user    2307m40.227s
sys     60m12.430s

Results of configure, build, and tests:

Configure PASSED!

Build PASSED!

100% tests passed, 0 tests failed out of 3466

Link to this build's results on CDash:

    https://testing.sandia.gov/cdash/index.php?project=Trilinos&filtercount=3&showfilters=1&filtercombine=and&field1=site&compare1=61&value1=crf450&field2=buildname&compare2=61&value2=tribits-master-2022-12-12_rhel7_sems-clang-11.0.1-openmpi-1.10.1-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables&field3=buildstamp&compare3=61&value3=20221220-1840-Experimental


Tue Dec 20 14:15:13 MST 2022

See results on CDash at:

    https://testing.sandia.gov/cdash/index.php?project=Trilinos&filtercount=3&showfilters=1&filtercombine=and&field1=groupname&compare1=61&value1=Experimental&field2=buildname&compare2=65&value2=tribits-master-2022-12-12_&field3=buildstarttime&compare3=84&value3=now

Tasks

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 bartlettroscoe added the TriBITS Issues with the TriBITS framework itself, not usage of the TriBITS framework label Dec 13, 2022
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects:

Pull Request Auto Testing STARTING (click to expand)

Build Information

Test Name: Trilinos_PR_gcc-8.3.0

  • Build Num: 1556
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel7_sems-gnu-8.3.0-openmpi-1.10.1-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS TriBITS
PULLREQUESTNUM 11380
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL trilinos-any
TRILINOS_SOURCE_BRANCH tribits-snapshot-2022-12-12
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA fb29940
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA c964286

Build Information

Test Name: Trilinos_PR_gcc-8.3.0-serial

  • Build Num: 83
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel7_sems-gnu-8.3.0-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS TriBITS
PULLREQUESTNUM 11380
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL trilinos-any
TRILINOS_SOURCE_BRANCH tribits-snapshot-2022-12-12
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA fb29940
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA c964286

Build Information

Test Name: Trilinos_PR_gcc-8.3.0-debug

  • Build Num: 82
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel7_sems-gnu-8.3.0-openmpi-1.10.1-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS TriBITS
PULLREQUESTNUM 11380
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL trilinos-any
TRILINOS_SOURCE_BRANCH tribits-snapshot-2022-12-12
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA fb29940
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA c964286

Build Information

Test Name: Trilinos_PR_clang-11.0.1

  • Build Num: 82
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel7_sems-clang-11.0.1-openmpi-1.10.1-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS TriBITS
PULLREQUESTNUM 11380
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL trilinos-any
TRILINOS_SOURCE_BRANCH tribits-snapshot-2022-12-12
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA fb29940
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA c964286

Build Information

Test Name: Trilinos_PR_python3

  • Build Num: 1337
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel7_sems-gnu-7.2.0-anaconda3-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_pr-framework
PR_LABELS TriBITS
PULLREQUESTNUM 11380
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL ascic
TRILINOS_SOURCE_BRANCH tribits-snapshot-2022-12-12
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA fb29940
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA c964286

Build Information

Test Name: Trilinos_PR_cuda-11.4.2-uvm-off

  • Build Num: 1083
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel7_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.0.5_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS TriBITS
PULLREQUESTNUM 11380
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL GPU
TRILINOS_SOURCE_BRANCH tribits-snapshot-2022-12-12
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA fb29940
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA c964286

Using Repos:

Repo: TRILINOS (bartlettroscoe/Trilinos)
  • Branch: tribits-snapshot-2022-12-12
  • SHA: fb29940
  • Mode: TEST_REPO

Pull Request Author: bartlettroscoe

@trilinos-autotester
Copy link
Contributor

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 Information

Test Name: Trilinos_PR_gcc-8.3.0

  • Build Num: 1556
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel7_sems-gnu-8.3.0-openmpi-1.10.1-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS TriBITS
PULLREQUESTNUM 11380
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL trilinos-any
TRILINOS_SOURCE_BRANCH tribits-snapshot-2022-12-12
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA fb29940
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA c964286

Build Information

Test Name: Trilinos_PR_gcc-8.3.0-serial

  • Build Num: 83
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel7_sems-gnu-8.3.0-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS TriBITS
PULLREQUESTNUM 11380
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL trilinos-any
TRILINOS_SOURCE_BRANCH tribits-snapshot-2022-12-12
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA fb29940
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA c964286

Build Information

Test Name: Trilinos_PR_gcc-8.3.0-debug

  • Build Num: 82
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel7_sems-gnu-8.3.0-openmpi-1.10.1-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS TriBITS
PULLREQUESTNUM 11380
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL trilinos-any
TRILINOS_SOURCE_BRANCH tribits-snapshot-2022-12-12
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA fb29940
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA c964286

Build Information

Test Name: Trilinos_PR_clang-11.0.1

  • Build Num: 82
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel7_sems-clang-11.0.1-openmpi-1.10.1-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS TriBITS
PULLREQUESTNUM 11380
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL trilinos-any
TRILINOS_SOURCE_BRANCH tribits-snapshot-2022-12-12
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA fb29940
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA c964286

Build Information

Test Name: Trilinos_PR_python3

  • Build Num: 1337
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel7_sems-gnu-7.2.0-anaconda3-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_pr-framework
PR_LABELS TriBITS
PULLREQUESTNUM 11380
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL ascic
TRILINOS_SOURCE_BRANCH tribits-snapshot-2022-12-12
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA fb29940
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA c964286

Build Information

Test Name: Trilinos_PR_cuda-11.4.2-uvm-off

  • Build Num: 1083
  • Status: FAILED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel7_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.0.5_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS TriBITS
PULLREQUESTNUM 11380
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL GPU
TRILINOS_SOURCE_BRANCH tribits-snapshot-2022-12-12
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA fb29940
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA c964286


CDash Test Results for PR# 11380.


Wiki: How to Reproduce PR Testing Builds and Errors.

@bartlettroscoe
Copy link
Member Author

FYI: Last PR iteration failed due to one timing out test PanzerAdaptersSTK_main_driver_energy-ss-blocked-tp in the PR build rhel7_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.0.5_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables and it seems to have only timed out this once in PR testing as shown in this query. And when the test passes, it completes in under 4m 18s.

But note that we are getting over 1300 CMake Deprecation Warning messages of the form:

CMake Deprecation Warning at cmake/tribits/core/utils/MessageWrapper.cmake:77 (message):
  TriBITS command 'include_directories' is deprecated.

  

  Use tribits_include_directories() instead.
Call Stack (most recent call first):
  cmake/tribits/core/utils/TribitsDeprecatedHelpers.cmake:81 (message_wrapper)
  cmake/tribits/core/utils/TribitsDeprecatedHelpers.cmake:114 (tribits_deprecated)
  cmake/tribits/core/package_arch/TribitsIncludeDirectories.cmake:93 (tribits_deprecated_command)
  commonTools/gtest/CMakeLists.txt:8 (INCLUDE_DIRECTORIES)

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.
@alanw0
Copy link
Contributor

alanw0 commented Dec 21, 2022

I'll grab the commit and bring it to sierra so that we don't overwrite it next time we snapshot stk back to trilinos.

Hello @alanw0, I was going to do that at the same time that I grabbed the changes for Krino and Percept (which also live in the Sierra base repo).

ok, sounds fine. I couldn't remember if you ended up getting access to sierra gitlab a while back.

@bartlettroscoe
Copy link
Member Author

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.

@bartlettroscoe
Copy link
Member Author

@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:

$ git log -1 73ab2e96b9e
commit 73ab2e96b9e93bf8bda9f877f5549073812f3497 (github/stk-snapshot)
Author: Timothy A. Smith <[email protected]>
Date:   Thu Dec 15 14:27:20 2022 -0700

    STK: Snapshot 12-15-22 14:26

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:

commit 03df3a0672e9aaa7802c9b37b3fb114c68e5b313 (github/tribits_github_snapshot, tribits_github_snapshot)
Author: Roscoe A. Bartlett <[email protected]>
Date:   Tue Dec 20 11:35:29 2022 -0700

    Automatic snapshot commit from tribits at c2f52215
    
    Origin repo remote tracking branch: 'github/master'
    Origin repo remote repo URL: 'github = [email protected]:TriBITSPub/TriBITS.git'
    Git describe: Vera4.0-RC1-start-1418-g3879de00
    
    At commit:
    
    commit c2f52215a2bf6d1004c5422164f0019952fcc1f2
    Author:  Roscoe A. Bartlett <[email protected]>
    Date:    Tue Dec 20 11:15:04 2022 -0700
    Summary: Add RUN_SERIAL to tribits_add_executable_and_test() (#554)

That leaves no ambiguity at all about what version was snapshotted in and where it came from.

@alanw0
Copy link
Contributor

alanw0 commented Dec 21, 2022

@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.

@bartlettroscoe
Copy link
Member Author

@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.

@bartlettroscoe
Copy link
Member Author

@bartlettroscoe our snapshotting script does inject a small breadcrumb that may be helpful. ... packages/stk/stk_util/stk_util/registry/ProductRegistry.cpp ...

@alanw0, but what about for Krino and Percept? Those don't contain that file.

@bartlettroscoe
Copy link
Member Author

bartlettroscoe commented Dec 21, 2022

@alanw0, what is the date time stamp in a commit like a14f1d2:

commit a14f1d2e7bd240a80c30db7016844b90ff82e2b6
Author: Alan B. Williams <[email protected]>
Date:   Wed Nov 23 09:02:22 2022 -0700

    STK: Snapshot 11-23-22 09:02

represent?

@alanw0
Copy link
Contributor

alanw0 commented Dec 21, 2022

@bartlettroscoe

  1. yes I think it should be reasonable to run your script on the sierra subdirs to make this change.
  2. yes it's true that percept and krino don't contain that stk file, nor any file with snapshot-versioning info. I'll see whether we can coordinate something along those lines with the authors of those packages.
  3. the date-stamp in our current snapshot commit message is relatively meaningless, it is simply the time at which the snapshot script raked code out of a clone of sierra and put it into a clone of trilinos.

we clearly need some better tracking info, I'll see what we can do.

@bartlettroscoe
Copy link
Member Author

bartlettroscoe commented Dec 21, 2022

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?

@bartlettroscoe
Copy link
Member Author

bartlettroscoe commented Dec 21, 2022

the date-stamp in our current snapshot commit message is relatively meaningless, it is simply the time at which the snapshot script raked code out of a clone of sierra and put it into a clone of trilinos.

@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 git log --first-parent on the 'master' branch.

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.

@bartlettroscoe
Copy link
Member Author

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.

@trilinos-autotester
Copy link
Contributor

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...

@bartlettroscoe
Copy link
Member Author

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.

@bartlettroscoe
Copy link
Member Author

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.

bartlettroscoe added a commit to bartlettroscoe/Trilinos that referenced this pull request Jan 11, 2023
…/TriBITS#63""

This reverts commit ae19a59.

This brings back the version of TriBITS snapshotted in Trilinos PR
trilinos#11380.
trilinos-autotester added a commit that referenced this pull request Jan 19, 2023
…ot-2022-12-12-again

Automatically Merged using Trilinos Pull Request AutoTester
PR Title: Bring back TriBITS snapshot from PR #11380 and address issues (#11429)
PR Author: bartlettroscoe
cabejackson pushed a commit to trilinos/Moertel that referenced this pull request Aug 16, 2023
…/TriBITS#63""

This reverts commit ae19a59.

This brings back the version of TriBITS snapshotted in Trilinos PR
trilinos/Trilinos#11380.
cabejackson pushed a commit to trilinos/FEI that referenced this pull request Aug 16, 2023
…/TriBITS#63""

This reverts commit ae19a59.

This brings back the version of TriBITS snapshotted in Trilinos PR
trilinos/Trilinos#11380.
cabejackson pushed a commit to trilinos/Rythmos that referenced this pull request Aug 16, 2023
…/TriBITS#63""

This reverts commit ae19a59.

This brings back the version of TriBITS snapshotted in Trilinos PR
trilinos/Trilinos#11380.
cabejackson pushed a commit to trilinos/Komplex that referenced this pull request Aug 16, 2023
…/TriBITS#63""

This reverts commit ae19a59.

This brings back the version of TriBITS snapshotted in Trilinos PR
trilinos/Trilinos#11380.
cabejackson pushed a commit to trilinos/Pike that referenced this pull request Aug 16, 2023
…/TriBITS#63""

This reverts commit ae19a59.

This brings back the version of TriBITS snapshotted in Trilinos PR
trilinos/Trilinos#11380.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
TriBITS Issues with the TriBITS framework itself, not usage of the TriBITS framework
Projects
Development

Successfully merging this pull request may close these issues.

4 participants