Skip to content

Conversation

@cgcgcg
Copy link

@cgcgcg cgcgcg commented Oct 13, 2025

See
spack/spack-packages#1961

I just copied the file from SEACAS and checked that it was used by CMake in Trilinos. I did not check if it can actually find adios2.

Matching PR to Trilinos: trilinos/Trilinos#14556

@bartlettroscoe
Copy link
Member

Thanks @cgcgcg, I will get the exact SHA1 from the SEACAS repo and update the amend the commit message with that info (for traceability) and then we can merge this.

Once we snapshot the updated version of TriBITS to Trilinos we can update the Trilinos/TPLsList.cmake file for this move.

@cgcgcg
Copy link
Author

cgcgcg commented Oct 13, 2025

Can we merge the matching Trilinos PR trilinos/Trilinos#14556 already? I figured this would not cause any issues for a TriBITS snapshot.

@bartlettroscoe
Copy link
Member

Can we merge the matching Trilinos PR trilinos/Trilinos#14556 already? I figured this would not cause any issues for a TriBITS snapshot.

@cgcgcg, we should update that commit with the exact version of SEACAS this was taken from, for traceability.

@bartlettroscoe
Copy link
Member

@cgcgcg, what version of the seacas repo did you get this file FindTPLADIOS2.cmake from? Did you modify the file after copying?

For the Trilinos and seacas repo versions:

$ gitdist-show-full-repo-state --dist-repos=.,seacas

Repo versions:

*** Base Git Repo: Trilinos
f263f21e703129a285bbdcb646371c6665344469 [Mon Oct 13 09:50:50 2025 -0600] <[email protected]>
Add adios2 TPL
*** Git Repo: seacas
fc8b8280c5989ccb27f3b495447521145f659b02 [Mon Oct 13 11:47:24 2025 -0600] <[email protected]>
IOSS: io_shell fix database type help output

Repo branch status:

---------------------------------------------------------------
| ID | Repo Dir        | Branch | Tracking Branch | C | M | ? |
|----|-----------------|--------|-----------------|---|---|---|
|  0 | Trilinos (Base) | adios2 | cgcgcg/adios2   |   |   |   |
|  1 | seacas          | master | github/master   |   |   |   |
---------------------------------------------------------------

Repo remotes:

*** Base Git Repo: Trilinos
cgcgcg  [email protected]:cgcgcg/Trilinos.git (push)
dalg24  [email protected]:dalg24/Trilinos.git (push)
github  [email protected]:trilinos/Trilinos.git (push)
rab-github      [email protected]:bartlettroscoe/Trilinos.git (push)
rab-mytril      [email protected]:bartlettroscoe/MyTrilinos.git (push)
*** Git Repo: seacas
github  [email protected]:sandialabs/seacas.git (push)

I am getting the diff:

$ cd Trilinos/
$ diff seacas/cmake/tribits/common_tpls/FindTPLADIOS2.cmake cmake/tribits/common_tpls/FindTPLADIOS2.cmake

showing:

2c2,3
< # ************************************************************************
---
> # *****************************************************************************
> #           Trilinos: An Object-Oriented Solver Framework
4,37c5,7
< #            TriBITS: Tribal Build, Integrate, and Test System
< #                    Copyright 2016, 2024 Sandia Corporation
< #
< # Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
< # the U.S. Government retains certain rights in this software.
< #
< # Redistribution and use in source and binary forms, with or without
< # modification, are permitted provided that the following conditions are
< # met:
< #
< # 1. Redistributions of source code must retain the above copyright
< # notice, this list of conditions and the following disclaimer.
< #
< # 2. Redistributions in binary form must reproduce the above copyright
< # notice, this list of conditions and the following disclaimer in the
< # documentation and/or other materials provided with the distribution.
< #
< # 3. Neither the name of the Corporation nor the names of the
< # contributors may be used to endorse or promote products derived from
< # this software without specific prior written permission.
< #
< # THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
< # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
< # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
< # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
< # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
< # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
< # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
< # PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
< # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
< # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
< # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
< #
< # ************************************************************************
---
> # Copyright 2001-2024 NTESS and the Trilinos contributors.
> # SPDX-License-Identifier: BSD-3-Clause
> # *****************************************************************************

Did you copy the file and put the TriBITS copyright header on this?

We just need to describe where this file came from and any modifications were made after the snapshot.

@cgcgcg
Copy link
Author

cgcgcg commented Oct 13, 2025

This is the SEACAS commit: sandialabs/seacas@8b9f666
I modified the header to match the other files in common_tpls

Taken from commit 8b9f666289cbedee5a9d0a585bbf0b74d03019c7 in SEACAS
https://github.com/sandialabs/seacas and then had the copyright header updated
to match other such files in TriBITS.

See
spack/spack-packages#1961

Signed-off-by: Christian Glusa <[email protected]>
Copy link
Member

@bartlettroscoe bartlettroscoe left a comment

Choose a reason for hiding this comment

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

@cgcgcg, thanks for taking care of this and updating the commit message with the origin info from seacas repo. I updated that commit message to mention the manual update of the copyright header just to be complete and avoid confusion (in case someone does a diff).

@bartlettroscoe
Copy link
Member

NOTE: This may cause merge conflicts the next time a TriBITS snapshot is merged into Trilinos default (because TriBITS snapshots are merged in instead of overwriting changes in Trilinos). But any conflicts will be trivial to deal with.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants