Skip to content

Commit

Permalink
Revert "Merge branch 'master' into master"
Browse files Browse the repository at this point in the history
This reverts commit e8af236, reversing
changes made to 57463cf.
  • Loading branch information
eddiebergman committed Oct 1, 2021
1 parent e8af236 commit 1fa4482
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 499 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@

# binary, highly imbalanced, 2109 instances, 22 features, 2 labels
- name: kc1
openml_task_id: 3917
openml_task_id: 3917
2 changes: 1 addition & 1 deletion .github/workflows/benchmarking-files/constraints.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
10fold10min:
folds: 10
max_runtime_seconds: 600
max_runtime_seconds: 600
6 changes: 4 additions & 2 deletions .github/workflows/benchmarking-files/regressions-util.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
CLASSIFICATION_METRICS = ['acc', 'auc', 'balacc', 'logloss']
REGRESSION_METRICS = ['mae', 'r2', 'rmse']
METRICS = CLASSIFICATION_METRICS + REGRESSION_METRICS

def _get_mean_results_across_folds(df) -> pd.DataFrame:
""" Returns a dataframe with the task, id, metric and the mean values
across folds
Expand Down Expand Up @@ -73,7 +74,7 @@ def generate_framework_def(
# Using branch and https
version = branch
repo = f'https://github.com/{username}/auto-sklearn.git'

# Create the framework file
lines = '\n'.join([
f"---",
Expand Down Expand Up @@ -129,6 +130,7 @@ def create_comparison(
Comparisons here is the difference between (targeted - baseline)
Returns them in that specific order
"""

# Load in data and get the means across folds
df_baseline_classification = pd.read_csv(baseline_csv_classification)
df_baseline_regression = pd.read_csv(baseline_csv_regression)
Expand All @@ -138,7 +140,6 @@ def create_comparison(
df_targeted_classification = pd.read_csv(targeted_csv_classification)
df_targeted_regression = pd.read_csv(targeted_csv_regression)
df_targeted = pd.concat([df_targeted_classification, df_targeted_regression])

df_targeted_means = _get_mean_results_across_folds(df_targeted)

# Find the set intersection of tasks they have in common
Expand Down Expand Up @@ -453,6 +454,7 @@ def tolerance_colour(baseline_value, comparison_value, metric):
if args.generate_framework_def:

assert args.owner and args.branch and args.commit and args.user_dir

generate_framework_def(args.user_dir, args.owner, args.branch, args.commit)

elif args.compare_results:
Expand Down
Loading

0 comments on commit 1fa4482

Please sign in to comment.