-
Notifications
You must be signed in to change notification settings - Fork 72
Remove all Dask-ML uses #886
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
Merged
Merged
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
9674fe5
initial pass
sarahyurick 0c7cdcd
Merge branch 'main' into remove_daskml
sarahyurick 0027dd6
remove all dask ml references
sarahyurick c785aef
remove use_dask
sarahyurick 9007c0b
fix failing test
sarahyurick e139fa4
wrap in try/except
sarahyurick ac00961
add gpu test
sarahyurick 07a060f
separate gpu test
sarahyurick a6acef5
Merge branch 'main' into remove_daskml
sarahyurick 565db5c
Merge branch 'main' into remove_daskml
ayushdg 9a0a5bc
use gpu_client
sarahyurick 264cc34
remove imports
sarahyurick 670aea0
Merge branch 'main' into remove_daskml
sarahyurick File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,8 +18,6 @@ | |
xgboost = None | ||
dask_cudf = None | ||
|
||
pytest.importorskip("dask_ml") | ||
|
||
|
||
def check_trained_model(c, model_name=None): | ||
if model_name is None: | ||
|
@@ -157,7 +155,7 @@ def test_clustering_and_prediction(c, training_df): | |
c.sql( | ||
""" | ||
CREATE MODEL my_model WITH ( | ||
model_class = 'dask_ml.cluster.KMeans' | ||
model_class = 'sklearn.cluster.KMeans' | ||
) AS ( | ||
SELECT x, y | ||
FROM timeseries | ||
|
@@ -244,7 +242,7 @@ def test_show_models(c, training_df): | |
c.sql( | ||
""" | ||
CREATE MODEL my_model2 WITH ( | ||
model_class = 'dask_ml.cluster.KMeans' | ||
model_class = 'sklearn.cluster.KMeans' | ||
) AS ( | ||
SELECT x, y | ||
FROM timeseries | ||
|
@@ -691,7 +689,7 @@ def test_ml_experiment(c, client, training_df): | |
c.sql( | ||
""" | ||
CREATE EXPERIMENT my_exp WITH ( | ||
experiment_class = 'dask_ml.model_selection.GridSearchCV', | ||
experiment_class = 'sklearn.model_selection.GridSearchCV', | ||
tune_parameters = (n_estimators = ARRAY [16, 32, 2],learning_rate = ARRAY [0.1,0.01,0.001], | ||
max_depth = ARRAY [3,4,5,10]), | ||
target_column = 'target' | ||
|
@@ -731,7 +729,7 @@ def test_ml_experiment(c, client, training_df): | |
""" | ||
CREATE EXPERIMENT IF NOT EXISTS my_exp WITH ( | ||
model_class = 'that.is.not.a.python.class', | ||
experiment_class = 'dask_ml.model_selection.GridSearchCV', | ||
experiment_class = 'sklearn.model_selection.GridSearchCV', | ||
tune_parameters = (n_estimators = ARRAY [16, 32, 2],learning_rate = ARRAY [0.1,0.01,0.001], | ||
max_depth = ARRAY [3,4,5,10]), | ||
target_column = 'target' | ||
|
@@ -794,7 +792,7 @@ def test_ml_experiment(c, client, training_df): | |
""" | ||
CREATE EXPERIMENT my_exp WITH ( | ||
model_class = 'sklearn.ensemble.GradientBoostingClassifier', | ||
experiment_class = 'dask_ml.model_selection.GridSearchCV', | ||
experiment_class = 'sklearn.model_selection.GridSearchCV', | ||
tune_parameters = (n_estimators = ARRAY [16, 32, 2],learning_rate = ARRAY [0.1,0.01,0.001], | ||
max_depth = ARRAY [3,4,5,10]), | ||
target_column = 'target' | ||
|
@@ -816,7 +814,7 @@ def test_ml_experiment(c, client, training_df): | |
""" | ||
CREATE EXPERIMENT my_exp WITH ( | ||
model_class = 'sklearn.ensemble.GradientBoostingClassifier', | ||
experiment_class = 'dask_ml.model_selection.GridSearchCV', | ||
experiment_class = 'sklearn.model_selection.GridSearchCV', | ||
tune_parameters = (n_estimators = ARRAY [16, 32, 2],learning_rate = ARRAY [0.1,0.01,0.001], | ||
max_depth = ARRAY [3,4,5,10]), | ||
target_column = 'target' | ||
|
@@ -831,7 +829,7 @@ def test_ml_experiment(c, client, training_df): | |
""" | ||
CREATE EXPERIMENT IF NOT EXISTS my_exp WITH ( | ||
model_class = 'sklearn.ensemble.GradientBoostingClassifier', | ||
experiment_class = 'dask_ml.model_selection.GridSearchCV', | ||
experiment_class = 'sklearn.model_selection.GridSearchCV', | ||
tune_parameters = (n_estimators = ARRAY [16, 32, 2],learning_rate = ARRAY [0.1,0.01,0.001], | ||
max_depth = ARRAY [3,4,5,10]), | ||
target_column = 'target' | ||
|
@@ -847,7 +845,7 @@ def test_ml_experiment(c, client, training_df): | |
""" | ||
CREATE OR REPLACE EXPERIMENT my_exp WITH ( | ||
model_class = 'sklearn.ensemble.GradientBoostingClassifier', | ||
experiment_class = 'dask_ml.model_selection.GridSearchCV', | ||
experiment_class = 'sklearn.model_selection.GridSearchCV', | ||
tune_parameters = (n_estimators = ARRAY [16, 32, 2],learning_rate = ARRAY [0.1,0.01,0.001], | ||
max_depth = ARRAY [3,4,5,10]), | ||
target_column = 'target' | ||
|
@@ -867,8 +865,8 @@ def test_ml_experiment(c, client, training_df): | |
c.sql( | ||
""" | ||
CREATE EXPERIMENT my_exp1 WITH ( | ||
model_class = 'dask_ml.cluster.KMeans', | ||
experiment_class = 'dask_ml.model_selection.RandomizedSearchCV', | ||
model_class = 'sklearn.cluster.KMeans', | ||
experiment_class = 'sklearn.model_selection.RandomizedSearchCV', | ||
tune_parameters = (n_clusters = ARRAY [3,4,16],tol = ARRAY [0.1,0.01,0.001], | ||
max_iter = ARRAY [3,4,5,10]) | ||
) AS ( | ||
|
@@ -889,7 +887,7 @@ def test_experiment_automl_classifier(c, client, training_df): | |
""" | ||
CREATE EXPERIMENT my_automl_exp1 WITH ( | ||
automl_class = 'tpot.TPOTClassifier', | ||
automl_kwargs = (population_size = 2 ,generations=2,cv=2,n_jobs=-1,use_dask=True), | ||
automl_kwargs = (population_size = 2 ,generations=2,cv=2,n_jobs=-1), | ||
target_column = 'target' | ||
) AS ( | ||
SELECT x, y, x*y > 0 AS target | ||
|
@@ -918,7 +916,6 @@ def test_experiment_automl_regressor(c, client, training_df): | |
generations=2, | ||
cv=2, | ||
n_jobs=-1, | ||
use_dask=True, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
max_eval_time_mins=1), | ||
|
||
target_column = 'target' | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't really get
experiment_class
to work on the GPU. For example:errors with:
Using
model_class = 'xgboost.XGBClassifier'
ormodel_class = 'xgboost.dask.XGBClassifier'
results in the same error as above.When I try it with a
model_class
from cuML, more errors arise. For example, if I try it withmodel_class = 'cuml.dask.ensemble.RandomForestClassifier'
(cuML has noGradientBoostingClassifier
), sklearn raises aThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I could open some issues to try and get
experiment_class
working on the GPU. From what I've tried so far, I think the fixes would lie on the Dask and/or cuML side of things.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we can open up an issue to track this and followup in a future pr
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Opened #943