Skip to content

Conversation

@michaelmckinsey1
Copy link
Contributor

@michaelmckinsey1 michaelmckinsey1 commented Jul 24, 2023

PR from #331 Integrate Caliper

@michaelmckinsey1 michaelmckinsey1 mentioned this pull request Jul 24, 2023
24 tasks
Michael Richard Mckinsey and others added 2 commits July 27, 2023 15:02
@rhornung67
Copy link
Member

@michaelmckinsey1 I merged develop into this and resolved the merge conflicts. When checks pass, is this ready to merge?

@michaelmckinsey1
Copy link
Contributor Author

michaelmckinsey1 commented Jul 29, 2023

@michaelmckinsey1 I merged develop into this and resolved the merge conflicts. When checks pass, is this ready to merge?

1 more issue came up today. Once it is addressed we should be good to go.

@michaelmckinsey1
Copy link
Contributor Author

@michaelmckinsey1 I merged develop into this and resolved the merge conflicts. When checks pass, is this ready to merge?

1 more issue came up today. Once it is addressed we should be good to go.

Done in 51144fb.

Also, @daboehme wanted to cleanup the caliper implementation before the merge, so that will come soon.

@rhornung67
Copy link
Member

Sounds good. I review and get some others to also review when you're ready. Please let me know.

@michaelmckinsey1
Copy link
Contributor Author

@michaelmckinsey1 I merged develop into this and resolved the merge conflicts. When checks pass, is this ready to merge?

1 more issue came up today. Once it is addressed we should be good to go.

Done in 51144fb.

Also, @daboehme wanted to cleanup the caliper implementation before the merge, so that will come soon.

#359

Copy link
Member

@rhornung67 rhornung67 left a comment

Choose a reason for hiding this comment

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

A couple of minor comments.

michaelmckinsey1 and others added 5 commits August 7, 2023 10:09
Co-authored-by: Rich Hornung <hornung1@llnl.gov>
Co-authored-by: Jason Burmark <MrBurmark@users.noreply.github.com>
@artv3
Copy link
Member

artv3 commented Aug 8, 2023

@michaelmckinsey1 do you have any documentation on how to run with caliper and view caliper reports?

@michaelmckinsey1
Copy link
Contributor Author

@michaelmckinsey1 do you have any documentation on how to run with caliper and view caliper reports?

All of that is in the docs/sphinx/user_guide with references to Hatchet and Thicket. If you want to generate something specific, feel free to contact me.

Michael Richard Mckinsey and others added 2 commits August 10, 2023 10:30
@rhornung67
Copy link
Member

@michaelmckinsey1 I merged develop into this. There were several merge conflicts in Executor.cpp that I resolved because I refactored Executor::setupSuite(). When you have time, please take a look to make sure I didn't screw up anything you did. When you are OK with it, I will merge it. Thank you.

@slabasan
Copy link

slabasan commented Aug 14, 2023

Hi @rhornung67, Michael is currently out of office for the beginning of the week as he makes his way home. He and I can take a final look next week at the latest.

@rhornung67
Copy link
Member

No worries.

@michaelmckinsey1
Copy link
Contributor Author

@rhornung67 Fixed and re-merged develop.

@rhornung67
Copy link
Member

@rhornung67 Fixed and re-merged develop.

Thanks for looking over @michaelmckinsey1 I will merge this when checks come back green. It may be a couple of days since our ruby platform is down sue to cooling issues.

@adrienbernede adrienbernede mentioned this pull request Aug 21, 2023
8 tasks
@rhornung67 rhornung67 merged commit eba7def into develop Aug 21, 2023
@rhornung67 rhornung67 deleted the pr-from-fork/331 branch August 21, 2023 18:31
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.

7 participants