Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 30, 2025

Newer versions of Docling can raise an exception during custom garbage collection code of TesseractOcrModel that nothing ever catches, because exceptions during garbage collection are generally not caught by anything. The exception is harmless to any of our InstructLab use-cases, and only happens when the TesseractOcrModel was not able to construct itself anyway, which we check for and handle to fallback to EasyOCR or other implementations.

However, py3-unitcov by default fails the test suite if any of these unraisable exceptions happen. This adjusts that to not fail the test suite. Messages still get logged about the exception during regular py3-unit testing, so we can see when this gets fixed in Docling, but there's no need for it to actually fail our test suite.

Issue resolved by this Pull Request:
Resolves #3324


This is an automatic backport of pull request #3326 done by [Mergify](https://mergify.com).

jaideepr97 and others added 2 commits April 23, 2025 03:15
Signed-off-by: Jaideep Rao <[email protected]>
(cherry picked from commit 8ea9979)
missed adding logic to pick up teacher model id from config in earlier PR. This PR fixes that 







**Checklist:**

- [ ] **Commit Message Formatting**: Commit titles and messages follow guidelines in the
  [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/#summary).
- [ ] [Changelog](https://github.com/instructlab/instructlab/blob/main/CHANGELOG.md) updated with breaking and/or notable changes for the next minor release.
- [ ] Documentation has been updated, if necessary.
- [ ] Unit tests have been added, if necessary.
- [ ] Functional tests have been added, if necessary.
- [ ] E2E Workflow tests have been added, if necessary.
<hr>This is an automatic backport of pull request #3309 done by [Mergify](https://mergify.com).


Approved-by: courtneypacheco

Approved-by: jaideepr97
@mergify mergify bot added testing Relates to testing release-branch Pull Request directly to a release branch ci-failure PR has at least one CI failure labels Apr 30, 2025
For instructlab, "pip install ." does not install vllm, but it does
install an uncapped torch (2.7.0 currently).

When we install vllm later, we compile a binary flash_attn wheel against
torch 2.7.0. vllm 0.8.4 requires torch==2.6.0, so we downgrade torch,
and then we use that with the incompatible flash_attn binary wheel.

To resolve this, use constraints-dev.txt in the first pip install
operation. This restricts torch to 2.6.0 immediately when we first
install instructlab, so that we will compile flash_attn against that
torch version.

Signed-off-by: Ken Dreyer <[email protected]>
(cherry picked from commit 8a11c90)

# Conflicts:
#	.github/workflows/e2e-nvidia-l40s-x4-py312.yml
Copy link
Contributor

@booxter booxter left a comment

Choose a reason for hiding this comment

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

Failure is unrelated (the one about constraints not used).

@mergify mergify bot added the one-approval PR has one approval from a maintainer label Apr 30, 2025
…-3320

use `constraints-dev.txt` in e2e tests (backport #3320)
@booxter
Copy link
Contributor

booxter commented Apr 30, 2025

@Mergifyio rebase

The medium job should be fixed now.

Newer versions of Docling can raise an exception during custom garbage
collection code of TesseractOcrModel that nothing ever catches,
because exceptions during garbage collection are generally not caught
by anything. The exception is harmless to any of our InstructLab
use-cases, and only happens when the TesseractOcrModel was not able to
construct itself anyway, which we check for and handle to fallback to
EasyOCR or other implementations.

However, py3-unitcov by default fails the test suite if any of these
unraisable exceptions happen. This adjusts that to not fail the test
suite. Messages still get logged about the exception during regular
py3-unit testing, so we can see when this gets fixed in Docling, but
there's no need for it to actually fail our test suite.

Signed-off-by: Ben Browning <[email protected]>
(cherry picked from commit 65c1efb)
@mergify
Copy link
Contributor Author

mergify bot commented Apr 30, 2025

rebase

✅ Branch has been successfully rebased

@booxter booxter force-pushed the mergify/bp/release-v0.26/pr-3326 branch from 9a81f59 to f73db63 Compare April 30, 2025 17:58
@mergify mergify bot removed the ci-failure PR has at least one CI failure label Apr 30, 2025
@booxter booxter requested a review from cdoern April 30, 2025 18:02
@mergify
Copy link
Contributor Author

mergify bot commented Apr 30, 2025

This pull request has merge conflicts that must be resolved before it can be merged. @mergify[bot] please rebase it. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added needs-rebase This Pull Request needs to be rebased CI/CD Affects CI/CD configuration labels Apr 30, 2025
@cdoern
Copy link
Contributor

cdoern commented Apr 30, 2025

#3334

@cdoern cdoern closed this Apr 30, 2025
@booxter booxter deleted the mergify/bp/release-v0.26/pr-3326 branch May 1, 2025 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI/CD Affects CI/CD configuration needs-rebase This Pull Request needs to be rebased one-approval PR has one approval from a maintainer release-branch Pull Request directly to a release branch testing Relates to testing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants