-
Notifications
You must be signed in to change notification settings - Fork 13
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
Kernel #169
base: master
Are you sure you want to change the base?
Conversation
Sorry for the delay @linneamk . Our CI tests are currently broken because we were using Travis-CI who changed their business model and stopped offering their free open source software support. We will have to switch to GitHub Actions before we can run CI again. If anyone else can verify manually that this PR is passing the tests I am happy to merge it. |
Could you rebase this PR? We just merged a fix for CI into master. |
I rebased the change. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The CI tests are failing:
https://github.com/lanl/qmd-progress/runs/2745932751?check_suite_focus=true#step:5:639
Please have a look.
Hi! Sorry for my delay, I have updated my code and fixed the test. |
Thanks @linneamk . You need to rebase your changes. Right now the merge conflicts prevent us from merging the pull request. Thanks! |
Thanks @linneamk . Something went wrong during the rebase though. What commands did you run to rebase? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you need help cleaning up your rebase?
Hi @linneamk I spent a good hour just now trying to rebase your commits onto the current You had based the original PR on a rather old commit (4e73df7). I rebased that commit in #169 (comment) as 0d6316b. However, you ignored that rebase and force pushed 02e93a6 which was still based on this old commit. After asking you to rebase you merged your branch with
and it's unclear to me whether your changes are even correctly represented in your branch. Merging does not always produce the desired code since the merging algorithm is really pretty dumb because it doesn't know what your intention and the intention of the person making changes in the branch you merged with was when the changes were made. It's really a best guess kind of effort. Could you carefully go through your original changes and apply them to a fresh branch that is based on the current Please don't hesitate to ask if any of what I wrote is unclear. Thanks. |
Hi! Wow, I'm sorry and thank you for trying to clean up my mess 😅 I will try to create a new branch and commit my changes to, I'll |
Thanks @linneamk ! Don't hesitate to ask if you run into any difficulties. |
@linneamk Are you still working on this one? Or did these changes make it into another PR? |
O(N) implementation of pre-conditioned kernel calculation using implicit Fermi-Dirac response calculations.
This change is