Skip to content

Commit

Permalink
Merge pull request #541 from NatLibFi/remove-maui-and-vw-backends
Browse files Browse the repository at this point in the history
Remove Maui and Vowpal Wabbit multi backends
  • Loading branch information
osma committed Dec 17, 2021
2 parents 82e55c6 + 0a9608e commit fbd1f92
Show file tree
Hide file tree
Showing 13 changed files with 1 addition and 1,236 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ jobs:
# For Python 3.6
# - voikko and pycld3 dependencies
if [[ ${{ matrix.python-version }} == '3.6' ]]; then python -m pip install .[voikko,pycld3]; fi
# Install the optional VowpalWabbit dependency for Python 3.6
if [[ ${{ matrix.python-version }} == '3.6' ]]; then pip install .[vw]; fi
- name: Lint with flake8
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN pip install --upgrade pip --no-cache-dir

# Install all optional dependencies:
COPY setup.py README.md LICENSE.txt projects.cfg.dist /Annif/
RUN pip install .[dev,voikko,pycld3,fasttext,nn,omikuji,vw,yake] --no-cache-dir
RUN pip install .[dev,voikko,pycld3,fasttext,nn,omikuji,yake] --no-cache-dir

# Download nltk data (handle occasional timeout in with 3 tries):
RUN for i in 1 2 3; do python -m nltk.downloader punkt -d /usr/share/nltk_data && break || sleep 1; done
Expand Down
9 changes: 0 additions & 9 deletions annif/backend/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from . import http
from . import tfidf
from . import pav
from . import maui
from . import stwfsa
from . import mllm
from . import svc
Expand All @@ -31,7 +30,6 @@ def get_backend(backend_id):
register_backend(http.HTTPBackend)
register_backend(tfidf.TFIDFBackend)
register_backend(pav.PAVBackend)
register_backend(maui.MauiBackend)
register_backend(stwfsa.StwfsaBackend)
register_backend(mllm.MLLMBackend)
register_backend(svc.SVCBackend)
Expand All @@ -43,13 +41,6 @@ def get_backend(backend_id):
except ImportError:
annif.logger.debug("fastText not available, not enabling fasttext backend")

try:
from . import vw_multi
register_backend(vw_multi.VWMultiBackend)
except ImportError:
annif.logger.debug("vowpalwabbit not available, not enabling " +
"vw_multi backend")

try:
from . import nn_ensemble
register_backend(nn_ensemble.NNEnsembleBackend)
Expand Down
214 changes: 0 additions & 214 deletions annif/backend/maui.py

This file was deleted.

Loading

0 comments on commit fbd1f92

Please sign in to comment.