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

Add compass tags to albany and trilinos-for-albany packages #22

Merged

Conversation

xylar
Copy link
Collaborator

@xylar xylar commented Sep 29, 2023

closes #19

@xylar xylar force-pushed the add-compass-albany-and-trilinos-tags branch from 046c3ee to 225afb5 Compare October 1, 2023 06:04
@xylar xylar force-pushed the add-compass-albany-and-trilinos-tags branch 3 times, most recently from 282f409 to 711daab Compare October 3, 2023 13:51
@xylar xylar marked this pull request as ready for review October 3, 2023 14:31
@xylar
Copy link
Collaborator Author

xylar commented Oct 3, 2023

@ikalash, this is ready for you to review when you have time.

Comment on lines +36 to +37
version('compass-2023-08-03', sha256='b3d5c06eb31c22391923c6adf4b748672c81d8e4dc6118c421cb76a377512808',
url='https://github.com/E3SM-Project/Trilinos/archive/refs/tags/compass-2023-08-23.tar.gz')
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This was the only way I found that I could successfully get a URL for compass-* tags that isn't on the usual Trilinos repo. Modifying url_from_version didn't do it, perhaps because it didn't recognize a git tag as a version. Not sure...

@bartgol
Copy link

bartgol commented Oct 3, 2023

It seems to me that this is a bit involved maybe? Wouldn't it be easier to always use E3SM-Project/trilinos? If lack of sync with upstream is a concern, we could run the sync action more often than once per day (say, every few hours).

@xylar
Copy link
Collaborator Author

xylar commented Oct 3, 2023

@bartgol, it seems like this spack fork is now the one referred to in the Albany documentation and used by Albany testing. It therefore seems strange to have it point to a fork for all work (even if there is a certain consistency between using the E3SM-Project spack for and the E3SM-Project Albany fork). To me, it makes no difference but it seems likely that @ikalash will prefer to keep albany/package.py pointing to the main repo, not the E3SM-Project fork.

@ikalash
Copy link

ikalash commented Oct 3, 2023

@bartgol, it seems like this spack fork is now the one referred to in the Albany documentation and used by Albany testing. It therefore seems strange to have it point to a fork for all work (even if there is a certain consistency between using the E3SM-Project spack for and the E3SM-Project Albany fork). To me, it makes no difference but it seems likely that @ikalash will prefer to keep albany/package.py pointing to the main repo, not the E3SM-Project fork.

I am getting confused again. I don't think there's an E3SM-Project Albany fork. Are you suggesting to create one? How often will the E3SM-Project Trilinos be sync'ed with the main Trilinos develop branch? If it's daily, I don't see a reason to create a separate Albany fork in E3SM-Project.

@ikalash
Copy link

ikalash commented Oct 3, 2023

Also, I'd like to test this PR. Are the relevant ways to test this:

  • Test by running in my usual way to build albany@develop
  • Test by trying to build albany@compass-2023-08-03?

I don't actually do anything with compass in my spack build (or ever). Would I need to build compass first? Or spack takes care of that under the hood?

@bartgol
Copy link

bartgol commented Oct 3, 2023

I was referring to the trilinos repo. Right now, we set

git = "https://github.com/trilinos/Trilinos.git"

and for version compass-2023-08-03 we provide a special url from the E3SM-Project/trilinos fork. I was wondering if we may as well set

git = "https://github.com/E3SM-Project/trilinos.git"

since we now automatically sync the fork with the upstream every night...

@xylar
Copy link
Collaborator Author

xylar commented Oct 3, 2023

Oops! Sorry for causing more confusion. Yes, we're talking about the repo that trilinos-for-albany points to (not Albany itself). Sorry about that!

Also, I'd like to test this PR. Are the relevant ways to test this:

Test by running in my usual way to build albany@develop

Yes, that's all you should do.

Test by trying to build albany@compass-2023-08-03?
I don't actually do anything with compass in my spack build (or ever). Would I need to build compass first? Or spack takes care of that under the hood?

That is the tag of Albany that Compass will use. You don't need to test that. I'm already doing that on various machines myself as part of this Compass PR:
MPAS-Dev/compass#704

@xylar xylar mentioned this pull request Oct 4, 2023
@ikalash
Copy link

ikalash commented Oct 4, 2023

@xylar : thanks for the clarification. I can test this today. Could you please merge the E3SM-Project spack again into your fork first before I test? I pushed another minor change. This should be the last one.

@xylar
Copy link
Collaborator Author

xylar commented Oct 4, 2023

Sure, I'll rebase.

@xylar xylar force-pushed the add-compass-albany-and-trilinos-tags branch from 711daab to 7c87f90 Compare October 4, 2023 18:30
@xylar
Copy link
Collaborator Author

xylar commented Oct 4, 2023

Done.

@ikalash
Copy link

ikalash commented Oct 5, 2023

I tested this and things look good. You can go ahead and merge in if you'd like. Sorry about the delay. Note that I did not test things with the compass side of things.

I updated the spack build instructions to mention the @develop part, but we should probably update the instructions to explain the other use case, with the tags. Perhaps you could do this @xylar with help from @bartgol ?

@xylar
Copy link
Collaborator Author

xylar commented Oct 5, 2023

I updated the spack build instructions to mention the @develop part, but we should probably update the instructions to explain the other use case, with the tags. Perhaps you could do this @xylar with help from @bartgol ?

I don't think the compass tags are something we necessarily want to document in the same way as the @develop usage. The compass tags are for usage when we deploy new shared Spack environment in Compass itself, so folks only need to know about the tags when they need to be updated internally in Compass' deployment scripts. Since that's a very specialized thing that currently only I do, I think it's okay if it doesn't get special documentation.

@xylar xylar requested a review from ikalash October 5, 2023 10:17
@xylar xylar merged commit 82a2820 into E3SM-Project:develop Oct 5, 2023
@xylar xylar deleted the add-compass-albany-and-trilinos-tags branch October 5, 2023 10:18
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.

Move trilinos-for-albany to E3SM-Project/Trilinos?
3 participants