cwg:
I have no statistics on this, but I prefer our approach: fix problems on stable in stable, and merge this into master. Since we've been doing this consistently (except when we forgot), we could simply continue.
I have no statistics on this, but I prefer our approach: fix problems on stable in stable, and merge this into master. Since we've been doing this consistently (except when we forgot), we could simply continue.
slavoutich:
I agree, the difference is not too important. I will rearrange changes on top of stable.
I agree, the difference is not too important. I will rearrange changes on top of stable.
cwg:
Yeah, it's not meant to happen. But then also our INSTALL.rst says:
Kwant tarballs include the Cython generated files, and cythonization is disabled when building not from git. If ever necessary, this default can be overridden by giving the
--cythonoption to setup.py.
anton-akhmerov:
We don't even specify the cython version 🤔
We don't even specify the cython version 🤔
slavoutich:
I still think that "fix in master, cherry-pick to stable" approach is better if we would have to maintain several stable branches.
I still think that "fix in master, cherry-pick to stable" approach is better if we would have to maintain several stable branches.
cwg:
But I'm not going to fight over this, I only think that since this is a recommendation of the Cython authors, and it has been working all the time (except now), that's not enough of a reason to change it.
But I'm not going to fight over this, I only think that since this is a recommendation of the Cython authors, and it has been working all the time (except now), that's not enough of a reason to change it.
cwg:
What I'm trying to say: if you're really motivated, go and remove it. :-)
What I'm trying to say: if you're really motivated, go and remove it. :-)
cwg:
But with Slava's change I think we can actually release 1.4.3 and this will solve the problem as well.
But with Slava's change I think we can actually release 1.4.3 and this will solve the problem as well.
anton-akhmerov:
I'm good. I've removed a few hundred other lines
I'm good. I've removed a few hundred other lines
cwg:
BTW, I've been looking at the vectorization stuff, and this is what I think currently: It's still not clear to me why
BTW, I've been looking at the vectorization stuff, and this is what I think currently: It's still not clear to me why
TermOperator is suppsed to correspond to a "Density". Does the TermOperator have an API to disable the summing like kwant.operator.Density?
anton-akhmerov:
BTW @slavoutich thanks for review, I'll incorporate it shortly
BTW @slavoutich thanks for review, I'll incorporate it shortly
cwg:
(Unfortunately I have to leave really soon, I was hoping to start this discussion earlier, but there were always other things.)
(Unfortunately I have to leave really soon, I was hoping to start this discussion earlier, but there were always other things.)
slavoutich:
Didn't know that this is allowed O_O: https://chat.quantumtinkerer.tudelft.nl/files/ngxem9fp37f15q67qumhxgy8po/public?h=45KHqjaYYInMPriQpW-zmxs3n-lVQjcLTCB3-ORQnNs
Didn't know that this is allowed O_O: https://chat.quantumtinkerer.tudelft.nl/files/ngxem9fp37f15q67qumhxgy8po/public?h=45KHqjaYYInMPriQpW-zmxs3n-lVQjcLTCB3-ORQnNs
slavoutich:
@anton-akhmerov Any specific reason for a job failure or just random stuff?
https://gitlab.kwant-project.org/kwant/kwant/-/jobs/210079
@anton-akhmerov Any specific reason for a job failure or just random stuff?
https://gitlab.kwant-project.org/kwant/kwant/-/jobs/210079
anton-akhmerov:
SSH config changed in december due to migrations
SSH config changed in december due to migrations
slavoutich:
Can you pin the relevant commit?
Can you pin the relevant commit?
slavoutich:
This one?
This one?
anton-akhmerov:
Yeah, that's what I get as well
Yeah, that's what I get as well
slavoutich:
Another stone into the discussion how it is better to proceed: even since we are trying to carefully fix in stable and merge to master, we anyway end up with cherry-picking stuff from master into stable.
Another stone into the discussion how it is better to proceed: even since we are trying to carefully fix in stable and merge to master, we anyway end up with cherry-picking stuff from master into stable.
slavoutich:
Any idea why this failure happens?
https://gitlab.kwant-project.org/kwant/kwant/-/jobs/210111
Any idea why this failure happens?
https://gitlab.kwant-project.org/kwant/kwant/-/jobs/210111
anton-akhmerov:
It's a tight cython loop, and coverage increases runtime by a lot.
It's a tight cython loop, and coverage increases runtime by a lot.
slavoutich:
Nope, there are too many changes in master, that are not in stable
Nope, there are too many changes in master, that are not in stable
slavoutich:
And I think that the idea of cherry-picking them is also not perfect. Mind if I just copy the
And I think that the idea of cherry-picking them is also not perfect. Mind if I just copy the
.gitlab-ci.yml from master as a single commit and that's it?
slavoutich:
Should I merge or wait for Christoph?
https://gitlab.kwant-project.org/kwant/kwant/-/merge_requests/392
Should I merge or wait for Christoph?
https://gitlab.kwant-project.org/kwant/kwant/-/merge_requests/392
slavoutich:
Merge, merge, merge!!!
Merge, merge, merge!!!
anton-akhmerov:
my bad. sorry
my bad. sorry
slavoutich:
I think that yes: fixes that are not in master is a sin
I think that yes: fixes that are not in master is a sin
anton-akhmerov:
👍
👍