Feature/torchvision 0.3 (#16)(#25)

Fix vgg.config import
Update requirements
Update tests

Author: qubvel

.travis.yml

@@ -5,7 +5,7 @@ python:
 stages:
   - test
 
-install:
+before_install:
 
   - sudo apt-get update
   - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
@@ -14,19 +14,21 @@ install:
   - hash -r
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
+  - conda info -a
 
   # Useful for debugging any issues with conda
   - conda info -a
-  - conda create -q -n test-environment -c pytorch python=$TRAVIS_PYTHON_VERSION numpy mock pytorch-cpu
-  - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install enum34; fi
+  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION pytorch-cpu scipy -c pytorch
+  # - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install enum34; fi
   - source activate test-environment
 
-  # Dependencies
-  - pip install -r requirements.txt
+  - pip install future
+  - pip install pytest pytest-cov codecov
+  - pip install mock
 
-  # Package
-  - python setup.py install
-  - pip install --upgrade pytest #codecov pytest-cov
+install:
+
+  - pip install .
 
 script:
   - python -m pytest -s tests

requirements.txt

@@ -1,3 +1,3 @@
-torchvision==0.2.2
+torchvision>=0.2.2
 pretrainedmodels==0.7.4
-torchnet==0.0.4
+torchnet==0.0.4

segmentation_models_pytorch/encoders/vgg.py

@@ -1,10 +1,17 @@
 import torch.nn as nn
 from torchvision.models.vgg import VGG
 from torchvision.models.vgg import make_layers
-from torchvision.models.vgg import cfg
 from pretrainedmodels.models.torchvision_models import pretrained_settings
 
 
+cfg = {
+    'A': [64, 'M', 128, 'M', 256, 256, 'M', 512, 512, 'M', 512, 512, 'M'],
+    'B': [64, 64, 'M', 128, 128, 'M', 256, 256, 'M', 512, 512, 'M', 512, 512, 'M'],
+    'D': [64, 64, 'M', 128, 128, 'M', 256, 256, 256, 'M', 512, 512, 512, 'M', 512, 512, 512, 'M'],
+    'E': [64, 64, 'M', 128, 128, 'M', 256, 256, 256, 256, 'M', 512, 512, 512, 512, 'M', 512, 512, 512, 512, 'M'],
+}
+
+
 class VGGEncoder(VGG):
 
     def __init__(self, config, batch_norm=False, *args, **kwargs):

tests/test_models.py

@@ -1,8 +1,13 @@
 import os
+import sys
+import mock
 import pytest
 import torch
 import random
 
+# mock detection module 
+sys.modules['torchvision._C'] = mock.Mock()
+
 import segmentation_models_pytorch as smp
 
 

tests/test_preprocessing.py

@@ -1,7 +1,12 @@
 import os
+import sys
+import mock
 import pytest
 import numpy as np
 
+# mock detection module 
+sys.modules['torchvision._C'] = mock.Mock()
+
 import segmentation_models_pytorch as smp