Merge pull request #37 from ShopRunner/DS-2734_import_multilabel_data…

…sets

Ds 2734 import multilabel datasets

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project uses [Semantic Versioning](http://semver.org/).
 
+# [2.2.3] - 2020-12-10
+ ### Fixed
+  - Multi-label datasets are imported in top level init
+
 # [2.2.2] - 2020-10-29
  ### Fixed
   - Update creevey to new name wildebeest

CONTRIBUTING.md

@@ -59,8 +59,9 @@ PR Checklist
 - Update the docs where appropriate. You can rebuild them with the commands below.
 
 ```
-    cd /docs
-    make html
+     cd docs/
+     make html
+     open build/html/index.html
 ```
 - Update the CHANGELOG
 

octopod/_version.py

@@ -1 +1 @@
-__version__ = '2.2.2'
+__version__ = '2.2.3'

octopod/ensemble/__init__.py

@@ -1,2 +1,2 @@
-from octopod.ensemble.dataset import OctopodEnsembleDataset
+from octopod.ensemble.dataset import OctopodEnsembleDataset, OctopodEnsembleDatasetMultiLabel
 from octopod.ensemble.models import BertResnetEnsembleForMultiTaskClassification

octopod/text/__init__.py

@@ -1,2 +1,2 @@
-from octopod.text.dataset import OctopodTextDataset
+from octopod.text.dataset import OctopodTextDataset, OctopodTextDatasetMultiLabel
 from octopod.text.models import BertForMultiTaskClassification

octopod/vision/__init__.py

@@ -1,2 +1,2 @@
-from octopod.vision.dataset import OctopodImageDataset
+from octopod.vision.dataset import OctopodImageDataset, OctopodImageDatasetMultiLabel
 from octopod.vision.models import ResnetForMultiTaskClassification

requirements-dev.txt

@@ -1,6 +1,7 @@
 flake8
 flake8-docstrings
 flake8-import-order
+pandas  # Needed for unittests
 pydocstyle<4.0.0
 pytest
 pytest-cov

requirements.txt

@@ -5,6 +5,7 @@ numpy
 pillow==6.2.1
 scikit-learn
 sentencepiece!=0.1.92  # Version 0.1.92 was yanked from PyPI
+sphinx < 3.0.0  # https://github.com/sphinx-doc/sphinx/issues/7795
 sphinx-rtd-theme==0.4.3
 transformers==2.3.0
 torch

setup.py

@@ -30,6 +30,7 @@
         'scikit-learn',
         'torch',
         'torchvision==0.2.1',
+        'transformers<3.0.0',
         'wildebeest',
     ],
     extras_requires={
@@ -38,6 +39,7 @@
             'flake8-docstrings',
             'flake8-import-order',
             'm2r',
+            'pandas',
             'pydocstyle<4.0.0',
             'pytest',
             'pytest-cov',