diff --git a/setup.cfg b/setup.cfg
index 95ada08ef..0495ff258 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -86,6 +86,8 @@ cuda101 =
cupy-cuda101>=5.0.0b4,<9.0.0
cuda102 =
cupy-cuda102>=5.0.0b4,<9.0.0
+cuda110 =
+ cupy-cuda110>=5.0.0b4,<9.0.0
# Language tokenizers with external dependencies
ja =
sudachipy>=0.4.9
@@ -94,8 +96,6 @@ ko =
natto-py==0.9.0
th =
pythainlp>=2.0
-zh =
- spacy-pkuseg==0.0.26
[bdist_wheel]
universal = false
diff --git a/spacy/lang/zh/__init__.py b/spacy/lang/zh/__init__.py
index 30560ed0d..9a8a21a63 100644
--- a/spacy/lang/zh/__init__.py
+++ b/spacy/lang/zh/__init__.py
@@ -17,7 +17,7 @@ from ... import util
# fmt: off
-_PKUSEG_INSTALL_MSG = "install spacy-pkuseg with `pip install spacy-pkuseg==0.0.26`"
+_PKUSEG_INSTALL_MSG = "install spacy-pkuseg with `pip install \"spacy-pkuseg>=0.0.27,<0.1.0\"` or `conda install -c conda-forge \"spacy-pkuseg>=0.0.27,<0.1.0\"`"
# fmt: on
DEFAULT_CONFIG = """
diff --git a/website/docs/usage/index.md b/website/docs/usage/index.md
index ccb59e937..8d40ee61e 100644
--- a/website/docs/usage/index.md
+++ b/website/docs/usage/index.md
@@ -174,6 +174,7 @@ $ source .env/bin/activate # activate virtual env
$ export PYTHONPATH=`pwd` # set Python path to spaCy dir
$ pip install -r requirements.txt # install all requirements
$ python setup.py build_ext --inplace # compile spaCy
+$ python setup.py install # install spaCy
```
Compared to regular install via pip, the
diff --git a/website/src/widgets/quickstart-install.js b/website/src/widgets/quickstart-install.js
index 37ae10da4..df8d971f0 100644
--- a/website/src/widgets/quickstart-install.js
+++ b/website/src/widgets/quickstart-install.js
@@ -7,7 +7,7 @@ import { repo } from '../components/util'
const DEFAULT_MODELS = ['en']
const DEFAULT_OPT = 'efficiency'
const DEFAULT_HARDWARE = 'cpu'
-const DEFAULT_CUDA = 'cuda100'
+const DEFAULT_CUDA = 'cuda102'
const CUDA = {
'8.0': 'cuda80',
'9.0': 'cuda90',
@@ -16,56 +16,9 @@ const CUDA = {
'10.0': 'cuda100',
'10.1': 'cuda101',
'10.2': 'cuda102',
+ '11.0': 'cuda110',
}
-const LANG_EXTRAS = ['zh', 'ja'] // only for languages with models
-const DATA = [
- {
- id: 'os',
- title: 'Operating system',
- options: [
- { id: 'mac', title: 'macOS / OSX', checked: true },
- { id: 'windows', title: 'Windows' },
- { id: 'linux', title: 'Linux' },
- ],
- },
- {
- id: 'package',
- title: 'Package manager',
- options: [
- { id: 'pip', title: 'pip', checked: true },
- { id: 'conda', title: 'conda' },
- { id: 'source', title: 'from source' },
- ],
- },
- {
- id: 'hardware',
- title: 'Hardware',
- options: [
- { id: 'cpu', title: 'CPU', checked: DEFAULT_HARDWARE === 'cpu' },
- { id: 'gpu', title: 'GPU', checked: DEFAULT_HARDWARE == 'gpu' },
- ],
- dropdown: Object.keys(CUDA).map(id => ({ id: CUDA[id], title: `CUDA ${id}` })),
- defaultValue: DEFAULT_CUDA,
- },
- {
- id: 'config',
- title: 'Configuration',
- multiple: true,
- options: [
- {
- id: 'venv',
- title: 'virtual env',
- help: 'Use a virtual environment and install spaCy into a user directory',
- },
- {
- id: 'train',
- title: 'train models',
- help:
- 'Check this if you plan to train your own models with spaCy to install extra dependencies and data resources',
- },
- ],
- },
-]
+const LANG_EXTRAS = ['ja'] // only for languages with models
const QuickstartInstall = ({ id, title }) => {
const [train, setTrain] = useState(false)
@@ -99,7 +52,56 @@ const QuickstartInstall = ({ id, title }) => {
const pkg = nightly ? 'spacy-nightly' : 'spacy'
const models = languages.filter(({ models }) => models !== null)
const data = [
- ...DATA,
+ {
+ id: 'os',
+ title: 'Operating system',
+ options: [
+ { id: 'mac', title: 'macOS / OSX', checked: true },
+ { id: 'windows', title: 'Windows' },
+ { id: 'linux', title: 'Linux' },
+ ],
+ },
+ {
+ id: 'package',
+ title: 'Package manager',
+ options: [
+ { id: 'pip', title: 'pip', checked: true },
+ !nightly ? { id: 'conda', title: 'conda' } : null,
+ { id: 'source', title: 'from source' },
+ ].filter(o => o),
+ },
+ {
+ id: 'hardware',
+ title: 'Hardware',
+ options: [
+ { id: 'cpu', title: 'CPU', checked: DEFAULT_HARDWARE === 'cpu' },
+ { id: 'gpu', title: 'GPU', checked: DEFAULT_HARDWARE == 'gpu' },
+ ],
+ dropdown: Object.keys(CUDA).map(id => ({
+ id: CUDA[id],
+ title: `CUDA ${id}`,
+ })),
+ defaultValue: DEFAULT_CUDA,
+ },
+ {
+ id: 'config',
+ title: 'Configuration',
+ multiple: true,
+ options: [
+ {
+ id: 'venv',
+ title: 'virtual env',
+ help:
+ 'Use a virtual environment and install spaCy into a user directory',
+ },
+ {
+ id: 'train',
+ title: 'train models',
+ help:
+ 'Check this if you plan to train your own models with spaCy to install extra dependencies and data resources',
+ },
+ ],
+ },
{
id: 'models',
title: 'Trained pipelines',
@@ -141,11 +143,6 @@ const QuickstartInstall = ({ id, title }) => {
setters={setters}
showDropdown={showDropdown}
>
- {nightly && (
-
- # 🚨 Nightly releases are currently only available via pip
-
- )}
python -m venv .env
source .env/bin/activate
@@ -180,15 +177,19 @@ const QuickstartInstall = ({ id, title }) => {
pip install -r requirements.txt
python setup.py build_ext --inplace
+ python setup.py install
{(train || hardware == 'gpu') && (
pip install -e '.[{pipExtras}]'
)}
-
- conda install -c conda-forge spacy-transformers
+
+ # packages only available via pip
- conda install -c conda-forge spacy-lookups-data
+ pip install spacy-transformers
+
+
+ pip install spacy-lookups-data
{models.map(({ code, models: modelOptions }) => {