Revert "Pass ModelMeta objects to filter by revision when generating cache (#…" (#400)
Browse filesThis reverts commit 5d1f7e449ca436a2600d27244cafb5660b5233d0.
scripts/generate_cached_results.py
CHANGED
|
@@ -40,24 +40,18 @@ def generate_cached_results():
|
|
| 40 |
# The remote repo should already be cloned from previous runs
|
| 41 |
logger.info("Using existing remote results repository...")
|
| 42 |
|
| 43 |
-
# Load all model
|
| 44 |
-
|
| 45 |
-
# which avoids loading no_revision_available folders when a proper revision exists
|
| 46 |
-
logger.info("Getting all model metas...")
|
| 47 |
models_start = time.time()
|
| 48 |
-
|
| 49 |
-
model_meta
|
| 50 |
-
for model_meta in mteb.get_model_metas()
|
| 51 |
-
if model_meta.name is not None
|
| 52 |
-
]
|
| 53 |
models_time = time.time() - models_start
|
| 54 |
-
logger.info(f"Found {len(
|
| 55 |
-
|
| 56 |
# Load results for all models
|
| 57 |
logger.info("Loading results from cache...")
|
| 58 |
load_start = time.time()
|
| 59 |
all_results = cache.load_results(
|
| 60 |
-
models=
|
| 61 |
only_main_score=True,
|
| 62 |
require_model_meta=False,
|
| 63 |
include_remote=True,
|
|
|
|
| 40 |
# The remote repo should already be cloned from previous runs
|
| 41 |
logger.info("Using existing remote results repository...")
|
| 42 |
|
| 43 |
+
# Load all model names
|
| 44 |
+
logger.info("Getting all model names...")
|
|
|
|
|
|
|
| 45 |
models_start = time.time()
|
| 46 |
+
all_model_names = [model_meta.name for model_meta in mteb.get_model_metas()]
|
|
|
|
|
|
|
|
|
|
|
|
|
| 47 |
models_time = time.time() - models_start
|
| 48 |
+
logger.info(f"Found {len(all_model_names)} models in {models_time:.2f}s")
|
| 49 |
+
|
| 50 |
# Load results for all models
|
| 51 |
logger.info("Loading results from cache...")
|
| 52 |
load_start = time.time()
|
| 53 |
all_results = cache.load_results(
|
| 54 |
+
models=all_model_names,
|
| 55 |
only_main_score=True,
|
| 56 |
require_model_meta=False,
|
| 57 |
include_remote=True,
|