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

Update singularity-eos #44

Merged
merged 2 commits into from
Jan 18, 2025
Merged

Update singularity-eos #44

merged 2 commits into from
Jan 18, 2025

Conversation

adamdempsey90
Copy link
Collaborator

Background

So that we can use MeanAtomicMass() to pull out mu without having to pass it and amu to functions we are already passing the eos to.

I also want to see if jaybenne will build properly...because I'm having problems on another branch when updating singularity.

Description of Changes

Checklist

  • New features are documented
  • Tests added for bug fixes and new features
  • (@lanl.gov employees) Update copyright on changed files

@adamdempsey90
Copy link
Collaborator Author

jaybenne fails to compile because it is looking for singularity-eos/eos/eos.hpp in the wrong place? That file lives in the artemis build generated directory. Why is it not finding it?

[ 78%] Building CXX object external/jaybenne/src/jaybenne/CMakeFiles/lib_jaybenne_package.dir/jaybenne.cpp.o
[ 78%] Building CXX object external/jaybenne/src/jaybenne/CMakeFiles/lib_jaybenne_package.dir/sample_ddmc_bface.cpp.o
[ 80%] Building CXX object external/jaybenne/src/jaybenne/CMakeFiles/lib_jaybenne_package.dir/sourcing.cpp.o
[ 80%] Building CXX object external/jaybenne/src/jaybenne/CMakeFiles/lib_jaybenne_package.dir/transport.cpp.o
In file included from /home/runner/work/artemis/artemis/src/utils/eos/eos.hpp:16,
                 from /home/runner/work/artemis/artemis/tst/build/external/jaybenne/src/jaybenne/jaybenne_config.hpp:19,
                 from /home/runner/work/artemis/artemis/external/jaybenne/src/jaybenne/jaybenne.hpp:38,
                 from /home/runner/work/artemis/artemis/external/jaybenne/src/jaybenne/sample_ddmc_bface.cpp:18:
/home/runner/work/artemis/artemis/src/artemis.hpp:25:10: fatal error: singularity-eos/eos/eos.hpp: No such file or directory
   25 | #include <singularity-eos/eos/eos.hpp>
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from /home/runner/work/artemis/artemis/src/utils/eos/eos.hpp:16,
                 from /home/runner/work/artemis/artemis/tst/build/external/jaybenne/src/jaybenne/jaybenne_config.hpp:19,
                 from /home/runner/work/artemis/artemis/external/jaybenne/src/jaybenne/jaybenne.hpp:38,
                 from /home/runner/work/artemis/artemis/external/jaybenne/src/jaybenne/transport.cpp:18:
/home/runner/work/artemis/artemis/src/artemis.hpp:25:10: fatal error: singularity-eos/eos/eos.hpp: No such file or directory
   25 | #include <singularity-eos/eos/eos.hpp>
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@adamdempsey90 adamdempsey90 mentioned this pull request Jan 13, 2025
3 tasks
@pdmullen
Copy link
Collaborator

Totally fine with bumping singularity version here, but I think there is some confusion about what singularity provides and what we want (i.e., mu). But let's move that to the other PR, as this bump can go in independent of what is decided in #45

@adamdempsey90 adamdempsey90 merged commit 6c2a7a8 into develop Jan 18, 2025
4 checks passed
@adamdempsey90 adamdempsey90 deleted the dempsey/singularity branch January 18, 2025 16:05
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