Skip to content

Remove FactoredMatrix.py<->utils.py circular dependency #524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ArthurConmy wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

Remove FactoredMatrix.py<->utils.py circular dependency #524

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a3dbd5f
Remove FactoredMatrix.py<->utils.py circular dependency
ArthurConmy Mar 22, 2024
46a1e2d
Update utils.py
ArthurConmy Mar 22, 2024
c758ebe
Update utils.py
ArthurConmy Mar 22, 2024
3a0a4d2
Update utils.py
ArthurConmy Mar 22, 2024
28775d1
Update utils.py
ArthurConmy Mar 22, 2024
9378dde
Update utils.py
ArthurConmy Mar 22, 2024
3fad048
Update utils.py
ArthurConmy Mar 22, 2024
2b1629c
Update utils.py
ArthurConmy Mar 22, 2024
3fc72bf
Update utils.py
ArthurConmy Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions transformer_lens/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,9 @@
from rich import print as rprint
from transformers import AutoTokenizer

from transformer_lens import FactoredMatrix

CACHE_DIR = transformers.TRANSFORMERS_CACHE
USE_DEFAULT_VALUE = None


def select_compatible_kwargs(
kwargs_dict: Dict[str, Any], callable: Callable
) -> Dict[str, Any]:
Expand Down Expand Up @@ -97,8 +94,14 @@ def get_corner(tensor, n=3):
# Prints the top left corner of the tensor
if isinstance(tensor, torch.Tensor):
return tensor[tuple(slice(n) for _ in range(tensor.ndim))]
elif isinstance(tensor, FactoredMatrix):
return tensor[tuple(slice(n) for _ in range(tensor.ndim))].AB
else:
# pylint: disable=wrong-import-position
# isort: off
from transformer_lens import FactoredMatrix # Lazy import to stop circular dependencies
# isort: on
# pylint: enable=wrong-import-position
if isinstance(tensor, FactoredMatrix):
return tensor[tuple(slice(n) for _ in range(tensor.ndim))].AB


def to_numpy(tensor):
Expand Down