Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update environment.yml #508

Merged
merged 6 commits into from Aug 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,7 +1,7 @@
language: python
dist: xenial
python:
- "3.7"
- "3.7.3"
- "3.6"
- "3.5"
env:
Expand Down
49 changes: 32 additions & 17 deletions environment.yml
@@ -1,20 +1,35 @@
name: skorch
channels:
- defaults
- defaults
dependencies:
- mkl
- openssl=1.0.2l=0
- pip=10.0.1
- python=3.6.2=0
- readline=6.2=2
- scikit-learn>=0.19.0
- scipy>=1.1.0
- setuptools=27.2.0=py36_0
- sqlite=3.13.0=0
- tk=8.5.18=0
- wheel=0.32.2
- xz=5.2.2=1
- zlib=1.2.8=3
- tqdm=4.14.0
- pip:
- tabulate==0.7.7
- _libgcc_mutex=0.1
- blas=1.0
- ca-certificates=2019.5.15
- certifi=2019.6.16
- intel-openmp=2019.4
- joblib=0.13.2
- libedit=3.1.20181209
- libffi=3.2.1
- mkl=2019.4
- mkl-service=2.0.2
- mkl_fft=1.0.12
- mkl_random=1.0.2
- ncurses=6.1
- numpy=1.16.4
- numpy-base=1.16.4
- openssl=1.1.1c
- pip=10.0.1
- python=3.7.4
- readline=7.0
- scikit-learn=0.21.2
- scipy=1.3.0
- setuptools=41.0.1
- six=1.12.0
- sqlite=3.29.0
- tabulate=0.8.3
- tk=8.6.8
- tqdm=4.32.1
- wheel=0.33.4
- xz=5.2.4
- zlib=1.2.11

10 changes: 9 additions & 1 deletion skorch/tests/test_net.py
Expand Up @@ -16,6 +16,7 @@
from contextlib import ExitStack

import numpy as np
from packaging import version
import pytest
from sklearn.feature_extraction.text import TfidfVectorizer
from sklearn.metrics import accuracy_score
Expand Down Expand Up @@ -1152,7 +1153,6 @@ def test_get_params_works(self, net_cls, module_cls):
# now initialized
assert 'callbacks__myscore__scoring' in params

@pytest.mark.xfail
def test_get_params_with_uninit_callbacks(self, net_cls, module_cls):
from skorch.callbacks import EpochTimer

Expand Down Expand Up @@ -1410,6 +1410,10 @@ def test_repr_initialized_works(self, net_cls, module_cls):
)
),
)"""
if version.parse(torch.__version__) >= version.parse('1.2'):
expected = expected.replace("Softmax()", "Softmax(dim=-1)")
expected = expected.replace("Dropout(p=0.5)",
"Dropout(p=0.5, inplace=False)")
assert result == expected

def test_repr_fitted_works(self, net_cls, module_cls, data):
Expand Down Expand Up @@ -1437,6 +1441,10 @@ def test_repr_fitted_works(self, net_cls, module_cls, data):
)
),
)"""
if version.parse(torch.__version__) >= version.parse('1.2'):
expected = expected.replace("Softmax()", "Softmax(dim=-1)")
expected = expected.replace("Dropout(p=0.5)",
"Dropout(p=0.5, inplace=False)")
assert result == expected

def test_fit_params_passed_to_module(self, net_cls, data):
Expand Down