Skip to content

Dataframe run on task #777

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
mfeurer merged 59 commits into from
Oct 23, 2020
Merged

Dataframe run on task #777

Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
8df347a
run on tasks allows dataframes
amueller Sep 3, 2019
ce8640c
don't force third subcomponent part to be list
amueller Sep 3, 2019
d8a2347
Merge branch 'develop' into dataframe_run_on_task
amueller Oct 16, 2019
b16a937
Making DataFrame default behaviour for runs; Fixing test cases for th…
Neeratyoy Dec 4, 2019
df7b496
Merge branch 'develop' into dataframe_run_on_task
Neeratyoy Dec 4, 2019
b31c1dc
Fixing PEP8 + Adding docstring to CustomImputer()
Neeratyoy Dec 11, 2019
05b55a3
Merge branch 'dataframe_run_on_task' of https://github.com/amueller/o…
Neeratyoy Dec 11, 2019
5cd59af
run on tasks allows dataframes
amueller Sep 3, 2019
1f8c37b
Attempting rebase
Neeratyoy Jan 21, 2020
9d45f6f
Fixing merge
Neeratyoy Jan 21, 2020
453fbdf
Fixing test cases
anonymous99199 Feb 12, 2020
6c7172c
Trying test case fixes
anonymous99199 Feb 14, 2020
b98fdb4
run on tasks allows dataframes
amueller Sep 3, 2019
8ac6468
don't force third subcomponent part to be list
amueller Sep 3, 2019
5c5fb31
Making DataFrame default behaviour for runs; Fixing test cases for th…
Neeratyoy Dec 4, 2019
b5729d1
Fixing PEP8 + Adding docstring to CustomImputer()
Neeratyoy Dec 11, 2019
b619361
Attempting rebase
Neeratyoy Jan 21, 2020
25e1b8e
Fixing test cases
anonymous99199 Feb 12, 2020
08b1be1
Trying test case fixes
anonymous99199 Feb 14, 2020
6a4eae3
Rebasing
Neeratyoy Mar 9, 2020
ae9c312
Allowing functions in subcomponents
Neeratyoy Mar 24, 2020
7f60589
Fixing test cases
Neeratyoy Jun 5, 2020
49584de
Adding dataset output param to run
Neeratyoy Jun 16, 2020
b25bbc4
Fixing test cases
Neeratyoy Jun 16, 2020
c0116e4
Changes suggested by mfeurer
Neeratyoy Jun 27, 2020
7379f0c
Editing predict_proba function
Neeratyoy Jun 27, 2020
ba9c1a2
Merge branch 'develop' into dataframe_run_on_task
Neeratyoy Jul 5, 2020
3305a12
Test case fix
Neeratyoy Jul 6, 2020
1b05089
Test case fix
Neeratyoy Jul 7, 2020
053beb6
Edit unit test to bypass server issue
Neeratyoy Jul 9, 2020
15743ee
Fixing unit test
Neeratyoy Jul 9, 2020
440c0ad
Reiterating with @PGijsbers comments
Neeratyoy Jul 10, 2020
7967624
Minor fixes to test cases
Neeratyoy Jul 24, 2020
c06eb0d
Adding unit test and suggestions from @mfeurer
Neeratyoy Aug 1, 2020
83f309a
Fixing test case for all sklearn versions
Neeratyoy Aug 1, 2020
c2a090a
Merge branch 'develop' into dataframe_run_on_task
Neeratyoy Aug 3, 2020
2cb2028
Testing changes
Neeratyoy Aug 10, 2020
5ea4d31
Merge branch 'dataframe_run_on_task' of https://github.com/amueller/o…
Neeratyoy Aug 10, 2020
f0ff562
Fixing import in example
Neeratyoy Aug 10, 2020
7200418
Triggering unit tests
Neeratyoy Aug 14, 2020
29af032
Degugging failed example script
Neeratyoy Aug 14, 2020
001ee74
Merge branch 'develop' into dataframe_run_on_task
Neeratyoy Aug 17, 2020
ae57bea
Adding unit tests
Neeratyoy Aug 17, 2020
1fee939
Merge branch 'dataframe_run_on_task' of https://github.com/amueller/o…
Neeratyoy Aug 17, 2020
418d9e6
Push for debugging
Neeratyoy Aug 24, 2020
c00c060
Push for @mfeurer to debug
Neeratyoy Aug 26, 2020
463a326
Merging with latest updates on [develop]
Neeratyoy Sep 7, 2020
44c9e65
Resetting to debug
Neeratyoy Oct 19, 2020
d439d73
Updating branch and fixing test cases
Neeratyoy Oct 19, 2020
3ae777e
Updating branch
Neeratyoy Oct 19, 2020
9fc6c10
Merging branches
Neeratyoy Oct 19, 2020
3acce3f
pre-commit fixes
Neeratyoy Oct 19, 2020
39011df
Handling failing examples
Neeratyoy Oct 20, 2020
4908237
Reiteration with clean ups and minor fixes
Neeratyoy Oct 21, 2020
90ad9e2
Closing comments
Neeratyoy Oct 21, 2020
9982afe
Black fixes
Neeratyoy Oct 21, 2020
da8dbb9
feedback from @mfeurer
Neeratyoy Oct 21, 2020
0a0f71f
Minor fix
Neeratyoy Oct 22, 2020
78ab677
suggestions from @PGijsbers
Neeratyoy Oct 22, 2020
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
Next Next commit
run on tasks allows dataframes
  • Loading branch information
@amueller
amueller committed Sep 3, 2019
commit 8df347af2b430fa15ab699dfbd62bd4f90b586f4
18 changes: 9 additions & 9 deletions openml/runs/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,14 +412,14 @@ def _run_task_get_arffcontent(
train_indices, test_indices = task.get_train_test_split_indices(
repeat=rep_no, fold=fold_no, sample=sample_no)
if isinstance(task, OpenMLSupervisedTask):
x, y = task.get_X_and_y(dataset_format='array')
train_x = x[train_indices]
train_y = y[train_indices]
test_x = x[test_indices]
test_y = y[test_indices]
x, y = task.get_X_and_y(dataset_format='dataframe')
train_x = x.iloc[train_indices]
train_y = y.iloc[train_indices]
test_x = x.iloc[test_indices]
test_y = y.iloc[test_indices]
elif isinstance(task, OpenMLClusteringTask):
x = task.get_X(dataset_format='array')
train_x = x[train_indices]
x = task.get_X()
train_x = x.iloc[train_indices]
train_y = None
test_x = None
test_y = None
Expand Down Expand Up @@ -462,8 +462,8 @@ def _calculate_local_measure(sklearn_fn, openml_name):
for j, class_label in enumerate(task.class_labels):
Comment thread
mfeurer marked this conversation as resolved.
Outdated
arff_line.append(proba_y[i][j])

arff_line.append(task.class_labels[pred_y[i]])
arff_line.append(task.class_labels[test_y[i]])
arff_line.append(pred_y[i])
arff_line.append(test_y.iloc[i])
else:
raise ValueError('The task has no class labels')

Expand Down