Skip to content

chore: adaptations for nightly-2024-04-07#11997

Merged
kim-em merged 45 commits intobump/v4.8.0from
bump/nightly-2024-04-07
Apr 18, 2024
Merged

chore: adaptations for nightly-2024-04-07#11997
kim-em merged 45 commits intobump/v4.8.0from
bump/nightly-2024-04-07

Conversation

@kim-em
Copy link
Copy Markdown
Contributor

@kim-em kim-em commented Apr 8, 2024

This is the PR to bump/v4.8.0, bringing us up from nightly-2024-03-24 to nightly-2024-04-07 (so almost two weeks).

Note that the release of v4.8.0-rc1 has been delayed because of remaining issues:

This PR contains a number of set_option maxHeartbeats ... or @[nolint simpNF] which are required by heartbeats errors.

These are due to changes to IsDefEq from leanprover/lean4#3807.

So far, the ones I've looked in detail have revealed some problems where we are probably abusing defeq a bit, so I would appreciate any available eyes on these to see which ones ought to be fixed in Mathlib, and which ones are problematic.

It's been a long road to keep nightly-testing alive, and some big refactors have been landing on master, and I'm sure there are mistakes in how I've merged things here, so please be gentle if I've messed things up (and in particular feel free to revert changes that look like mistakes, as long as you test them!). :-)

@ghost ghost added the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Apr 15, 2024
@ghost ghost removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Apr 15, 2024
theorem eq_iff_eq_true_iff {a b : Bool} : a = b ↔ ((a = true) ↔ (b = true)) := by
cases a <;> cases b <;> simp

-- Porting note (#10756): new theorem
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

These have been upstreamed.

simp
#align fin.le_sub_one_iff Fin.le_sub_one_iff

@[simp]
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Already merged to master as #11967

rw [id_comp]
· obtain _ | _ | k := k
· simp at hjk
· simp [Nat.succ.injEq] at hjk
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Something equivalent to this was removed from the default simp set because it was going haywire on numerals.

@kim-em kim-em force-pushed the bump/nightly-2024-04-07 branch from 2013e81 to da393b3 Compare April 17, 2024 08:09
Copy link
Copy Markdown
Contributor

@Ruben-VandeVelde Ruben-VandeVelde left a comment

Choose a reason for hiding this comment

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

The majority of the remaining changes seem to be:

  • slowdowns / simpNF timeputs with notes
  • #12233
  • rfl-after-conv
  • A few remaining Ne.def/id.def changes
  • updates for Std bump

Everything else seems an improvement or relatively inoffensive, so I think we should let #12233 merge, cherry-pick it to bump/v4.8.0 and then merge this.

Comment on lines +5 to +9
-- Adaptation note: at nightly-2024-03-27,
-- we had to increase `maxHeartbeats` here from 8000 to 16000.
-- Adaptation note: at nightly-2024-04-01,
-- we had to increase `maxHeartbeats` here from 16000 to 24000.
-- (Note: successive runs are faster, because of the `exact?` cache initialisation.)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hmmm, I'm a bit sad about these. Do we have ideas about how to get the number down again?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Unfortunately not yet. :-(

Co-authored-by: Johan Commelin <johan@commelin.net>
@jcommelin
Copy link
Copy Markdown
Member

I've looked through the entire diff. Looks fine to me. rfl-after-conv is some extra verbosity, but not problematic.

bors d+

@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented Apr 18, 2024

✌️ semorrison can now approve this pull request. To approve and merge a pull request, simply reply with bors r+. More detailed instructions are available here.

@github-actions github-actions bot added delegated This pull request has been delegated to the PR author (or occasionally another non-maintainer). and removed awaiting-review labels Apr 18, 2024
@kim-em
Copy link
Copy Markdown
Contributor Author

kim-em commented Apr 18, 2024

bors merge

@github-actions github-actions bot added the ready-to-merge This PR has been sent to bors. label Apr 18, 2024
@kim-em
Copy link
Copy Markdown
Contributor Author

kim-em commented Apr 18, 2024

bors r-

@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented Apr 18, 2024

Canceled.

@kim-em kim-em merged commit aad6861 into bump/v4.8.0 Apr 18, 2024
@mathlib-bors mathlib-bors bot deleted the bump/nightly-2024-04-07 branch April 18, 2024 08:46
uniwuni pushed a commit that referenced this pull request Apr 19, 2024
)

These are changes from #11997, the latest adaptation PR for nightly-2024-04-07, which can be made directly on master.

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
callesonne pushed a commit that referenced this pull request Apr 22, 2024
)

These are changes from #11997, the latest adaptation PR for nightly-2024-04-07, which can be made directly on master.

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
Jun2M pushed a commit that referenced this pull request Apr 24, 2024
)

These are changes from #11997, the latest adaptation PR for nightly-2024-04-07, which can be made directly on master.

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

delegated This pull request has been delegated to the PR author (or occasionally another non-maintainer). ready-to-merge This PR has been sent to bors.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants