From 8b16fb8c66cfb01386030a34f1933e461675b895 Mon Sep 17 00:00:00 2001 From: Nitin Madnani Date: Mon, 13 Feb 2017 09:13:06 -0500 Subject: [PATCH 1/6] Add `auto` to param grid documentation for SVC. --- doc/run_experiment.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/run_experiment.rst b/doc/run_experiment.rst index 85805f1f..cade9fce 100644 --- a/doc/run_experiment.rst +++ b/doc/run_experiment.rst @@ -805,7 +805,7 @@ SVC .. code-block:: python [{'C': [0.01, 0.1, 1.0, 10.0, 100.0], - 'gamma': [0.01, 0.1, 1.0, 10.0, 100.0]}] + 'gamma': ['auto', 0.01, 0.1, 1.0, 10.0, 100.0]}] SVR .. code-block:: python From 2a6ac3600320e80bbe089b824a8eae34d6c7ec3b Mon Sep 17 00:00:00 2001 From: Nitin Madnani Date: Mon, 13 Feb 2017 09:13:12 -0500 Subject: [PATCH 2/6] Update version numbers. --- conda-recipe/skll/meta.yaml | 2 +- skll/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipe/skll/meta.yaml b/conda-recipe/skll/meta.yaml index f70465d7..c423b0ca 100644 --- a/conda-recipe/skll/meta.yaml +++ b/conda-recipe/skll/meta.yaml @@ -1,6 +1,6 @@ package: name: skll - version: 1.2.1 + version: 1.3 source: path: ../../../skll diff --git a/skll/version.py b/skll/version.py index ec37b6f6..92262593 100644 --- a/skll/version.py +++ b/skll/version.py @@ -7,5 +7,5 @@ :organization: ETS """ -__version__ = '1.2.1' +__version__ = '1.3' VERSION = tuple(int(x) for x in __version__.split('.')) From d0e68394563bf0d108ac7465a00beacf58635808 Mon Sep 17 00:00:00 2001 From: Nitin Madnani Date: Mon, 13 Feb 2017 11:05:17 -0500 Subject: [PATCH 3/6] Add a info message about plots. --- skll/experiments.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/skll/experiments.py b/skll/experiments.py index 2b2518a9..987da54c 100644 --- a/skll/experiments.py +++ b/skll/experiments.py @@ -1064,6 +1064,10 @@ def run_configuration(config_file, local=False, overwrite=True, queue='all.q', _generate_learning_curve_plots(experiment_name, results_path, output_file_path) + else: + logger.info("Raw data for the learning curve saved in " + "{}. No plots were generated since pandas and " + "seaborn are not installed. ") return result_json_paths From 77282f198c2907e934357d8a29052c199f9d7206 Mon Sep 17 00:00:00 2001 From: Nitin Madnani Date: Mon, 13 Feb 2017 11:17:23 -0500 Subject: [PATCH 4/6] Change info to warning. --- skll/experiments.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skll/experiments.py b/skll/experiments.py index 987da54c..95626a6c 100644 --- a/skll/experiments.py +++ b/skll/experiments.py @@ -1065,9 +1065,9 @@ def run_configuration(config_file, local=False, overwrite=True, queue='all.q', results_path, output_file_path) else: - logger.info("Raw data for the learning curve saved in " - "{}. No plots were generated since pandas and " - "seaborn are not installed. ") + logger.warning("Raw data for the learning curve saved in " + "{}. No plots were generated since pandas and " + "seaborn are not installed. ") return result_json_paths From 5b72aeab4ef1657dc5c8bb56a63a372398d46aba Mon Sep 17 00:00:00 2001 From: Nitin Madnani Date: Mon, 13 Feb 2017 11:21:21 -0500 Subject: [PATCH 5/6] Fix format string. --- skll/experiments.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skll/experiments.py b/skll/experiments.py index 95626a6c..bbcc9d1b 100644 --- a/skll/experiments.py +++ b/skll/experiments.py @@ -1067,7 +1067,7 @@ def run_configuration(config_file, local=False, overwrite=True, queue='all.q', else: logger.warning("Raw data for the learning curve saved in " "{}. No plots were generated since pandas and " - "seaborn are not installed. ") + "seaborn are not installed. ".format(output_file_path)) return result_json_paths From 59101aaf76e212bc6492d15beb4dbfd33e9dd851 Mon Sep 17 00:00:00 2001 From: Nitin Madnani Date: Mon, 13 Feb 2017 11:25:28 -0500 Subject: [PATCH 6/6] Update installation documentation. --- doc/getting_started.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/getting_started.rst b/doc/getting_started.rst index b7ee0155..a2c68f48 100644 --- a/doc/getting_started.rst +++ b/doc/getting_started.rst @@ -2,13 +2,13 @@ Installation ============ -SKLL can easily be installed via pip:: +SKLL can be installed via ``pip`` for any Python version:: pip install skll -or via conda:: +or via ``conda`` (only for Python 3.4):: - conda install -c desilinguist skll + conda install -c desilinguist python=3.4 skll It can also be downloaded directly from `GitHub `_.