Skip to content
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

[doc] Add references to the fine-tuning blog and distil-whisper to Whisper. #30938

Merged
merged 1 commit into from
May 22, 2024

Conversation

Vaibhavs10
Copy link
Member

[doc] Add references to the fine-tuning blog and distil-whisper to Whisper.

What does this PR do?

Before submitting

Who can review?

cc: @sanchit-gandhi

@HuggingFaceDocBuilderDev

The docs for this PR live here. All of your documentation changes will be reflected on that endpoint. The docs are available until 30 days after the last update.

Copy link
Contributor

@sanchit-gandhi sanchit-gandhi left a comment

Choose a reason for hiding this comment

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

Awesome, thanks @Vaibhavs10! Looks like there are some style tests failing. Could you rebase onto main to try and eradicate these?

@Vaibhavs10 Vaibhavs10 force-pushed the vb/add-references-whisper branch from 7eae178 to a414e39 Compare May 21, 2024 12:22
@sanchit-gandhi
Copy link
Contributor

sanchit-gandhi commented May 21, 2024

Quality checks are failing on main, but are unrelated to this PR @amyeroberts. We'll rebase once fixed by #30932!

Copy link
Collaborator

@amyeroberts amyeroberts left a comment

Choose a reason for hiding this comment

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

Thanks for adding these resources!

@Vaibhavs10 Vaibhavs10 force-pushed the vb/add-references-whisper branch from 4f5d312 to 678c55a Compare May 22, 2024 09:01
@Vaibhavs10
Copy link
Member Author

I think I messed up the merge! Whilst rebasing

I synced my fork with transformers followed by

  1. git pull
  2. git checkout <BRANCH>
  3. git rebase main
  4. git push --origin force

Where did I go wrong lol?

@amyeroberts
Copy link
Collaborator

  • git pull
  • git checkout <BRANCH>
  • git rebase main
  • git push --origin force

@Vaibhavs10 A few questions to try and figure out what happened:

  • I synced my fork with transformers: How did you do this? Which branch was "synced"?
  • git pull on which branch are you pulling to and from? What is your default pull settings i.e. does running git pull do a merge or a rebase?
  • git rebase main I'm guessing this was on the feature branch?

A few things might have happened. I suspect the culprit for any unexpected behaviour here is the pull, as it might have introduced merge commits. Working on my feature branch, these are the steps I normally take:

git fetch upstream main
git rebase upstream/main
# My gitconfig settings will always push to the current branch by default
git push -f 

You don't technically need to update your main branch, you just need to fetch the most recent commits from upstream.

The git history looks like what happens if one pulls then force pushes. The good new is, this can be rectified by rebase on main (no pulls!) and force pushing again.

@Vaibhavs10 Vaibhavs10 force-pushed the vb/add-references-whisper branch from 678c55a to a414e39 Compare May 22, 2024 10:02
@Vaibhavs10 Vaibhavs10 force-pushed the vb/add-references-whisper branch from a414e39 to c3e7b50 Compare May 22, 2024 10:03
@Vaibhavs10
Copy link
Member Author

Thanks @amyeroberts - I synced via git fetch upstream main too. @sanchit-gandhi pointed out that I used git push --force origin instead of git push --force origin - hence the commits.

I followed your advice and that seems to have fixed the conflicts.

Wow! git is hard - thank you for being so patient and explaining this to me.

You both are the best! 🤗

Note: the code quality checks now pass haha!

@amyeroberts
Copy link
Collaborator

@Vaibhavs10 Do you have permission to merge? If not, I can do it for you

@Vaibhavs10
Copy link
Member Author

Nope nope - would be great if you can merge. 🤗

Thanks again!

@amyeroberts amyeroberts merged commit 24d2a5e into huggingface:main May 22, 2024
8 checks passed
itazap pushed a commit that referenced this pull request May 24, 2024
…isper. (#30938)

[doc] Add references to the fine-tuning blog and distil-whisper to Whisper doc.
itazap pushed a commit that referenced this pull request May 30, 2024
…isper. (#30938)

[doc] Add references to the fine-tuning blog and distil-whisper to Whisper doc.
zucchini-nlp pushed a commit to zucchini-nlp/transformers that referenced this pull request Jun 11, 2024
…isper. (huggingface#30938)

[doc] Add references to the fine-tuning blog and distil-whisper to Whisper doc.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants