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

[WIP] Investigate Windows crash #13716

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
1 change: 0 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ jobs:
run: |
python -m pytest --pyargs spacy -W error
if: "!(startsWith(matrix.os, 'macos') && matrix.python_version == '3.11')"

- name: "Run CPU tests with thinc-apple-ops"
run: |
python -m pip install 'spacy[apple]'
Expand Down
6 changes: 1 addition & 5 deletions build-constraints.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
# build version constraints for use with wheelwright
numpy==1.15.0; python_version=='3.7' and platform_machine!='aarch64'
numpy==1.19.2; python_version=='3.7' and platform_machine=='aarch64'
numpy==1.17.3; python_version=='3.8' and platform_machine!='aarch64'
numpy==1.19.2; python_version=='3.8' and platform_machine=='aarch64'
numpy>=1.25.0; python_version>='3.9'
numpy>=2.0.0,<3.0.0
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ requires = [
"cymem>=2.0.2,<2.1.0",
"preshed>=3.0.2,<3.1.0",
"murmurhash>=0.28.0,<1.1.0",
"thinc>=8.3.0,<8.4.0",
"numpy>=2.0.0,<2.1.0; python_version < '3.9'",
"numpy>=2.0.0,<2.1.0; python_version >= '3.9'",
"thinc>=8.3.3,<8.4.0",
"numpy>=1.15.0,<3.0.0"
]
build-backend = "setuptools.build_meta"

Expand Down
5 changes: 2 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ spacy-legacy>=3.0.11,<3.1.0
spacy-loggers>=1.0.0,<2.0.0
cymem>=2.0.2,<2.1.0
preshed>=3.0.2,<3.1.0
thinc>=8.3.0,<8.4.0
thinc>=8.3.3,<8.4.0
ml_datasets>=0.2.0,<0.3.0
murmurhash>=0.28.0,<1.1.0
wasabi>=0.9.1,<1.2.0
Expand All @@ -12,8 +12,7 @@ catalogue>=2.0.6,<2.1.0
typer>=0.3.0,<1.0.0
weasel>=0.1.0,<0.5.0
# Third party dependencies
numpy>=2.0.0; python_version < "3.9"
numpy>=2.0.0; python_version >= "3.9"
numpy>=2.0.0,<3.0.0
requests>=2.13.0,<3.0.0
tqdm>=4.38.0,<5.0.0
pydantic>=1.7.4,!=1.8,!=1.8.1,<3.0.0
Expand Down
48 changes: 24 additions & 24 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ project_urls =
[options]
zip_safe = false
include_package_data = true
python_requires = >=3.9,<3.13
python_requires = >=3.9,<3.14
# NOTE: This section is superseded by pyproject.toml and will be removed in
# spaCy v4
setup_requires =
Expand All @@ -41,24 +41,24 @@ setup_requires =
cymem>=2.0.2,<2.1.0
preshed>=3.0.2,<3.1.0
murmurhash>=0.28.0,<1.1.0
thinc>=8.3.0,<8.4.0
thinc>=8.3.3,<8.4.0
install_requires =
# Our libraries
spacy-legacy>=3.0.11,<3.1.0
spacy-loggers>=1.0.0,<2.0.0
murmurhash>=0.28.0,<1.1.0
cymem>=2.0.2,<2.1.0
preshed>=3.0.2,<3.1.0
thinc>=8.3.0,<8.4.0
thinc>=8.3.3,<8.4.0
wasabi>=0.9.1,<1.2.0
srsly>=2.4.3,<3.0.0
catalogue>=2.0.6,<2.1.0
weasel>=0.1.0,<0.5.0
# Third-party dependencies
typer>=0.3.0,<1.0.0
tqdm>=4.38.0,<5.0.0
numpy>=1.15.0; python_version < "3.9"
numpy>=1.19.0; python_version >= "3.9"
numpy>=1.15.0,<3.0; python_version < "3.9"
numpy>=1.19.0,<3.0; python_version >= "3.9"
requests>=2.13.0,<3.0.0
pydantic>=1.7.4,!=1.8,!=1.8.1,<3.0.0
jinja2
Expand All @@ -77,43 +77,43 @@ lookups =
transformers =
spacy_transformers>=1.1.2,<1.4.0
cuda =
cupy>=5.0.0b4,<13.0.0
cupy>=5.0.0b4,<14.0.0
cuda80 =
cupy-cuda80>=5.0.0b4,<13.0.0
cupy-cuda80>=5.0.0b4,<14.0.0
cuda90 =
cupy-cuda90>=5.0.0b4,<13.0.0
cupy-cuda90>=5.0.0b4,<14.0.0
cuda91 =
cupy-cuda91>=5.0.0b4,<13.0.0
cupy-cuda91>=5.0.0b4,<14.0.0
cuda92 =
cupy-cuda92>=5.0.0b4,<13.0.0
cupy-cuda92>=5.0.0b4,<14.0.0
cuda100 =
cupy-cuda100>=5.0.0b4,<13.0.0
cupy-cuda100>=5.0.0b4,<14.0.0
cuda101 =
cupy-cuda101>=5.0.0b4,<13.0.0
cupy-cuda101>=5.0.0b4,<14.0.0
cuda102 =
cupy-cuda102>=5.0.0b4,<13.0.0
cupy-cuda102>=5.0.0b4,<14.0.0
cuda110 =
cupy-cuda110>=5.0.0b4,<13.0.0
cupy-cuda110>=5.0.0b4,<14.0.0
cuda111 =
cupy-cuda111>=5.0.0b4,<13.0.0
cupy-cuda111>=5.0.0b4,<14.0.0
cuda112 =
cupy-cuda112>=5.0.0b4,<13.0.0
cupy-cuda112>=5.0.0b4,<14.0.0
cuda113 =
cupy-cuda113>=5.0.0b4,<13.0.0
cupy-cuda113>=5.0.0b4,<14.0.0
cuda114 =
cupy-cuda114>=5.0.0b4,<13.0.0
cupy-cuda114>=5.0.0b4,<14.0.0
cuda115 =
cupy-cuda115>=5.0.0b4,<13.0.0
cupy-cuda115>=5.0.0b4,<14.0.0
cuda116 =
cupy-cuda116>=5.0.0b4,<13.0.0
cupy-cuda116>=5.0.0b4,<14.0.0
cuda117 =
cupy-cuda117>=5.0.0b4,<13.0.0
cupy-cuda117>=5.0.0b4,<14.0.0
cuda11x =
cupy-cuda11x>=11.0.0,<13.0.0
cupy-cuda11x>=11.0.0,<14.0.0
cuda12x =
cupy-cuda12x>=11.5.0,<13.0.0
cupy-cuda12x>=11.5.0,<14.0.0
cuda-autodetect =
cupy-wheel>=11.0.0,<13.0.0
cupy-wheel>=11.0.0,<14.0.0
apple =
thinc-apple-ops>=1.0.0,<2.0.0
# Language tokenizers with external dependencies
Expand Down
2 changes: 1 addition & 1 deletion spacy/about.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# fmt: off
__title__ = "spacy"
__version__ = "3.8.3"
__version__ = "3.8.4"
__download_url__ = "https://github.com/explosion/spacy-models/releases/download"
__compatibility__ = "https://raw.githubusercontent.com/explosion/spacy-models/master/compatibility.json"
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def test_pretraining_tagger():


# Try to debug segfault on windows
#def test_pretraining_training():
# def test_pretraining_training():
# """Test that training can use a pretrained Tok2Vec model"""
# config = Config().from_str(pretrain_string_internal)
# nlp = util.load_model_from_config(config, auto_fill=True, validate=False)
Expand Down
Loading