-
Notifications
You must be signed in to change notification settings - Fork 189
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
4.0.2rc #2585
4.0.2rc #2585
Conversation
remove unneeded executable permissions from some files
Fix dp3m ifdefs; dawaanr-and-bh-gpu testcase requirements
Core+Test: Changing the time step should not affect particle velocities
EK python interface fix
coulomb and elc testcases can only be run with PARTIAL_PERIODIC enabled
Fixed soft sphere cutoff calculation
Fix typo in Mac installation guide
…ed_potential Fix tabulated potential
core: Make tabulated pair IA not crash if distance is too small
Testsuite: Better testing of vs relative with have_quaternions=true
Register button
This should be merged into the 4.0 branch, not 4.0.1-release, no? |
On Thu, Mar 14, 2019 at 10:47:28AM +0000, Florian Weik wrote:
This should be merged into the 4.0 branch, not 4.0.1-release, no?
I had no intention of merging. I picked the base branch such that
the diff makes sense and can be checked.
|
Codecov Report
@@ Coverage Diff @@
## release-4.0.1 #2585 +/- ##
=============================================
- Coverage 69% 69% -1%
=============================================
Files 470 469 -1
Lines 31842 31839 -3
=============================================
- Hits 22215 22206 -9
- Misses 9627 9633 +6
Continue to review full report at Codecov.
|
* LB GPU: ignore * LB CPU: Runtime error
LBGPU: Don't forget boundaries on on_cell_strucutre_change()
2719: BH-gpu magnetostatics: multiple CPU support and refactoring r=fweik a=psci2195 Fixes espressomd#2500 In general, this fix is important cause it allows a user to parallelize both CPU and GPU calculations: EOM integration and magnetostatics respectively. Description of changes: - Correct dipole prefactor broadcasting among the nodes - New test dds-and-bh-gpu.py is running over 4 CPUs: a comparison between BH and DDS gpu calculations. A new test has been needed because we cannot use dds-cpu as a baseline cause it does not support multiple CPUs. - Some technical debt has been caught up here as well: smart pointers based BH, the AMD GPU skip cleanup, per node test seeding. PR Checklist ------------ - [ ] Tests? - [ ] Interface - [ ] Core - [ ] Docs? Co-authored-by: Bogdan Tanygin <b.m.tanygin@gmail.com> Co-authored-by: Brian Tanygin <b.m.tanygin@gmail.com>
@jngrad could you please give the diff between 4.0.1 and this branch a final check and then set the release process in motion? |
@jngrad did you push to https://github.com/espressomd/espresso/tree/upstream/release-4.0.2 on purpose? Also if some of the ci pipelines are not actually needed please cancel them. They are running the emulated tests, an clog up the CI for hours. |
I know, will |
I think you can only push from local to remote, not remote to remote. But I guess you can just rename the branch on github? |
The GitHub interface only enable branch deletion, not renaming. Solved it by deleting then pushing again with the right name. |
@KaiSzuttor @RudolfWeeber so far we only had branches for the minor versions, not sure how we want to go about this. I would have put the 4.0.2 on the 4.0 branch. |
On Fri, Apr 26, 2019 at 02:35:44PM +0000, Florian Weik wrote:
@KaiSzuttor @RudolfWeeber so far we only had branches for the minor versions, not sure how we want to go about this. I would have put the 4.0.2 on the 4.0 branch.
For 4.0.1, we made a branch, I think.
If I checkout 4.0, that's what I'd expect to get.
|
I agree, but for some reason @KaiSzuttor insisted on keeping the 4.0 branch at 4.0.0 and introducing a branch release-4.0.1 which pointed to the same commit as the v4.0.1 tag. Common practice is that branches should be used for minor versions and tags for patch releases. That would have enabled useful things like allowing other people to post pull request against the release branch... |
Actually, you should expect to get the latest 4.0.x release plus any further bug fixes that have been merged to that branch. If you check out the 4.0.0 tag, you would get precisely that release. |
I agree with @mkuron, also I think in the end we did put 4.0.1 into the 4.0 branch (see https://github.com/espressomd/espresso/branches, no 4.0.1 branch). |
@fweik there is a 4.0.1 branch: https://github.com/espressomd/espresso/branches/stale |
Ok, I still think that keeping patch level branches around is odd, after all the patch release should be compatible, and the previous version contains known bugs (hence the bugfix release), and should not be used anymore. |
Ok, I still think that keeping patch level branches around is odd, after all the patch release should be compatible, and the previous version contains known bugs (hence the bugfix release), and should not be used anymore.
OK, let's implement @mkuron's suggestion for 4.1. Hopefully, this will be the last 4.0.x release.
|
Description of changes:
PR Checklist