Skip to content

Fix v4 branch to build against Thinc v9#11921

Merged
danieldk merged 4 commits intoexplosion:v4from
danieldk:backport/thincv9-changes
Dec 17, 2022
Merged

Fix v4 branch to build against Thinc v9#11921
danieldk merged 4 commits intoexplosion:v4from
danieldk:backport/thincv9-changes

Conversation

@danieldk
Copy link
Contributor

@danieldk danieldk commented Dec 2, 2022

Description

This PR backports some changes from the parser refactor to make the v4 branch compile against the Thinc v9 branch again. The backports are not cherry picks, since too many things changed between the parser versions to make this a clean cherry pick. Changes:

This PR also requires explosion/thinc#809.

Types of change

Checklist

  • I confirm that I have the right to submit this contribution under the project's MIT license.
  • I ran the tests, and all new and existing tests passed.
  • My changes don't require a change to the documentation, or if they do, I've added all required information.

danieldk and others added 3 commits December 2, 2022 15:54
Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
@danieldk danieldk added feat / parser Feature: Dependency Parser 🔜 v4.0 Related to upcoming v4.0 labels Dec 2, 2022
@svlandeg
Copy link
Contributor

@danieldk : we should run the GPU and slow tests here to make sure nothing broke (preferably after thinc-apple-ops is also released)

Copy link
Contributor

@svlandeg svlandeg 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 this Daniel 🙏

This all looks sensible to me - though TBH I haven't gone in and reviewed every single line, assuming that most of this is copy/paste from previous work anyway, right?

Change SequenceCategoricalCrossentropy to LegacySequenceCategoricalCrossentropy. Eventually, we want to move to the new losses, but the goal of this PR is to make spaCy v4 work again.

Did you create a task on our internal board for v4 to ensure we don't forget this?

@danieldk
Copy link
Contributor Author

This all looks sensible to me - though TBH I haven't gone in and reviewed every single line, assuming that most of this is copy/paste from previous work anyway, right?

Yeah, they are only backports and some renaming for the losses.

Did you create a task on our internal board for v4 to ensure we don't forget this?

Done.

@danieldk
Copy link
Contributor Author

@explosion-bot please test_gpu

@danieldk
Copy link
Contributor Author

@explosion-bot please test_slow

@explosion-bot
Copy link
Collaborator

explosion-bot commented Dec 16, 2022

🪁 Successfully triggered build on Buildkite

URL: https://buildkite.com/explosion-ai/spacy-gpu-test-suite/builds/119

@explosion-bot
Copy link
Collaborator

explosion-bot commented Dec 16, 2022

🪁 Successfully triggered build on Buildkite

URL: https://buildkite.com/explosion-ai/spacy-slow-tests/builds/286

Copy link
Contributor

@svlandeg svlandeg left a comment

Choose a reason for hiding this comment

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

Nice work! Good to merge by me :-)

@danieldk danieldk merged commit f9308aa into explosion:v4 Dec 17, 2022
@danieldk danieldk deleted the backport/thincv9-changes branch December 17, 2022 13:32
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request Mar 14, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request Mar 14, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request Mar 29, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request Apr 17, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request Apr 17, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 3, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 3, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 10, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 10, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 10, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 10, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 10, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 10, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 10, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 21, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 21, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 21, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 21, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 21, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 21, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 21, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 21, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 21, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 21, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 21, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
jordankanter pushed a commit to jordankanter/spaCy that referenced this pull request May 21, 2024
* Move `thinc.extra.search` to `spacy.pipeline._parser_internals`

Backport of:
explosion#11317

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Replace references to `thinc.backends.linalg` with `CBlas`

Backport of:
explosion#11292

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>

* Use cross entropy from `thinc.legacy`

* Require thinc>=9.0.0.dev0,<9.1.0

Co-authored-by: Madeesh Kannan <shadeMe@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

feat / parser Feature: Dependency Parser 🔜 v4.0 Related to upcoming v4.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants