Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
eddiebergman committed Oct 1, 2021
2 parents 57463cf + 5c81e31 commit e8af236
Show file tree
Hide file tree
Showing 5 changed files with 499 additions and 9 deletions.
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
@@ -1,4 +1,4 @@
---
10fold10min:
folds: 10
max_runtime_seconds: 600
max_runtime_seconds: 600
6 changes: 2 additions & 4 deletions .github/workflows/benchmarking-files/regressions-util.py
Expand Up @@ -10,7 +10,6 @@
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 @@ -74,7 +73,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 @@ -130,7 +129,6 @@ 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 @@ -140,6 +138,7 @@ 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 @@ -454,7 +453,6 @@ 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

0 comments on commit e8af236

Please sign in to comment.