Skip to content

Commit 0ceaa10

Browse files
fix: make simulator workable
* bump vllm dependency to latest * change simulation scoring default to all at once for local models * use Role class instead of hardcoding * delete old oai simulator scorer * refactor * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * linter fix * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * replace lambda with function * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent ff4dfee commit 0ceaa10

20 files changed

+1233
-1709
lines changed

delphi/__main__.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,14 @@ def scorer_postprocess(result, score_dir):
242242
scorer_path.mkdir(parents=True, exist_ok=True)
243243

244244
if scorer_name == "simulation":
245-
scorer = OpenAISimulator(llm_client, tokenizer=tokenizer, all_at_once=False)
245+
if isinstance(llm_client, Offline):
246+
scorer = OpenAISimulator(
247+
llm_client, tokenizer=tokenizer, all_at_once=True
248+
)
249+
else:
250+
scorer = OpenAISimulator(
251+
llm_client, tokenizer=tokenizer, all_at_once=False
252+
)
246253
elif scorer_name == "fuzz":
247254
scorer = FuzzingScorer(
248255
llm_client,

delphi/scorers/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
from .embedding.embedding import EmbeddingScorer
55
from .embedding.example_embedding import ExampleEmbeddingScorer
66
from .scorer import Scorer
7-
from .simulator.oai_simulator import OpenAISimulator
7+
from .simulator.simulation.oai_simulator import (
8+
RefactoredOpenAISimulator as OpenAISimulator,
9+
)
810
from .surprisal.surprisal import SurprisalScorer
911

1012
__all__ = [

delphi/scorers/simulator/oai_autointerp/__init__.py

Lines changed: 0 additions & 13 deletions
This file was deleted.

delphi/scorers/simulator/oai_autointerp/activations/__init__.py

Lines changed: 0 additions & 4 deletions
This file was deleted.

delphi/scorers/simulator/oai_autointerp/activations/activations.py

Lines changed: 0 additions & 75 deletions
This file was deleted.

delphi/scorers/simulator/oai_autointerp/explanations/__init__.py

Lines changed: 0 additions & 8 deletions
This file was deleted.

delphi/scorers/simulator/oai_autointerp/explanations/explanations.py

Lines changed: 0 additions & 149 deletions
This file was deleted.

0 commit comments

Comments
 (0)