Skip to content

[Merged by Bors] - chore: move Mathlib to v4.7.0-rc1#11162

Closed
kim-em wants to merge 36 commits intomasterfrom
bump/v4.7.0
Closed

[Merged by Bors] - chore: move Mathlib to v4.7.0-rc1#11162
kim-em wants to merge 36 commits intomasterfrom
bump/v4.7.0

Conversation

@kim-em
Copy link
Copy Markdown
Contributor

@kim-em kim-em commented Mar 5, 2024

This is a very large PR, but it has been reviewed piecemeal already in PRs to the bump/v4.7.0 branch as we update to intermediate nightlies.

kim-em and others added 30 commits February 7, 2024 23:46
…n split tactic) (#10330)

This was previously #10328, but I merged this into `master`, not
`bump/v4.7.0`. 🤦‍♀️

Trying again.

---
<!-- The text above the `---` will become the commit message when your
PR is merged. Please leave a blank newline before the `---`, otherwise
GitHub will format the text above it as a title.

To indicate co-authors, include lines at the bottom of the commit
message
(that is, before the `---`) using the following format:

Co-authored-by: Author Name <author@email.com>

Any other comments you want to keep out of the PR commit should go
below the `---`, and placed outside this HTML comment, or else they
will be invisible to reviewers.

If this PR depends on other PRs, please list them below this comment,
using the following format:
- [ ] depends on: #abc [optional extra text]
- [ ] depends on: #xyz [optional extra text]
-->

[![Open in
Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/from-referrer/)

---------

Co-authored-by: leanprover-community-mathlib4-bot <leanprover-community-mathlib4-bot@users.noreply.github.com>
Note this is a PR to `bump/v4.7.0`.



Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
This is a PR to bump/v4.7.0



Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
Co-authored-by: Vierkantor <vierkantor@vierkantor.com>
Co-authored-by: Kyle Miller <kmill31415@gmail.com>
`field_simp` is a very ambitious tactic, that tries to prove that it can clear denominators. Previously it was taking advantage of essentially a bug in the simp discharging framework, so that parts of its discharging strategy were not limited by `maxDischargeDepth` (so it could "keep trying"), but everyone else was limited (so `simp` didn't waste time exploring large trees of discharges). Now the `maxDischargeDepth` is enforced for everyone, so to keep `field_simp` working we have to increase its `maxDischargeDepth`. That makes it extremely slow. I've kept the `maxDischargeDepth` to a minimum, but still there are some `set_option maxHeartbeats` (all with notes attached).

After we've merged this, someone is going to have to rewrite `field_simp` to make it performant.



Co-authored-by: thorimur <68410468+thorimur@users.noreply.github.com>
Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Michael Rothgang <rothgami@math.hu-berlin.de>
Co-authored-by: adomani <adomani@gmail.com>
Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
@kim-em kim-em added the auto-merge-after-CI Please do not add manually. Requests for a bot to merge automatically once CI is done. label Mar 5, 2024
@kim-em
Copy link
Copy Markdown
Contributor Author

kim-em commented Mar 5, 2024

bors p=10

@ghost
Copy link
Copy Markdown

ghost commented Mar 5, 2024

As this PR is labelled auto-merge-after-CI, we are now sending it to bors:

bors merge

mathlib-bors bot pushed a commit that referenced this pull request Mar 5, 2024
This is a very large PR, but it has been reviewed piecemeal already in PRs to the `bump/v4.7.0` branch as we update to intermediate nightlies.

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Kyle Miller <kmill31415@gmail.com>
Co-authored-by: damiano <adomani@gmail.com>
@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented Mar 5, 2024

Build failed:

@kim-em
Copy link
Copy Markdown
Contributor Author

kim-em commented Mar 5, 2024

bors merge

@github-actions github-actions bot added the ready-to-merge This PR has been sent to bors. label Mar 5, 2024
mathlib-bors bot pushed a commit that referenced this pull request Mar 5, 2024
This is a very large PR, but it has been reviewed piecemeal already in PRs to the `bump/v4.7.0` branch as we update to intermediate nightlies.

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Kyle Miller <kmill31415@gmail.com>
Co-authored-by: damiano <adomani@gmail.com>
@ghost
Copy link
Copy Markdown

ghost commented Mar 5, 2024

As this PR is labelled auto-merge-after-CI, we are now sending it to bors:

bors merge

@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented Mar 5, 2024

Already running a review

@mathlib-bors
Copy link
Copy Markdown
Contributor

mathlib-bors bot commented Mar 5, 2024

Pull request successfully merged into master.

Build succeeded:

@mathlib-bors mathlib-bors bot changed the title chore: move Mathlib to v4.7.0-rc1 [Merged by Bors] - chore: move Mathlib to v4.7.0-rc1 Mar 5, 2024
@mathlib-bors mathlib-bors bot closed this Mar 5, 2024
kbuzzard pushed a commit that referenced this pull request Mar 12, 2024
This is a very large PR, but it has been reviewed piecemeal already in PRs to the `bump/v4.7.0` branch as we update to intermediate nightlies.

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Kyle Miller <kmill31415@gmail.com>
Co-authored-by: damiano <adomani@gmail.com>
dagurtomas pushed a commit that referenced this pull request Mar 22, 2024
This is a very large PR, but it has been reviewed piecemeal already in PRs to the `bump/v4.7.0` branch as we update to intermediate nightlies.

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Kyle Miller <kmill31415@gmail.com>
Co-authored-by: damiano <adomani@gmail.com>
utensil pushed a commit that referenced this pull request Mar 26, 2024
This is a very large PR, but it has been reviewed piecemeal already in PRs to the `bump/v4.7.0` branch as we update to intermediate nightlies.

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Kyle Miller <kmill31415@gmail.com>
Co-authored-by: damiano <adomani@gmail.com>
xgenereux pushed a commit that referenced this pull request Apr 15, 2024
This is a very large PR, but it has been reviewed piecemeal already in PRs to the `bump/v4.7.0` branch as we update to intermediate nightlies.

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Kyle Miller <kmill31415@gmail.com>
Co-authored-by: damiano <adomani@gmail.com>
mathlib-bors bot pushed a commit that referenced this pull request May 15, 2024
In this PR, we implements process when an new equation is added to a congruence closure.
Also, `Lean.Expr.relSidesIfSymm?` is removed in #11162, but this def is required for `cc` tactic, so we recover this.



Co-authored-by: Pol'tta / Miyahara Kō <52843868+Komyyy@users.noreply.github.com>
callesonne pushed a commit that referenced this pull request May 16, 2024
In this PR, we implements process when an new equation is added to a congruence closure.
Also, `Lean.Expr.relSidesIfSymm?` is removed in #11162, but this def is required for `cc` tactic, so we recover this.



Co-authored-by: Pol'tta / Miyahara Kō <52843868+Komyyy@users.noreply.github.com>
grunweg pushed a commit that referenced this pull request May 17, 2024
In this PR, we implements process when an new equation is added to a congruence closure.
Also, `Lean.Expr.relSidesIfSymm?` is removed in #11162, but this def is required for `cc` tactic, so we recover this.



Co-authored-by: Pol'tta / Miyahara Kō <52843868+Komyyy@users.noreply.github.com>
@kim-em kim-em deleted the bump/v4.7.0 branch July 24, 2025 02:51
@kim-em kim-em restored the bump/v4.7.0 branch July 24, 2025 02:55
@kim-em kim-em deleted the bump/v4.7.0 branch July 28, 2025 00:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-merge-after-CI Please do not add manually. Requests for a bot to merge automatically once CI is done. ready-to-merge This PR has been sent to bors.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants