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 Sina as Axom component #1378

Merged
merged 81 commits into from
Nov 12, 2024
Merged

Add Sina as Axom component #1378

merged 81 commits into from
Nov 12, 2024

Conversation

BradWhitlock
Copy link
Member

@BradWhitlock BradWhitlock commented Jul 8, 2024

Summary

This PR is kind of a mirror PR for #1376 (Sina as an Axom component) that allows Axom's CI tests to run. The procedure for forked repo contributions was followed.

Note that this PR must be approved as it will be merged.

Also note that I activated the generated docs for Sina on RTD so they can be reviewed for formatting, etc. Here is the link: https://axom.readthedocs.io/en/pr-from-fork-1376/axom/sina/docs/sphinx/index.html

@doutriaux1
Copy link

I'm having issue linking one of our codes against this (segfault). I might be in the code itself, it might be in this new library. Can we hold off merging this until this linking issue is solved. Also if any of you could try to link your favorite code against this and run a few sina-enabled examples that would be great. Thx!

@doutriaux1
Copy link

I'm having issue linking one of our codes against this (segfault). I might be in the code itself, it might be in this new library. Can we hold off merging this until this linking issue is solved. Also if any of you could try to link your favorite code against this and run a few sina-enabled examples that would be great. Thx!

Solved I had to add this flag: -DAXOM_USE_ADIAK

@kennyweiss
Copy link
Member

Solved I had to add this flag: -DAXOM_USE_ADIAK

Note: We discussed this offline, and the problem was related to a missing for axom/config.hpp in the user code, which had the required AXOM_USE_ADIAK flag.

@doutriaux1
Copy link

So I built and deplyeoyed. But I don't think the mod file for fortran is installed:

(base) [cdoutrix@rzwhippet17:build]$ find /usr/workspace/cdoutrix/axom_build/install -name "*mod"
(base) [cdoutrix@rzwhippet17:build]$ find /usr/workspace/cdoutrix/axom_build/build -name "*mod"
/usr/workspace/cdoutrix/axom_build/build/CMakeFiles/FortranCInterface/mymodule.mod
/usr/workspace/cdoutrix/axom_build/build/CMakeFiles/FortranCInterface/my_module.mod
/usr/workspace/cdoutrix/axom_build/build/CMakeFiles/FortranCInterface/VerifyC/CMakeFiles/FortranCInterface/mymodule.mod
/usr/workspace/cdoutrix/axom_build/build/CMakeFiles/FortranCInterface/VerifyC/CMakeFiles/FortranCInterface/my_module.mod
/usr/workspace/cdoutrix/axom_build/build/CMakeFiles/FortranCInterface/VerifyCXX/CMakeFiles/FortranCInterface/mymodule.mod
/usr/workspace/cdoutrix/axom_build/build/CMakeFiles/FortranCInterface/VerifyCXX/CMakeFiles/FortranCInterface/my_module.mod
/usr/workspace/cdoutrix/axom_build/build/lib/fortran/fruit.mod
/usr/workspace/cdoutrix/axom_build/build/lib/fortran/fruit_util.mod
/usr/workspace/cdoutrix/axom_build/build/lib/fortran/fruit_smoke.mod
/usr/workspace/cdoutrix/axom_build/build/lib/fortran/f_conduit_smoke.mod
/usr/workspace/cdoutrix/axom_build/build/lib/fortran/sina_functions.mod

make test shows the fortran test passing so I think that part is ok

Copy link
Member

@kennyweiss kennyweiss left a comment

Choose a reason for hiding this comment

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

Thanks for all your efforts on this PR!

Looks like it is ready to go once the PYTHON_EXECUTABLE issue is resolved and its associated tests are passing.

Please also update the RELEASE-NOTES about the new Sina component.

src/axom/sina/examples/sina_check_datum_type.cpp Outdated Show resolved Hide resolved

int main(void)
{
// Initialize slic
axom::slic::initialize();
Copy link
Member

Choose a reason for hiding this comment

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

Minor:
slic::SimpleLogger is an RAII wrapper around slic::initialize and slic::finalize that can be used for simple examples like this,
See:
https://github.com/LLNL/axom/blob/develop/src/axom/slic/core/SimpleLogger.hpp

(No need to change these examples, just wanted to let you know about it in case you didn't)

Copy link
Member

Choose a reason for hiding this comment

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

I wasn't aware of this so thanks for the heads up! :)

@bgunnar5
Copy link
Member

bgunnar5 commented Nov 7, 2024

@LLNL/axom I think this is finally ready to hit the merge button

@bgunnar5 bgunnar5 merged commit 2244835 into develop Nov 12, 2024
13 checks passed
@bgunnar5 bgunnar5 deleted the pr-from-fork/1376 branch November 12, 2024 16:51
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.

7 participants