Setup / install / quickstart updates

* Add `cuda110` to setup.cfg and quickstart dropdown
* Switch to `pip` for pip-only packages in conda quickstart instructions
* Update zh pkuseg install message with version range and conda
* Remove `zh` from `extras_require` because the default doesn't require
additional packages
This commit is contained in:
Adriane Boyd 2020-10-23 11:27:54 +02:00
parent 270c836bd6
commit 4299a7f654
3 changed files with 10 additions and 6 deletions

View File

@ -87,6 +87,8 @@ cuda101 =
cupy-cuda101>=5.0.0b4,<9.0.0 cupy-cuda101>=5.0.0b4,<9.0.0
cuda102 = cuda102 =
cupy-cuda102>=5.0.0b4,<9.0.0 cupy-cuda102>=5.0.0b4,<9.0.0
cuda110 =
cupy-cuda110>=5.0.0b4,<9.0.0
# Language tokenizers with external dependencies # Language tokenizers with external dependencies
ja = ja =
sudachipy>=0.4.9 sudachipy>=0.4.9
@ -95,8 +97,6 @@ ko =
natto-py==0.9.0 natto-py==0.9.0
th = th =
pythainlp>=2.0 pythainlp>=2.0
zh =
spacy-pkuseg==0.0.26
[bdist_wheel] [bdist_wheel]
universal = false universal = false

View File

@ -17,7 +17,7 @@ from ... import util
# fmt: off # 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 # fmt: on
DEFAULT_CONFIG = """ DEFAULT_CONFIG = """

View File

@ -7,7 +7,7 @@ import { repo } from '../components/util'
const DEFAULT_MODELS = ['en'] const DEFAULT_MODELS = ['en']
const DEFAULT_OPT = 'efficiency' const DEFAULT_OPT = 'efficiency'
const DEFAULT_HARDWARE = 'cpu' const DEFAULT_HARDWARE = 'cpu'
const DEFAULT_CUDA = 'cuda100' const DEFAULT_CUDA = 'cuda102'
const CUDA = { const CUDA = {
'8.0': 'cuda80', '8.0': 'cuda80',
'9.0': 'cuda90', '9.0': 'cuda90',
@ -16,6 +16,7 @@ const CUDA = {
'10.0': 'cuda100', '10.0': 'cuda100',
'10.1': 'cuda101', '10.1': 'cuda101',
'10.2': 'cuda102', '10.2': 'cuda102',
'11.0': 'cuda110',
} }
const LANG_EXTRAS = ['zh', 'ja'] // only for languages with models const LANG_EXTRAS = ['zh', 'ja'] // only for languages with models
const DATA = [ const DATA = [
@ -184,11 +185,14 @@ const QuickstartInstall = ({ id, title }) => {
<QS package="source">pip install -e '.[{pipExtras}]'</QS> <QS package="source">pip install -e '.[{pipExtras}]'</QS>
)} )}
<QS config="train" package="conda" comment prompt={false}>
# packages only available via pip
</QS>
<QS config="train" package="conda"> <QS config="train" package="conda">
conda install -c conda-forge spacy-transformers pip install spacy-transformers
</QS> </QS>
<QS config="train" package="conda"> <QS config="train" package="conda">
conda install -c conda-forge spacy-lookups-data pip install spacy-lookups-data
</QS> </QS>
{models.map(({ code, models: modelOptions }) => { {models.map(({ code, models: modelOptions }) => {