Skip to content
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

[FBCode] Deactivate vmap monkey-patching in FBCode #1135

Merged
merged 2 commits into from
Dec 9, 2024
Merged

[FBCode] Deactivate vmap monkey-patching in FBCode #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fcc31c
Update
vmoens Dec 9, 2024
a4fe0b8
Update
vmoens Dec 9, 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
5 changes: 1 addition & 4 deletions tensordict/nn/functional_modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@ def set_tensor_dict( # noqa: F811
tree_unflatten,
)

_has_functorch = True


class _exclude_td_from_pytree:
def __init__(self):
Expand All @@ -144,8 +142,7 @@ def unset(self):
self.__exit__(None, None, None)


# Monkey-patch functorch, mainly for cases where a "isinstance(obj, Tensor) is invoked
if _has_functorch:
if not strtobool(os.getenv("PYTORCH_TENSORDICT_IMPORT_VMAP", "False")):
# Monkey-patches

def _process_batched_inputs(
Expand Down
2 changes: 2 additions & 0 deletions test/test_nn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2129,6 +2129,7 @@ def test_init(self):
p0, p1
), f"Ensemble params were not initialized correctly {p0}, {p1}"

@pytest.mark.skipif(PYTORCH_TEST_FBCODE, reason="vmap now working in fbcode")
@pytest.mark.parametrize(
"net",
[
Expand All @@ -2154,6 +2155,7 @@ def test_siso_forward(self, net):
outs = out["dork"].unbind(0)
assert not torch.allclose(outs[0], outs[1]), "Outputs should be different"

@pytest.mark.skipif(PYTORCH_TEST_FBCODE, reason="vmap now working in fbcode")
@pytest.mark.parametrize(
"net",
[
Expand Down
5 changes: 5 additions & 0 deletions test/test_tensordict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
_has_onnx = importlib.util.find_spec("onnxruntime", None) is not None

_v2_5 = TORCH_VERSION >= version.parse("2.5.0")
PYTORCH_TEST_FBCODE = os.getenv("PYTORCH_TEST_FBCODE")

_IS_OSX = platform.system() == "Darwin"
_IS_WINDOWS = sys.platform == "win32"
Expand Down Expand Up @@ -1151,6 +1152,7 @@ def remover(module, *args, **kwargs):
sd = net.state_dict()
assert_allclose_td(params_sd.flatten_keys("."), TensorDict(sd, []))

@pytest.mark.skipif(PYTORCH_TEST_FBCODE, reason="vmap now working in fbcode")
@pytest.mark.parametrize("as_module", [False, True])
@pytest.mark.parametrize("lazy_stack", [False, True])
def test_from_modules(self, as_module, lazy_stack):
Expand Down Expand Up @@ -1196,6 +1198,7 @@ def get_leaf(leaf):
assert p.grad is None
assert all(param.grad is not None for param in params.values(True, True))

@pytest.mark.skipif(PYTORCH_TEST_FBCODE, reason="vmap now working in fbcode")
@pytest.mark.parametrize("as_module", [False, True])
def test_from_modules_expand(self, as_module):
empty_module = nn.Sequential(
Expand Down Expand Up @@ -1229,6 +1232,7 @@ def exec_module(params, x):
if isinstance(param, nn.Parameter)
)

@pytest.mark.skipif(PYTORCH_TEST_FBCODE, reason="vmap now working in fbcode")
@pytest.mark.parametrize("as_module", [False, True])
@pytest.mark.parametrize("lazy_stack", [False, True])
@pytest.mark.parametrize("device", get_available_devices())
Expand Down Expand Up @@ -3397,6 +3401,7 @@ def test_clamp_max_default(self):
TestTensorDictsBase.TYPES_DEVICES,
)
class TestTensorDicts(TestTensorDictsBase):
@pytest.mark.skipif(PYTORCH_TEST_FBCODE, reason="vmap now working in fbcode")
@pytest.mark.parametrize("nested", [False, True])
def test_add_batch_dim_cache(self, td_name, device, nested):
td = getattr(self, td_name)(device)
Expand Down
Loading