Fix #51 #57
Merged
Fix #51 #57
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- show difference fortran numba - with and without multiprocessing
|
@mbakker7 I merged the dev branch into mine... I realized too late that master contained the latest changes. Not sure if there were changes on dev that aren't supposed to be pulled into master? |
|
Oops, sorry. That dev branch was a leftover from 3 years ago and should be
deleted.
Can you apply your additions to the master branch? Once you have recovered
your stuff, we can delete the dev branch to avoid any more confusion. We
can then make a new dev branch later for new developments.
…On Wed, Nov 9, 2022 at 5:07 PM Davíd Brakenhoff ***@***.***> wrote:
@mbakker7 <https://github.com/mbakker7> I merged the dev branch into
mine... I realized too late that master contained the latest changes. Not
sure if there were changes on dev that aren't supposed to be pulled into
master?
—
Reply to this email directly, view it on GitHub
<#57 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAKM3SG5RYURQGZGUGZCXRTWHPD3LANCNFSM6AAAAAAR3S5GIA>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
1b6587c to
d284e9b
Compare
|
I removed the dev merge commit and redid the master merge. So I think it should be good now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Solve multiprocessing issue, add notebook comparing fortran/numba with/without multiprocessing.