Skip to content

Develop into fix169 (II) #240

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.

Sign up for GitHub

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

Merged
janvanrijn merged 8 commits into from
Apr 27, 2017
Merged

Develop into fix169 (II) #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3fa001b
Check for python3.6
mfeurer Apr 27, 2017
58e7b07
update cython version
mfeurer Apr 27, 2017
2ef707e
yet another update to .travis.yml
mfeurer Apr 27, 2017
35c60a9
Merge pull request #238 from openml/maint/python3.6
mfeurer Apr 27, 2017
54547c5
FIX issue #220, sort dictionaries in flows
mfeurer Apr 27, 2017
716c36b
ignore unknown categories in OHE in unittest
mfeurer Apr 27, 2017
2437837
Merge branch 'develop' into add/#220
janvanrijn Apr 27, 2017
65e8758
Merge pull request #239 from openml/add/#220
janvanrijn Apr 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ env:
- TEST_DIR=/tmp/test_dir/
- MODULE=openml
matrix:
- DISTRIB="conda" PYTHON_VERSION="2.7" NUMPY_VERSION="1.11" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.21" SKLEARN_VERSION="0.18"
- DISTRIB="conda" PYTHON_VERSION="3.4" NUMPY_VERSION="1.11" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.4" SKLEARN_VERSION="0.18"
- DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true" NUMPY_VERSION="1.11" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.4" SKLEARN_VERSION="0.18"
- DISTRIB="conda" PYTHON_VERSION="2.7" NUMPY_VERSION="1.11" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.21" SKLEARN_VERSION="0.18.1"
- DISTRIB="conda" PYTHON_VERSION="3.4" NUMPY_VERSION="1.11" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.4" SKLEARN_VERSION="0.18.1"
- DISTRIB="conda" PYTHON_VERSION="3.5" NUMPY_VERSION="1.11" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.4" SKLEARN_VERSION="0.18.1"
- DISTRIB="conda" PYTHON_VERSION="3.6" COVERAGE="true" NUMPY_VERSION="1.12.1" SCIPY_VERSION="0.19.0" CYTHON_VERSION="0.25.2" SKLEARN_VERSION="0.18.1"

install: source ci_scripts/install.sh
script: bash ci_scripts/test.sh
after_success: source ci_scripts/success.sh
5 changes: 4 additions & 1 deletion openml/flows/sklearn_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ def sklearn_to_flow(o, parent_model=None):
rval = o
elif isinstance(o, dict):
# TODO: explain what type of parameter is here
if not isinstance(o, OrderedDict):
o = OrderedDict([(key, value) for key, value in sorted(o.items())])

rval = OrderedDict()
for key, value in o.items():
if not isinstance(key, six.string_types):
Expand Down Expand Up @@ -133,7 +136,7 @@ def flow_to_sklearn(o, **kwargs):
else:
rval = OrderedDict((flow_to_sklearn(key, **kwargs),
flow_to_sklearn(value, **kwargs))
for key, value in o.items())
for key, value in sorted(o.items()))
elif isinstance(o, (list, tuple)):
rval = [flow_to_sklearn(element, **kwargs) for element in o]
if isinstance(o, tuple):
Expand Down
3 changes: 2 additions & 1 deletion tests/test_flows/test_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,8 @@ def test_sklearn_to_upload_to_flow(self):
y = iris.target

# Test a more complicated flow
ohe = sklearn.preprocessing.OneHotEncoder(categorical_features=[1])
ohe = sklearn.preprocessing.OneHotEncoder(categorical_features=[1],
handle_unknown='ignore')
scaler = sklearn.preprocessing.StandardScaler(with_mean=False)
pca = sklearn.decomposition.TruncatedSVD()
fs = sklearn.feature_selection.SelectPercentile(
Expand Down