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

Sacado/ShyLU: Upgrade to Googletest v16 #13849

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from

Conversation

sebrowne
Copy link
Contributor

@sebrowne sebrowne commented Mar 3, 2025

@trilinos/sacado
@trilinos/shylu

Motivation

There are configure warnings from the (old) Googletest in Sacado in some CI builds. Want to clean these up where possible to keep our dashboards as relevant as possible.

Testing

I configured, built, and ran the tests for the two packages in question with GCC + OpenMPI.

Additional Information

I pointed the source from ShyLU_NodeTacho into the Sacado snapshot via a symlink to avoid duplication and save repository space. Also of note, I split the commits up such that the modifications to Googletest that are needed to put it into Trilinos are very explicit and obvious.

sebrowne added 3 commits March 3, 2025 11:28
Here is exactly what I did:
```
cd packages/sacado/test/GTestSuite
wget https://github.com/google/googletest/archive/refs/tags/v1.16.0.tar.gz
tar -xzf v1.16.0.tar.gz
rm -rf googletest
mv googletest-1.16.0 googletest
```

Signed-off-by: Samuel E. Browne <[email protected]>
Two main differences:
1. Rename `gtest` target to `sacado-gtest` to avoid name collisions
2. Set `gtest_SOURCE_DIR`.  Seems to be a bug in googletest, but not
100% sure.  Otherwise will get compile errors in gtest, and possible
downstream compile errors about type issues within function calls to
gtest.

Signed-off-by: Samuel E. Browne <[email protected]>
What we _should_ do is to extract this to an included TPL type thing (I
believe in the past we tried to put it in commonTools), but that's more
work.

This is better than it was, as long as the symbolic link doesn't cause
issues on any certain types of builds (e.g. Windows).

Signed-off-by: Samuel E. Browne <[email protected]>
@sebrowne sebrowne requested review from a team as code owners March 3, 2025 22:21
Copy link
Contributor

@etphipp etphipp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@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' - Failure: Job PR_aue_srn_at1 on Jenkins server at https://do.sandia.gov/trilinos-ci Does Not Exist

@sebrowne sebrowne added the AT: RETEST Causes the PR autotester to run a new round of PR tests on the next iteration label Mar 3, 2025
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - User Requested Retest - Label AT: RETEST will be reset after testing.

@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: PR_gcc-openmpi-openmp

  • Build Num: 1203
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_sems-gnu-8.5.0-openmpi-4.1.6-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 AT: RETEST
PULLREQUESTNUM 13849
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8
TRILINOS_SOURCE_REPO https://github.com/sebrowne/Trilinos
TRILINOS_SOURCE_SHA c7aa813
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6350a22

Build Information

Test Name: PR_aue_srn_at1

  • Build Num: 3
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
BLOCKING_BUILD false
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_python_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 AT: RETEST
PULLREQUESTNUM 13849
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8
TRILINOS_SOURCE_REPO https://github.com/sebrowne/Trilinos
TRILINOS_SOURCE_SHA c7aa813
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6350a22

Build Information

Test Name: PR_gcc-openmpi_debug

  • Build Num: 1252
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
BLOCKING_BUILD false
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_sems-gnu-8.5.0-openmpi-4.1.6-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 AT: RETEST
PULLREQUESTNUM 13849
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8
TRILINOS_SOURCE_REPO https://github.com/sebrowne/Trilinos
TRILINOS_SOURCE_SHA c7aa813
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6350a22

Build Information

Test Name: PR_clang

  • Build Num: 1250
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_sems-clang-11.0.1-openmpi-4.0.5-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 AT: RETEST
PULLREQUESTNUM 13849
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8
TRILINOS_SOURCE_REPO https://github.com/sebrowne/Trilinos
TRILINOS_SOURCE_SHA c7aa813
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6350a22

Build Information

Test Name: PR_cuda

  • Build Num: 1249
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS AT: RETEST
PULLREQUESTNUM 13849
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8-gpu
TRILINOS_SOURCE_REPO https://github.com/sebrowne/Trilinos
TRILINOS_SOURCE_SHA c7aa813
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6350a22

Build Information

Test Name: PR_intel

  • Build Num: 1170
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_sems-intel-2021.3-sems-openmpi-4.1.6_release-debug_shared_no-kokkos-arch_no-asan_no-complex_fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS AT: RETEST
PULLREQUESTNUM 13849
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8
TRILINOS_SOURCE_REPO https://github.com/sebrowne/Trilinos
TRILINOS_SOURCE_SHA c7aa813
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6350a22

Build Information

Test Name: PR_cuda-uvm

  • Build Num: 1249
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
GENCONFIG_BUILD_NAME rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_no-package-enables
PR_LABELS AT: RETEST
PULLREQUESTNUM 13849
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_NODE_LABEL rhel8
TRILINOS_SOURCE_REPO https://github.com/sebrowne/Trilinos
TRILINOS_SOURCE_SHA c7aa813
TRILINOS_SRN_CONFIG true
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6350a22

Using Repos:

Repo: TRILINOS (sebrowne/Trilinos)
  • Branch: upgrade-gtest-v16
  • SHA: c7aa813
  • Mode: TEST_REPO

Pull Request Author: sebrowne

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AT: RETEST Causes the PR autotester to run a new round of PR tests on the next iteration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants