From 2fd9f1e1be72f3a279b143889e205a95ea5d6431 Mon Sep 17 00:00:00 2001 From: Chris Qlasty Date: Thu, 2 Nov 2017 18:30:30 +0100 Subject: [PATCH 1/5] Scikit-learn 19.0 updates on .fit( ) arguments Adopting code to my needs I have found that in the scikit-learn 19.0 they recommend to put params list directly into the .fit( ) methods. That also makes the code more understandable for me as now it is more clear where these values go to (fit( ) function of DNNClassifier). Hope this makes sense. --- 11_deep_learning.ipynb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/11_deep_learning.ipynb b/11_deep_learning.ipynb index c0746e0..2a1e6da 100644 --- a/11_deep_learning.ipynb +++ b/11_deep_learning.ipynb @@ -4635,10 +4635,10 @@ " #\"optimizer_class\": [tf.train.AdamOptimizer, partial(tf.train.MomentumOptimizer, momentum=0.95)],\n", "}\n", "\n", - "rnd_search = RandomizedSearchCV(DNNClassifier(random_state=42), param_distribs, n_iter=50,\n", - " fit_params={\"X_valid\": X_valid1, \"y_valid\": y_valid1, \"n_epochs\": 1000},\n", + "rnd_search = RandomizedSearchCV(DNNClassifier(random_state=42), param_distribs, n_iter=50,\n", " random_state=42, verbose=2)\n", - "rnd_search.fit(X_train1, y_train1)" + "fit_params={\"X_valid\": X_valid1, \"y_valid\": y_valid1, \"n_epochs\": 1000},\n", + "rnd_search.fit(X_train1, y_train1, **fit_params)" ] }, { From a2b67bda3b7c1427db7a1e81a6ba8122925dcf77 Mon Sep 17 00:00:00 2001 From: Chris Qlasty Date: Thu, 2 Nov 2017 18:54:12 +0100 Subject: [PATCH 2/5] Scikit-learn 19.0 updates on .fit( ) arguments up. I have left unnecessary ',' at the end of the fit_params line, sorry for that. --- 11_deep_learning.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/11_deep_learning.ipynb b/11_deep_learning.ipynb index 2a1e6da..9d83729 100644 --- a/11_deep_learning.ipynb +++ b/11_deep_learning.ipynb @@ -4637,7 +4637,7 @@ "\n", "rnd_search = RandomizedSearchCV(DNNClassifier(random_state=42), param_distribs, n_iter=50,\n", " random_state=42, verbose=2)\n", - "fit_params={\"X_valid\": X_valid1, \"y_valid\": y_valid1, \"n_epochs\": 1000},\n", + "fit_params={\"X_valid\": X_valid1, \"y_valid\": y_valid1, \"n_epochs\": 1000}\n", "rnd_search.fit(X_train1, y_train1, **fit_params)" ] }, From 2b7674983264f9db6df4cc8e1e469776a695e6cd Mon Sep 17 00:00:00 2001 From: Chris Qlasty Date: Fri, 3 Nov 2017 12:00:28 +0100 Subject: [PATCH 3/5] 0.18 version left with 0.19 suggestions commented The previous version of the .fit( ) with the suggestion of how it should be done from the version 0.21. --- 11_deep_learning.ipynb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/11_deep_learning.ipynb b/11_deep_learning.ipynb index 9d83729..db13ebd 100644 --- a/11_deep_learning.ipynb +++ b/11_deep_learning.ipynb @@ -4636,9 +4636,16 @@ "}\n", "\n", "rnd_search = RandomizedSearchCV(DNNClassifier(random_state=42), param_distribs, n_iter=50,\n", + " fit_params={\"X_valid\": X_valid1, \"y_valid\": y_valid1, \"n_epochs\": 1000},\n", " random_state=42, verbose=2)\n", - "fit_params={\"X_valid\": X_valid1, \"y_valid\": y_valid1, \"n_epochs\": 1000}\n", - "rnd_search.fit(X_train1, y_train1, **fit_params)" + "rnd_search.fit(X_train1, y_train1)" + " + "#fit_params as a constructor argument was deprecated in [scikit-learn] version 0.19 and will be removed\n", + "#in version 0.21. Pass fit parameters to the fit method instead:" + "#rnd_search = RandomizedSearchCV(DNNClassifier(random_state=42), param_distribs, n_iter=50,\n", + "# random_state=42, verbose=2)\n", + "#fit_params={\"X_valid\": X_valid1, \"y_valid\": y_valid1, \"n_epochs\": 1000}" + "#rnd_search.fit(X_train1, y_train1, **fit_params)" ] }, { From cbe5fb39b3ab4ff4caae1de8208957263d4ab108 Mon Sep 17 00:00:00 2001 From: Chris Qlasty Date: Fri, 3 Nov 2017 12:04:54 +0100 Subject: [PATCH 4/5] Comments fix --- 11_deep_learning.ipynb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/11_deep_learning.ipynb b/11_deep_learning.ipynb index db13ebd..479fab5 100644 --- a/11_deep_learning.ipynb +++ b/11_deep_learning.ipynb @@ -4640,12 +4640,12 @@ " random_state=42, verbose=2)\n", "rnd_search.fit(X_train1, y_train1)" " - "#fit_params as a constructor argument was deprecated in [scikit-learn] version 0.19 and will be removed\n", - "#in version 0.21. Pass fit parameters to the fit method instead:" - "#rnd_search = RandomizedSearchCV(DNNClassifier(random_state=42), param_distribs, n_iter=50,\n", + "# fit_params as a constructor argument was deprecated in [scikit-learn] version 0.19 and will be removed\n", + "# in version 0.21. Pass fit parameters to the fit method instead:" + "# rnd_search = RandomizedSearchCV(DNNClassifier(random_state=42), param_distribs, n_iter=50,\n", "# random_state=42, verbose=2)\n", - "#fit_params={\"X_valid\": X_valid1, \"y_valid\": y_valid1, \"n_epochs\": 1000}" - "#rnd_search.fit(X_train1, y_train1, **fit_params)" + "# fit_params={\"X_valid\": X_valid1, \"y_valid\": y_valid1, \"n_epochs\": 1000}\n" + "# rnd_search.fit(X_train1, y_train1, **fit_params)\n", ] }, { From e2754cd72cbfe76e02faffafe6da5edc22ab3302 Mon Sep 17 00:00:00 2001 From: Chris Qlasty Date: Fri, 3 Nov 2017 12:07:37 +0100 Subject: [PATCH 5/5] Update 11_deep_learning.ipynb --- 11_deep_learning.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/11_deep_learning.ipynb b/11_deep_learning.ipynb index 479fab5..2c94b59 100644 --- a/11_deep_learning.ipynb +++ b/11_deep_learning.ipynb @@ -4639,7 +4639,7 @@ " fit_params={\"X_valid\": X_valid1, \"y_valid\": y_valid1, \"n_epochs\": 1000},\n", " random_state=42, verbose=2)\n", "rnd_search.fit(X_train1, y_train1)" - " + "\n", "# fit_params as a constructor argument was deprecated in [scikit-learn] version 0.19 and will be removed\n", "# in version 0.21. Pass fit parameters to the fit method instead:" "# rnd_search = RandomizedSearchCV(DNNClassifier(random_state=42), param_distribs, n_iter=50,\n",