Skip to content

move aod merger to O2#11812

Merged
ktf merged 3 commits into
AliceO2Group:devfrom
jgrosseo:dev
Aug 28, 2023
Merged

move aod merger to O2#11812
ktf merged 3 commits into
AliceO2Group:devfrom
jgrosseo:dev

Conversation

@jgrosseo
Copy link
Copy Markdown
Collaborator

@jgrosseo jgrosseo commented Aug 24, 2023

No description provided.

@jgrosseo
Copy link
Copy Markdown
Collaborator Author

jgrosseo commented Aug 24, 2023

@davidrohr @sawenzel Here the draft of moving it to O2. Let me know if you have comments...

davidrohr
davidrohr previously approved these changes Aug 24, 2023
View reviewed changes
Copy link
Copy Markdown
Collaborator

@davidrohr davidrohr left a comment

Choose a reason for hiding this comment

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

fine with me, you can mark as ready for review to run the CI.

@jgrosseo jgrosseo marked this pull request as ready for review August 24, 2023 10:53
@jgrosseo jgrosseo requested a review from a team as a code owner August 24, 2023 10:53
@sawenzel
Copy link
Copy Markdown
Collaborator

sawenzel commented Aug 28, 2023

Thanks a lot!

@ktf ktf merged commit f52ec15 into AliceO2Group:dev Aug 28, 2023
@davidrohr
Copy link
Copy Markdown
Collaborator

davidrohr commented Aug 28, 2023

@jgrosseo : could you please fix this warning, which made it through:

2023-08-28@20:53:44:DEBUG:O2:O2:0: /home/qon/alice/sw/SOURCES/O2/dev/0/Framework/AODMerger/src/aodMerger.cxx: In function 'int main(int, char**)':
2023-08-28@20:53:44:DEBUG:O2:O2:0: /home/qon/alice/sw/SOURCES/O2/dev/0/Framework/AODMerger/src/aodMerger.cxx:453:48: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type 'long unsigned int' [-Wformat=]
2023-08-28@20:53:44:DEBUG:O2:O2:0:   453 |         printf("  Tree %20s | Compressed: %12llu (%2.0f%%) | Uncompressed: %12llu (%2.0f%%)\n", tree.first.c_str(), tree.second, 100.0 * tree.second / totalCompressed, sizeUncompressed[tree.first], 100.0 * sizeUncompressed[tree.first] / totalUncompressed);
2023-08-28@20:53:44:DEBUG:O2:O2:0:       |                                           ~~~~~^                                                                    ~~~~~~~~~~~
2023-08-28@20:53:44:DEBUG:O2:O2:0:       |                                                |                                                                         |
2023-08-28@20:53:44:DEBUG:O2:O2:0:       |                                                long long unsigned int                                                    long unsigned int
2023-08-28@20:53:44:DEBUG:O2:O2:0:       |                                           %12lu
2023-08-28@20:53:44:DEBUG:O2:O2:0: /home/qon/alice/sw/SOURCES/O2/dev/0/Framework/AODMerger/src/aodMerger.cxx:453:81: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 5 has type 'std::map<std::__cxx11::basic_string<char>, long unsigned int>::mapped_type' {aka 'long unsigned int'} [-Wformat=]
2023-08-28@20:53:44:DEBUG:O2:O2:0:   453 |         printf("  Tree %20s | Compressed: %12llu (%2.0f%%) | Uncompressed: %12llu (%2.0f%%)\n", tree.first.c_str(), tree.second, 100.0 * tree.second / totalCompressed, sizeUncompressed[tree.first], 100.0 * sizeUncompressed[tree.first] / totalUncompressed);

@jgrosseo jgrosseo mentioned this pull request Aug 29, 2023
Merged
@jgrosseo
Copy link
Copy Markdown
Collaborator Author

jgrosseo commented Aug 29, 2023

@jgrosseo : could you please fix this warning, which made it through:

2023-08-28@20:53:44:DEBUG:O2:O2:0: /home/qon/alice/sw/SOURCES/O2/dev/0/Framework/AODMerger/src/aodMerger.cxx: In function 'int main(int, char**)':
2023-08-28@20:53:44:DEBUG:O2:O2:0: /home/qon/alice/sw/SOURCES/O2/dev/0/Framework/AODMerger/src/aodMerger.cxx:453:48: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type 'long unsigned int' [-Wformat=]
2023-08-28@20:53:44:DEBUG:O2:O2:0:   453 |         printf("  Tree %20s | Compressed: %12llu (%2.0f%%) | Uncompressed: %12llu (%2.0f%%)\n", tree.first.c_str(), tree.second, 100.0 * tree.second / totalCompressed, sizeUncompressed[tree.first], 100.0 * sizeUncompressed[tree.first] / totalUncompressed);
2023-08-28@20:53:44:DEBUG:O2:O2:0:       |                                           ~~~~~^                                                                    ~~~~~~~~~~~
2023-08-28@20:53:44:DEBUG:O2:O2:0:       |                                                |                                                                         |
2023-08-28@20:53:44:DEBUG:O2:O2:0:       |                                                long long unsigned int                                                    long unsigned int
2023-08-28@20:53:44:DEBUG:O2:O2:0:       |                                           %12lu
2023-08-28@20:53:44:DEBUG:O2:O2:0: /home/qon/alice/sw/SOURCES/O2/dev/0/Framework/AODMerger/src/aodMerger.cxx:453:81: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 5 has type 'std::map<std::__cxx11::basic_string<char>, long unsigned int>::mapped_type' {aka 'long unsigned int'} [-Wformat=]
2023-08-28@20:53:44:DEBUG:O2:O2:0:   453 |         printf("  Tree %20s | Compressed: %12llu (%2.0f%%) | Uncompressed: %12llu (%2.0f%%)\n", tree.first.c_str(), tree.second, 100.0 * tree.second / totalCompressed, sizeUncompressed[tree.first], 100.0 * sizeUncompressed[tree.first] / totalUncompressed);

Actually it was lu before but for Mac I had to change it to llu (see last commit in this PR). I am not sure how to solve it then...

@jgrosseo
Copy link
Copy Markdown
Collaborator Author

jgrosseo commented Aug 29, 2023

I haven't even tested the llu run time I admit.

@ddobrigk
Copy link
Copy Markdown
Contributor

ddobrigk commented Aug 29, 2023

Super thanks @jgrosseo :-D
(this was really in the wrong place before ...)

nbize pushed a commit to nbize/AliceO2 that referenced this pull request Aug 31, 2023
@jgrosseo @nbize
move aod merger to O2 (AliceO2Group#11812)
eda4059
@davidrohr
Copy link
Copy Markdown
Collaborator

davidrohr commented Sep 5, 2023

@jgrosseo : could you please fix this warning, which made it through:

2023-08-28@20:53:44:DEBUG:O2:O2:0: /home/qon/alice/sw/SOURCES/O2/dev/0/Framework/AODMerger/src/aodMerger.cxx: In function 'int main(int, char**)':
2023-08-28@20:53:44:DEBUG:O2:O2:0: /home/qon/alice/sw/SOURCES/O2/dev/0/Framework/AODMerger/src/aodMerger.cxx:453:48: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type 'long unsigned int' [-Wformat=]
2023-08-28@20:53:44:DEBUG:O2:O2:0:   453 |         printf("  Tree %20s | Compressed: %12llu (%2.0f%%) | Uncompressed: %12llu (%2.0f%%)\n", tree.first.c_str(), tree.second, 100.0 * tree.second / totalCompressed, sizeUncompressed[tree.first], 100.0 * sizeUncompressed[tree.first] / totalUncompressed);
2023-08-28@20:53:44:DEBUG:O2:O2:0:       |                                           ~~~~~^                                                                    ~~~~~~~~~~~
2023-08-28@20:53:44:DEBUG:O2:O2:0:       |                                                |                                                                         |
2023-08-28@20:53:44:DEBUG:O2:O2:0:       |                                                long long unsigned int                                                    long unsigned int
2023-08-28@20:53:44:DEBUG:O2:O2:0:       |                                           %12lu
2023-08-28@20:53:44:DEBUG:O2:O2:0: /home/qon/alice/sw/SOURCES/O2/dev/0/Framework/AODMerger/src/aodMerger.cxx:453:81: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 5 has type 'std::map<std::__cxx11::basic_string<char>, long unsigned int>::mapped_type' {aka 'long unsigned int'} [-Wformat=]
2023-08-28@20:53:44:DEBUG:O2:O2:0:   453 |         printf("  Tree %20s | Compressed: %12llu (%2.0f%%) | Uncompressed: %12llu (%2.0f%%)\n", tree.first.c_str(), tree.second, 100.0 * tree.second / totalCompressed, sizeUncompressed[tree.first], 100.0 * sizeUncompressed[tree.first] / totalUncompressed);

Actually it was lu before but for Mac I had to change it to llu (see last commit in this PR). I am not sure how to solve it then...

@ktf : could you have a look and solve it? I remember you solved a similar issue in framework recently. When I changed it to %lu, it was complaining on macos...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sawenzel sawenzel sawenzel approved these changes

@davidrohr davidrohr davidrohr left review comments

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jgrosseo @sawenzel @davidrohr @ddobrigk @ktf