-
Notifications
You must be signed in to change notification settings - Fork 179
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 current apt build #1529
Update current apt build #1529
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this comment will fix your failed runs.
@gonuke now that we are using OpenMC v0.14.0, we need to regenerate the statepoint file. (see forum post) How should I go about this? This is currently causing the OpenMC file to fail. Also, we had to go back to installing MOAB v5.3.0 because v5.5.0 uses Cython3, and we don't have the Cython3 compatibility fix in PyNE yet. (This was causing the MOAB, DAGMC, and OpenMC tests to fail). We will have to update MOAB in the same (future) PR where we update to Cython3 in PyNE. |
What's the prospect of updating everything to Cython3 as part of this process, rather than the other way around? |
Sure, we can. Only thing we need to do is merging cython3-upgrade branch into our current setup. P.S. Apologies for my recent inactivity; I'm currently on leave. |
96504dd
to
1361c50
Compare
I rebased my branch onto the cython3-update branch. There were tests that were failing in As for the moab, dagmc, openmc, tests, they were failing due to the same |
docker/ubuntu_22.04-dev.dockerfile
Outdated
RUN cd $HOME/opt \ | ||
&& mkdir hdf5 \ | ||
&& cd hdf5 \ | ||
&& git clone --single-branch --branch hdf5-1_14_3 https://github.com/HDFGroup/hdf5.git \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shouild this line make use of the ARG build_hdf5 value
&& git clone --single-branch --branch hdf5-1_14_3 https://github.com/HDFGroup/hdf5.git \ | |
&& git clone --single-branch --branch $build_hdf5 https://github.com/HDFGroup/hdf5.git \ |
docker/ubuntu_22.04-dev.dockerfile
Outdated
&& mkdir moab \ | ||
&& cd moab \ | ||
&& git clone --depth 1 --single-branch -b 5.3.0 https://bitbucket.org/fathomteam/moab \ | ||
&& git clone --depth 1 --single-branch -b 5.5.1 https://bitbucket.org/fathomteam/moab \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we could make the moab version a ARG which defaults to 5.5.1
docker/ubuntu_22.04-dev.dockerfile
Outdated
git clone https://github.com/openmc-dev/openmc.git $HOME/opt/openmc \ | ||
&& cd $HOME/opt/openmc \ | ||
&& git checkout tags/v0.13.0 \ | ||
&& git checkout tags/v0.14.0 \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could make the HDF5 version an ARG which defaults to 0.14.0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is an openmc version, but yes, your point is well-taken
docker/ubuntu_22.04-dev.dockerfile
Outdated
RUN if [ "$build_hdf5" != "NO" ]; then \ | ||
export HDF5_ROOT="$HDF5_INSTALL_PATH" ; \ | ||
fi ;\ | ||
RUN export HDF5_ROOT="$HDF5_INSTALL_PATH" ; \ | ||
git clone https://github.com/openmc-dev/openmc.git $HOME/opt/openmc \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we can clone the specific tag release instead of cloning the repo and checking out the tag
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
git clone --depth 1 --branch ${openmc_version} https://github.com/openmc-dev/openmc.git $HOME/opt/openmc \
I've issued a PR in MOAB to hopefully fix this problem. |
Alternatively, we may need to |
But first... let's update to the newest MOAB (5.5.1) to see if/how this error presents itself. |
But we were already building and testing moab 5.5.1, ever since this commit. I'll test the |
Seems like the |
I see the 5 year old statepoint file on the repo but I don't see any scripts that generated it. I also looked for (but couldn't see) a summary.h5 file in case it was present as I think that contains the openmc model so could e helpful to regenerate the statepoint. |
Sorry - my bad - I was looking at the comment by @shimwell and misinterpreted it as suggested change. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Clarification on value of mesh tag default
when ValueErrror
pyne/mesh.py
Outdated
try: | ||
self.default = self.tag.get_default_value() | ||
except ValueError: | ||
self.default = int |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should be None
We may need to work backwards from the things that are tested in
I think those are the only things that are true. We should make an openmc python script that will generate something like this and add it to the repo. That sounds a like something that @shimwell would be great at :) |
… test_openmc_utils
I have had a go at this in PR #1533 |
add script to generate statepoint file, update statepoint filename test_openmc_utils.py
After making these 2 changes to
and regenerating the statepoint file, the @gonuke I think this is ready to be merged now since all the relevant tests are passing. |
Just to summarize my understanding of why the remaining
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please incorporate @shimwell 's suggestions of using more build-args w/ default values for the Dockerfile, and cloning single branches.
@gonuke I just applied @shimwell's suggestions, though I'm not sure if they are necessary. The build-args for I also updated |
Thanks @bquan0 - let's go forward with this and see how it all goes once the images are updated |
Description
This PR updates the versions of OpenMC, MOAB, and hdf5 that are built in
docker_publish.yml
andubuntu_22.04-dev.dockerfile
. It also removes the build without hdf5 so that we always build hdf5. It also doesn't download the apt dependencieslibhdf5-dev
andhdf5-tools
so that they come directly from the hdf5 build and are the most up-to-date version.Motivation and Context
There are new versions of MOAB and OPENMC that we should use. Also, linux is slow to update hdf5, so we should always build it so we have the most recent version.
Behavior
Previously, we had one build with hdf5 and one build without. Now, we will always build with hdf5. This means removing a bunch of the matrices in
docker_publish.yml
used for having an hdf5 build and a no-hdf5 build. I also removed the build arg that allowsdocker_publish.yml
to specify which version of hdf5 to build. Now, it's just hardcoded into the dockerfile in the hdf5 build section.The version changes are: