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

Issue resolved by this Pull Request:
Resolves #3160

Checklist:

  • Commit Message Formatting: Commit titles and messages follow guidelines in the
    conventional commits.
  • Changelog 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.

Overview

The large E2E test has been failing due to "insufficient instance capacity" in AWS. In other words, whenever we manually kick off our large E2E job or the large E2E job gets kicked off at its regularly scheduled interval, AWS almost always returns an error letting us know that there aren't enough machines (VMs) available to run that job in AWS. Thus, the large E2E job fails to run:

Screenshot 2025-02-17 at 7 25 33 PM

See linked issue for more details.

Proposed Solution

This PR takes the fallback logic I added in #2975 and tweaks it so that it can also be used in our small, medium, and large E2E jobs.


This is an automatic backport of pull request #3161 done by Mergify.

jaideepr97 and others added 3 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
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
@mergify
Copy link
Contributor Author

mergify bot commented Apr 30, 2025

Cherry-pick of f98f92b has failed:

On branch mergify/bp/release-v0.26/pr-3161
Your branch is up to date with 'origin/release-v0.26'.

You are currently cherry-picking commit f98f92b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/e2e-aws-custom.yml
	modified:   .github/workflows/e2e-nvidia-l4-x1.yml
	modified:   .github/workflows/e2e-nvidia-l40s-x4-llama.yml
	modified:   .github/workflows/e2e-nvidia-l40s-x4.yml
	modified:   .github/workflows/e2e-nvidia-l40s-x8.yml
	modified:   .github/workflows/e2e-nvidia-t4-x1.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/e2e-nvidia-l40s-x4-py312.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts This Pull Request has merge conflicts label Apr 30, 2025
@mergify mergify bot added CI/CD Affects CI/CD configuration release-branch Pull Request directly to a release branch labels Apr 30, 2025
@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)
@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 the needs-rebase This Pull Request needs to be rebased label Apr 30, 2025
Signed-off-by: Courtney Pacheco <[email protected]>
(cherry picked from commit f98f92b)
@booxter booxter force-pushed the mergify/bp/release-v0.26/pr-3161 branch from 4955e7e to a011a32 Compare April 30, 2025 18:00
@booxter
Copy link
Contributor

booxter commented Apr 30, 2025

Dropped the -python312 workflow change that is not present in this branch.

@mergify mergify bot removed needs-rebase This Pull Request needs to be rebased one-approval PR has one approval from a maintainer labels Apr 30, 2025
@cdoern
Copy link
Contributor

cdoern commented Apr 30, 2025

#3334

@cdoern cdoern closed this Apr 30, 2025
@mergify mergify bot deleted the mergify/bp/release-v0.26/pr-3161 branch April 30, 2025 19:14
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 conflicts This Pull Request has merge conflicts release-branch Pull Request directly to a release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants