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.

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

Unify master jobs #870

Closed
wants to merge 71 commits into from
Closed

Unify master jobs #870

wants to merge 71 commits into from

Conversation

samwaseda
Copy link
Member

@samwaseda samwaseda commented Oct 24, 2022

Part of the reason why this PR is failing is because InteractiveWrapper does (not) do something that ParallelMaster and SerialMaster do (not). So far I failed to see what's exactly the difference, but in the meantime I try to put them closer, because a lot of functions are repeated, even though they all derive from GenericMaster.

Main changes

  • input defined in GenericMaster
  • collect_output defined in GenericMaster, which now collects everything in output/generic
  • Make SerialMaster compatible with interactive jobs
  • SerialMaster should launch the next calculation only when convergence_goal returns a job

@samwaseda samwaseda marked this pull request as draft October 24, 2022 06:51
@samwaseda samwaseda added integration Start the integration tests with pyiron_atomistics/contrib for this PR enhancement New feature or request labels Oct 24, 2022
if self._start_job is not None:
return self._start_job
elif len(self) > 0:
self._start_job = self[-1]
Copy link
Member

Choose a reason for hiding this comment

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

self[-1] is not the same as self[0]

Copy link
Member Author

Choose a reason for hiding this comment

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

I understand that they don't have the same effect, but I don't see why we should have different definitions for SerialMaster and ParallelMaster here

@jan-janssen
Copy link
Member

The behavior of the SerialMaster and the ParallelMaster differ, that is the reason why it is implemented in different classes.

@samwaseda
Copy link
Member Author

The behavior of the SerialMaster and the ParallelMaster differ, that is the reason why it is implemented in different classes.

I know that they are not the same, so I'm also not trying to have one class out of them.

@samwaseda
Copy link
Member Author

My biggest problem is that I've been working on this PR for more than half a year now without being able to figure out what's the right solution. This has been a huge problem for me because I cannot easily move on as it's part of the fundamental SPHInX functionality. Since it looks like the combination of SPHInX and ParallelMaster seems to be working, I'm trying to see where the difference between ParallelMaster and InteractiveWrapper comes from.

@samwaseda samwaseda added the format_black reformat the code using the black standard label Nov 8, 2022
@samwaseda
Copy link
Member Author

@pmrv and @ligerzero-ai : Here I am adding docstrings to some of the classes we talked about yesterday. Let me know what you think and feel free to make suggestions.

Copy link
Member

@jan-janssen jan-janssen left a comment

Choose a reason for hiding this comment

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

For me this pull request tries to do too many things at once, can we split it in multiple pull request? For example we could have one to unify the write_input functions and so on.

@samwaseda
Copy link
Member Author

samwaseda commented Nov 28, 2022

For example we could have one to unify the write_input functions and so on.

This PR just moves the location of write_input without changing literally anything in functionality. Feel free to open another PR when this is done, but the change you are suggesting has nothing to do with this PR.

@samwaseda
Copy link
Member Author

Can I merge this one? @jan-janssen

Have you tested the notebooks in pyiron_atomistics ? I mean in particular the phonopy notebook and the pipeline notebook?

They are not included in the integration tests?

@jan-janssen
Copy link
Member

They are not included in the integration tests?

Notebooks are not included in integration tests

@samwaseda
Copy link
Member Author

For me this pull request tries to do too many things at once, can we split it in multiple pull request?

Yes I can, but your suggestion makes only sense if the changes are entangled or there are conceptually multiple changes, which is not the case here. From what I am seeing right now, you are pointing out individual changes which have nothing to do with each other. In the end, for the changes I'm proposing here it shouldn't matter whether there are n times small PR, each of which takes a shorter time to review, or one time this PR which takes n times the amount of time.

@jan-janssen
Copy link
Member

@samwaseda I created three examples how the changes in this pull request can be split in small changes, which are easy to review: #914 , #915 and #916 . I hope this helps to demonstrate what I meant with separate pull requests, rather than one big one.

@samwaseda
Copy link
Member Author

Whatever.

@samwaseda samwaseda closed this Nov 29, 2022
@samwaseda samwaseda deleted the interactivewrapper branch November 29, 2022 07:40
@jan-janssen jan-janssen restored the interactivewrapper branch November 29, 2022 22:23
@jan-janssen jan-janssen reopened this Nov 29, 2022
@jan-janssen jan-janssen marked this pull request as draft November 29, 2022 22:40
@stale
Copy link

stale bot commented Dec 31, 2022

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the stale label Dec 31, 2022
@stale stale bot closed this Jan 17, 2023
@samwaseda samwaseda deleted the interactivewrapper branch May 23, 2024 13:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request format_black reformat the code using the black standard integration Start the integration tests with pyiron_atomistics/contrib for this PR stale
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants