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.

Sign up for GitHub

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

Jump to bottom

Backport from master #4374

Merged
merged 14 commits into from
Oct 25, 2024
Merged

Backport from master #4374

merged 14 commits into from
Oct 25, 2024

Conversation

vicentebolea
Copy link
Collaborator

@vicentebolea vicentebolea commented Oct 23, 2024 •
edited
Loading

Backported PRs:

@vicentebolea vicentebolea force-pushed the backport-from-master branch 3 times, most recently from 89ad484 to 6dc6a63 Compare October 23, 2024 23:20
eisenhauer
eisenhauer previously approved these changes Oct 24, 2024
View reviewed changes
@vicentebolea vicentebolea changed the title Backport from master Draft: Backport from master Oct 24, 2024
@vicentebolea
Copy link
Collaborator Author

Current state of this branch is API/ABI Compliant.

@vicentebolea vicentebolea changed the title Draft: Backport from master Backport from master Oct 24, 2024
eisenhauer
eisenhauer previously approved these changes Oct 24, 2024
View reviewed changes
anagainaru
anagainaru reviewed Oct 24, 2024
View reviewed changes
Copy link
Contributor

@anagainaru anagainaru left a comment

Choose a reason for hiding this comment

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

I'll approve once we get the bug fix in as well

@vicentebolea vicentebolea dismissed eisenhauer’s stale review October 24, 2024 17:43

The merge-base changed after approval.

franzpoeschel and others added 14 commits October 24, 2024 19:20
@franzpoeschel @vicentebolea
Add defines for BP3, BP4 and BP5 (ornladios#4191)
12d31f8 
(cherry picked from commit c52d755)
@anagainaru @vicentebolea
Patch for when both xrootd and derived variables are activated (ornla…
e53bf99 
…dios#4200)

Co-authored-by: Greg Eisenhauer <eisen@cc.gatech.edu>
(cherry picked from commit 8cd2d94)
@anagainaru @vicentebolea
Merge pull request ornladios#4207 from anagainaru/hide-symbols
af5d9ce 
Limit the exposed symbols related to derived variables

(cherry picked from commit c297022)
@anagainaru @vicentebolea
Switch from ROCM_VERSION_MAJOR to HIP_VERSION_MAJOR (ornladios#4222)
76c5407 
(cherry picked from commit 1727527)
@vicentebolea
Update ReadMe.md (ornladios#4243)
72393da 
(cherry picked from commit 5801c77)
@anagainaru @vicentebolea
Derived variables of type StoreData should not record the expression …
7decb45 
…string (ornladios#4247)

(cherry picked from commit b6242e8)
@anagainaru @vicentebolea
Merge pull request ornladios#4293 from anagainaru/check_parser_lexer
d5e6588 
Fixing parser/lexer related errors

(cherry picked from commit ce65895)
@vicentebolea
Merge pull request ornladios#4303 from anagainaru/build-frontier
52d0f65 
Update the script to build adios with Kokkos for Frontier

(cherry picked from commit c837711)
@pnorbert @vicentebolea
Fix in python API: (ornladios#4331)
76b78ac 
* Fix in python API: a. BlocksInfo(name, step)  b. stream.write() sets selection if either 'start' or 'count' is provided (fix for local arrays).

* format

* black

(cherry picked from commit fa5d3aa)
@pnorbert @vicentebolea
Fix an issue when reading blocks in streaming mode, when some produce…
6b97bf5 
…rs did not write any block to output. (ornladios#4332)

(cherry picked from commit 75d801f)
@pnorbert @vicentebolea
Compress the lossless part of MGARD data with Zstd. It was uncompress…
055b519 
…ed until now. (ornladios#4339)

$ ctest -R MGARD.*/.*BP5.Serial
$ find testing/adios2/engine/bp/operations/bp5 -name "*bp" -exec du -sh {} \;
48K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD3DSel_0.00001.bp
40K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD1DSel_0.00001.bp
60K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD2D_0.01.bp
36K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD3D_0.00001.bp
44K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD2DSel_0.0001.bp
40K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD1D_0.00001.bp
36K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD3D_0.0001.bp
40K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD1DSel_0.0001.bp
32K     testing/adios2/engine/bp/operations/bp5/BPWRMGARDNull_0.01.bp
40K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD1D_0.001.bp
60K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD2D_0.00001.bp
32K     testing/adios2/engine/bp/operations/bp5/BPWRMGARDNull_0.001.bp
44K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD2DSel_0.01.bp
40K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD1DSel_0.001.bp
60K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD2D_0.001.bp
32K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD3D_0.001.bp
44K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD2DSel_0.001.bp
40K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD1D_0.0001.bp
40K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD1D_0.01.bp
44K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD3DSel_0.001.bp
44K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD3DSel_0.01.bp
32K     testing/adios2/engine/bp/operations/bp5/BPWRMGARDNull_0.0001.bp
32K     testing/adios2/engine/bp/operations/bp5/BPWRMGARDNull_0.00001.bp
60K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD2D_0.0001.bp
32K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD3D_0.01.bp
44K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD2DSel_0.00001.bp
40K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD1DSel_0.01.bp
44K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD3DSel_0.0001.bp

Before this commit:

$ find testing/adios2/engine/bp/operations/bp5 -name "*bp" -exec du -sh {} \;
352K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD3DSel_0.00001.bp
176K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD1DSel_0.00001.bp
60K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD2D_0.01.bp
96K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD3D_0.00001.bp
176K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD2DSel_0.0001.bp
176K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD1D_0.00001.bp
96K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD3D_0.0001.bp
176K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD1DSel_0.0001.bp
100K    testing/adios2/engine/bp/operations/bp5/BPWRMGARDNull_0.01.bp
176K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD1D_0.001.bp
60K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD2D_0.00001.bp
100K    testing/adios2/engine/bp/operations/bp5/BPWRMGARDNull_0.001.bp
176K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD2DSel_0.01.bp
176K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD1DSel_0.001.bp
60K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD2D_0.001.bp
96K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD3D_0.001.bp
176K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD2DSel_0.001.bp
176K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD1D_0.0001.bp
176K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD1D_0.01.bp
352K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD3DSel_0.001.bp
344K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD3DSel_0.01.bp
100K    testing/adios2/engine/bp/operations/bp5/BPWRMGARDNull_0.0001.bp
100K    testing/adios2/engine/bp/operations/bp5/BPWRMGARDNull_0.00001.bp
60K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD2D_0.0001.bp
96K     testing/adios2/engine/bp/operations/bp5/BPWRMGARD3D_0.01.bp
176K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD2DSel_0.00001.bp
176K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD1DSel_0.01.bp
352K    testing/adios2/engine/bp/operations/bp5/BPWRMGARD3DSel_0.0001.bp

(cherry picked from commit d1d871b)
@anagainaru @vicentebolea
Merge pull request ornladios#4343 from anagainaru/gpuSpan
f6ee363 
Setting the memory space for Spans to Host

(cherry picked from commit d975ac0)
@anagainaru @vicentebolea
Merge pull request ornladios#4346 from anagainaru/memSelLayout
079e5af 
Update the memory selection layout when there is a layout mismatch

(cherry picked from commit 24c3860)
@eisenhauer @vicentebolea
Fix missing int64_t definition (ornladios#4365)
74698a4 
(cherry picked from commit 90f96e3)
@vicentebolea
Copy link
Collaborator Author

ABI test passing:

Screenshot from 2024-10-24 20-28-16

@vicentebolea vicentebolea merged commit cb871e7 into ornladios:release_210 Oct 25, 2024
37 checks passed
@vicentebolea vicentebolea deleted the backport-from-master branch October 25, 2024 00:51
@vicentebolea vicentebolea mentioned this pull request Oct 26, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eisenhauer eisenhauer eisenhauer approved these changes

@anagainaru anagainaru Awaiting requested review from anagainaru anagainaru is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@vicentebolea @eisenhauer @anagainaru @franzpoeschel @pnorbert