Spaces:
Running
Running
Abhishek Thakur
commited on
Commit
·
de15d44
1
Parent(s):
73ce81c
multiple submissions, delete space
Browse files- competitions/create.py +2 -1
- competitions/evaluate.py +1 -1
- competitions/info.py +4 -0
- competitions/params.py +1 -0
- competitions/runner.py +3 -0
- competitions/utils.py +8 -0
competitions/create.py
CHANGED
|
@@ -157,13 +157,14 @@ def _create(
|
|
| 157 |
"SELECTION_LIMIT": int(selection_limit),
|
| 158 |
"HARDWARE": hardware,
|
| 159 |
"END_DATE": end_date,
|
| 160 |
-
"EVAL_HIGHER_IS_BETTER": metric_higher_is_better
|
| 161 |
"SUBMISSION_ID_COLUMN": submission_id_column,
|
| 162 |
"SUBMISSION_COLUMNS": submission_columns,
|
| 163 |
"SUBMISSION_ROWS": int(submission_rows),
|
| 164 |
"EVAL_METRIC": metric,
|
| 165 |
"LOGO": competition_logo,
|
| 166 |
"DATASET": "",
|
|
|
|
| 167 |
}
|
| 168 |
teams_json = {}
|
| 169 |
user_team_json = {}
|
|
|
|
| 157 |
"SELECTION_LIMIT": int(selection_limit),
|
| 158 |
"HARDWARE": hardware,
|
| 159 |
"END_DATE": end_date,
|
| 160 |
+
"EVAL_HIGHER_IS_BETTER": metric_higher_is_better is True,
|
| 161 |
"SUBMISSION_ID_COLUMN": submission_id_column,
|
| 162 |
"SUBMISSION_COLUMNS": submission_columns,
|
| 163 |
"SUBMISSION_ROWS": int(submission_rows),
|
| 164 |
"EVAL_METRIC": metric,
|
| 165 |
"LOGO": competition_logo,
|
| 166 |
"DATASET": "",
|
| 167 |
+
"SUBMISSION_FILENAMES": ["submission.csv"],
|
| 168 |
}
|
| 169 |
teams_json = {}
|
| 170 |
user_team_json = {}
|
competitions/evaluate.py
CHANGED
|
@@ -103,7 +103,7 @@ def run(params):
|
|
| 103 |
|
| 104 |
utils.update_submission_score(params, evaluation["public_score"], evaluation["private_score"])
|
| 105 |
utils.update_submission_status(params, "success")
|
| 106 |
-
utils.
|
| 107 |
|
| 108 |
|
| 109 |
if __name__ == "__main__":
|
|
|
|
| 103 |
|
| 104 |
utils.update_submission_score(params, evaluation["public_score"], evaluation["private_score"])
|
| 105 |
utils.update_submission_status(params, "success")
|
| 106 |
+
utils.delete_space(params)
|
| 107 |
|
| 108 |
|
| 109 |
if __name__ == "__main__":
|
competitions/info.py
CHANGED
|
@@ -133,3 +133,7 @@ class CompetitionInfo:
|
|
| 133 |
@property
|
| 134 |
def dataset(self):
|
| 135 |
return self.config.get("DATASET", "")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 133 |
@property
|
| 134 |
def dataset(self):
|
| 135 |
return self.config.get("DATASET", "")
|
| 136 |
+
|
| 137 |
+
@property
|
| 138 |
+
def submission_filenames(self):
|
| 139 |
+
return self.config.get("SUBMISSION_FILENAMES", ["submission.csv"])
|
competitions/params.py
CHANGED
|
@@ -18,6 +18,7 @@ class EvalParams(BaseModel):
|
|
| 18 |
submission_repo: str
|
| 19 |
time_limit: int
|
| 20 |
dataset: str
|
|
|
|
| 21 |
|
| 22 |
class Config:
|
| 23 |
protected_namespaces = ()
|
|
|
|
| 18 |
submission_repo: str
|
| 19 |
time_limit: int
|
| 20 |
dataset: str
|
| 21 |
+
submission_filenames: List[str]
|
| 22 |
|
| 23 |
class Config:
|
| 24 |
protected_namespaces = ()
|
competitions/runner.py
CHANGED
|
@@ -38,6 +38,7 @@ class JobRunner:
|
|
| 38 |
self.submission_rows = self.competition_info.submission_rows
|
| 39 |
self.time_limit = self.competition_info.time_limit
|
| 40 |
self.dataset = self.competition_info.dataset
|
|
|
|
| 41 |
|
| 42 |
def get_pending_subs(self):
|
| 43 |
submission_jsons = snapshot_download(
|
|
@@ -90,6 +91,7 @@ class JobRunner:
|
|
| 90 |
"submission_repo": row["submission_repo"],
|
| 91 |
"time_limit": self.time_limit,
|
| 92 |
"dataset": self.dataset,
|
|
|
|
| 93 |
}
|
| 94 |
eval_params = json.dumps(eval_params)
|
| 95 |
eval_pid = run_evaluation(eval_params, local=True, wait=True)
|
|
@@ -124,6 +126,7 @@ class JobRunner:
|
|
| 124 |
"submission_repo": submission_repo,
|
| 125 |
"time_limit": self.time_limit,
|
| 126 |
"dataset": self.dataset,
|
|
|
|
| 127 |
}
|
| 128 |
|
| 129 |
api.add_space_secret(repo_id=space_id, key="PARAMS", value=json.dumps(params))
|
|
|
|
| 38 |
self.submission_rows = self.competition_info.submission_rows
|
| 39 |
self.time_limit = self.competition_info.time_limit
|
| 40 |
self.dataset = self.competition_info.dataset
|
| 41 |
+
self.submission_filenames = self.competition_info.submission_filenames
|
| 42 |
|
| 43 |
def get_pending_subs(self):
|
| 44 |
submission_jsons = snapshot_download(
|
|
|
|
| 91 |
"submission_repo": row["submission_repo"],
|
| 92 |
"time_limit": self.time_limit,
|
| 93 |
"dataset": self.dataset,
|
| 94 |
+
"submission_filenames": self.submission_filenames,
|
| 95 |
}
|
| 96 |
eval_params = json.dumps(eval_params)
|
| 97 |
eval_pid = run_evaluation(eval_params, local=True, wait=True)
|
|
|
|
| 126 |
"submission_repo": submission_repo,
|
| 127 |
"time_limit": self.time_limit,
|
| 128 |
"dataset": self.dataset,
|
| 129 |
+
"submission_filenames": self.submission_filenames,
|
| 130 |
}
|
| 131 |
|
| 132 |
api.add_space_secret(repo_id=space_id, key="PARAMS", value=json.dumps(params))
|
competitions/utils.py
CHANGED
|
@@ -71,6 +71,14 @@ def pause_space(params):
|
|
| 71 |
api.pause_space(repo_id=os.environ["SPACE_ID"])
|
| 72 |
|
| 73 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 74 |
def download_submission_info(params):
|
| 75 |
user_fname = hf_hub_download(
|
| 76 |
repo_id=params.competition_id,
|
|
|
|
| 71 |
api.pause_space(repo_id=os.environ["SPACE_ID"])
|
| 72 |
|
| 73 |
|
| 74 |
+
def delete_space(params):
|
| 75 |
+
if "SPACE_ID" in os.environ:
|
| 76 |
+
if os.environ["SPACE_ID"].split("/")[-1].startswith("comp-"):
|
| 77 |
+
logger.info("Deleting space...")
|
| 78 |
+
api = HfApi(token=params.token)
|
| 79 |
+
api.delete_repo(repo_id=os.environ["SPACE_ID"], repo_type="space")
|
| 80 |
+
|
| 81 |
+
|
| 82 |
def download_submission_info(params):
|
| 83 |
user_fname = hf_hub_download(
|
| 84 |
repo_id=params.competition_id,
|