-
Notifications
You must be signed in to change notification settings - Fork 27
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
[DO NOT MERGE] Unmerged changes in v0.10.0-RC branch #1421
Conversation
and fix merge conflicts
Darn. Removing the check worked for Azure because every job run is a fresh build. Just realizing makes sense it would fail running the unit tests again. I'll try to debug this in the Windows Azure build, should hopefully fix things on your desktop as well. |
What is happening is that the program still has handles open to the file: they haven't been closed. I confirmed this by running Process Explorer. On Linux, unlink() it doesn't care: it just deletes the file. If you want to delete a file on Windows you have to close all open handles, otherwise _unlink() fails. |
🤦 I didn't close the files prior to attempting to delete. Trying that now. |
@bmhan12 if you have changes to make related to closing files, feel free to do that on this RC branch or on a separate PR. Whichever you prefer. |
So in order for I see that GenericOutputStream is built to deal with ostream, which is an abstraction level above ofstream. The ofstream gets closed in its destructor (https://en.cppreference.com/w/cpp/io/basic_ofstream/close, see "Notes") and the GenericOutputStream deletes its ostream in ~GenericOutputStream, so before deleting the files, we could tell slic to delete all output streams. @white238 , what do you think? |
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.
Looks good, but I'd like to take a pass through the RELEASE_NOTES before the release.
Also, should we add a line to the RELEASE_NOTES
about dropping support for XL?
(Note: I'm intentionally not approving this to ensure the branch doesn't get merged into develop)
set(CMAKE_CUDA_FLAGS "" CACHE STRING "") | ||
|
||
set(ENABLE_CUDA ON CACHE BOOL "") | ||
|
||
set(CMAKE_CUDA_SEPARABLE_COMPILATION ON CACHE BOOL "") | ||
|
||
set(CMAKE_CUDA_ARCHITECTURES "70" CACHE STRING "") | ||
|
||
set(CMAKE_CUDA_FLAGS "-restrict --expt-extended-lambda " CACHE STRING "") | ||
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -restrict --expt-extended-lambda " CACHE STRING "" FORCE) |
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.
Do we know why there are now two lines for CMAKE_CUDA_FLAGS
?
I'm pretty sure the second CMAKE_CUDA_FLAGS
w/ FORCE
will overwrite the first one, so it's not a problem, but it does seem a bit weird to have both.
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 have no idea why there are two lines for CMAKE_CUDA_FLAGS
. I just ran the scripts to generate the new host-configs.
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.
It's likely related to the class hierarchy for packages in Spack.
Thoughts @white238 ?
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.
There were some changes in spack. This was reviewed in a previous PR. The original line comes from CachedCMakePackage and the later is added by us.
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.
A note about no longer supporting XL has been added to the release notes.
RELEASE-NOTES.md
Outdated
### Removed | ||
|
||
|
||
## [Version 0.10.0] - Release date 2024-09-xx |
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 update the links for axom@0.10
and axom@0.9
at the bottom of this file
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.
Done.
RELEASE-NOTES.md
Outdated
### Changed | ||
- Updates to [Conduit version 0.9.2][https://github.com/LLNL/conduit/releases/tag/v0.9.2] | ||
- Updates to [RAJA version 2024.07.0][https://github.com/LLNL/RAJA/releases/tag/v2024.07.0] | ||
- Updates to [camp version 2024.07.0][https://github.com/LLNL/camp/releases/tag/v2024.07.0] | ||
- Updates to [Umpire version 2024.07.0][https://github.com/LLNL/Umpire/releases/tag/v2024.07.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.
Please merge these four lines w/ the existing Changed
section for axom@0.10 a few lines down (below Added
)
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 don't understand. This follows what is done for other releases that have updated TPL versions.
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.
There are two Changed
sections for this release -- https://github.com/LLNL/axom/blob/b1f5bbc7c617faaf28643f0f88184ccc7d52eae2/RELEASE-NOTES.md
I can take care of the fix
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 see what you mean now. I thought the TPL version updates should be up front so they are more obvious. But, whatever you prefer is fine with me.
Really nice find @agcapps! axom/src/axom/core/utilities/FileUtilities.hpp Lines 86 to 92 in 24751dd
|
@@ -17,10 +17,10 @@ The format of this file is based on [Keep a Changelog](http://keepachangelog.com | |||
|
|||
The Axom project release numbers follow [Semantic Versioning](http://semver.org/spec/v2.0.0.html). | |||
|
|||
## [Unreleased] - Release date yyyy-mm-dd |
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.
@rhornung67 -- I removed the empty Unreleased
section for the release. We'll add it back when we merge main to develop
Summary
Please review this PR, but approve #1425 for merging.