From 951c91cda146a7292f892c116b4041ed9fbb091c Mon Sep 17 00:00:00 2001
From: Vasilis Vryniotis <vvryniotis@fb.com>
Date: Tue, 24 May 2022 11:18:37 +0100
Subject: [PATCH 1/2] Validate against expected files on videos

---
 test/expect/ModelTester.test_mc3_18_expect.pkl | Bin 0 -> 939 bytes
 .../ModelTester.test_r2plus1d_18_expect.pkl    | Bin 0 -> 939 bytes
 test/expect/ModelTester.test_r3d_18_expect.pkl | Bin 0 -> 939 bytes
 test/test_models.py                            |  17 +++++++++++++----
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 test/expect/ModelTester.test_mc3_18_expect.pkl
 create mode 100644 test/expect/ModelTester.test_r2plus1d_18_expect.pkl
 create mode 100644 test/expect/ModelTester.test_r3d_18_expect.pkl

diff --git a/test/expect/ModelTester.test_mc3_18_expect.pkl b/test/expect/ModelTester.test_mc3_18_expect.pkl
new file mode 100644
index 0000000000000000000000000000000000000000..938c52160508ea183ef471aadb741222607fe326
GIT binary patch
literal 939
zcmWIWW@cev;NW1u00Im`42ea_8JT6N`YDMeiFyUuIc`pT3{fbcfhoBpAE-(%zO*DW
zr<g0gC^e}xGbbg!BsH%%zbL-Uh^vr6LnDG6XnrwJWny}2AtOW!ms?JLVo5MWkgJd>
zf)S|3ppZF&8AvA=loqmh8<iBY26{7iGkP1f6|#97c{8>ZvUemW=jY_4CYNO9=M{7L
z7p0^YrKY%KCYNv(a%ct>a+VZw1r>7Z1$eV_Fj*X^nFTZrgadH;l#f9R#i#lPZcb`w
z{zUOK5@*AUe%pihdH3pRp4<C1sCTcGxWBEzIU`$TaV^_G#$~n&XL<I$VGY{j^O$Sj
z_U}(@Ur+jBvx7y?)`N{<AHVfn8-qA=>q~p>Y#U#3+RFXz+3OI(w(n9XqumOHC3}BJ
zNZ20IIJjG5`GvifizIFNH=MBjbn3yLo~;}<kG1dZQQ9=kcFUtRdnX8fv9`%~-#aVW
z-S&n1d+V$;p}nuu^!9xDBfqC5dz)>MsiUoJ!*1IR^{qA!+Vgf-mh#$8S|Mc@#yDjU
z--3mEzr2#&0}8FgIpzW<fFT9KxI>Gd!5SV~WvNBQz*ul|GAA;)kU|c^H0A=?d~sfS
zC=<|D5DxHW1X1ubi5!OlAPE$Jo<h-eBm0RDMdvFZ4_UXq0lHpfSMj6hl>oXBrWYCp
z0p4tEI#5M&%(`&ppu`LUFnT+L%P<M-NsxEhKzW0~6RH4|2?D%X*+62<KnPL~Q40VG
CTl5G3

literal 0
HcmV?d00001

diff --git a/test/expect/ModelTester.test_r2plus1d_18_expect.pkl b/test/expect/ModelTester.test_r2plus1d_18_expect.pkl
new file mode 100644
index 0000000000000000000000000000000000000000..b62a6d04af9001bfba5abcad37e3f19fcf9da13a
GIT binary patch
literal 939
zcmWIWW@cev;NW1u00Im`42ea_8JT6N`YDMeiFyUuIc`pT3{fbcfhoBpAE-(%zO*DW
zr<g0gC^e}xGbbg!BsH%%zbL-Uh^vr6LnDG6XnrwJWny}2AtOW!ms?JLVo5MWkgJd>
zf)S|3ppZF&8AvA=loqmh8<iBY26{7iGkP1f6|#97c{8>ZvUemW=jY_4CYNO9=M{7L
z7p0^YrKY%KCYNv(a%ct>a+VZw1r>7Z1$eV_Fj*X^nFTZrgadH;l#f9R#i#lPZcb`w
z{zUOK62~j(w(X3A7xpel3fUvlRl8?P&+0vg7G&*_ebHmf71C#WUF(_6tXqrsEbE)M
z_tyX8d-tC=vYDd2d+#caCAKb)jIF)OWo<?0>+NMZXt1a15Sy(*^;Mf(5hdG_(9hN?
zvn2MOJu!9fYTw<qHJi`wJ+Rl-N>OUU-iDP^_SWf`?e)kxVqIpgYO8tft4&5Lw{7?H
zLfa)VtM>%Avh8KKz1v#k&<)#b{>6JAJQTD2Aj7q{;)I^9z?lf!PZmkGCIyf7{zyM&
zvnf(ykKv07TTp1Jiutvj0EQF@;|?u;25Wd|m8BLH17pF>$(+dGLJBzu)0hin^Tm1T
zp-ezqK{&vh5k$e$Byt=IfFw`=dJ09?jqE2r6rHbtJY?Pa2IzW`UB!>0R|4olm|kcY
z1bDNt=|C09G3&yWgAy|c!07D|F2f|SCqdq21LX|{PpAS=CJ69mWdn&Z10hH~L@fYc
Ci}#2C

literal 0
HcmV?d00001

diff --git a/test/expect/ModelTester.test_r3d_18_expect.pkl b/test/expect/ModelTester.test_r3d_18_expect.pkl
new file mode 100644
index 0000000000000000000000000000000000000000..11cf06bb1fcd3ead072daad144c5bdc8bd2c37ba
GIT binary patch
literal 939
zcmWIWW@cev;NW1u00Im`42ea_8JT6N`YDMeiFyUuIc`pT3{fbcfhoBpAE-(%zO*DW
zr<g0gC^e}xGbbg!BsH%%zbL-Uh^vr6LnDG6XnrwJWny}2AtOW!ms?JLVo5MWkgJd>
zf)S|3ppZF&8AvA=loqmh8<iBY26{7iGkP1f6|#97c{8>ZvUemW=jY_4CYNO9=M{7L
z7p0^YrKY%KCYNv(a%ct>a+VZw1r>7Z1$eV_Fj*X^nFTZrgadH;l#f9R#i#lPZcb`w
z{zUOK66eJ-?!Am^JbNt9AJ}sv@yagVpq+cJ?J%@v{j6%c;vuKawVnTMT$E+4xlK*?
zq<z@C=jCfo+r#C0dn?{^*o6Q2yGOR7*>=OKJeyg4uWa^N)a=o<(%SRw?;#t9#kY65
zEHv4(V27mD7oL4K532X>@o2cQr?FbfR>D@$_6uvJja*yc-ll6_dn5Mm+@<&AhE4a$
zS9_e6>e%?NoWFbDyB{`RH|N-Ry=}F*bmx(c!>lbkk9fVaX<%rvnox6ikAarw9#5v#
zd+byv?fuWvWCIGV{0m;wP5?s+gmH%!KZ7+qw8~P8ih;4<=44J}a3O^pglWtLviah?
z^iU?CtsorW%?P64X%aaO1waxg06m4G>qhnyABxUbKpwJgeFJp8$gbi?(JKLTAxtkc
z3<A8_*mR(Z<d}8g%0Y=41Yq=b2$x|J*pnddvVrmjgC|r0C=&#Dv$BE2n1K+a9-<Zi
DzL@<Q

literal 0
HcmV?d00001

diff --git a/test/test_models.py b/test/test_models.py
index 7d29dde0678..acdf232ec97 100644
--- a/test/test_models.py
+++ b/test/test_models.py
@@ -822,24 +822,33 @@ def test_detection_model_validation(model_fn):
 @pytest.mark.parametrize("model_fn", get_models_from_module(models.video))
 @pytest.mark.parametrize("dev", cpu_and_gpu())
 def test_video_model(model_fn, dev):
+    set_rng_seed(0)
     # the default input shape is
     # bs * num_channels * clip_len * h *w
-    input_shape = (1, 3, 4, 112, 112)
+    defaults = {
+        "input_shape": (1, 3, 4, 112, 112),
+        "num_classes": 50,
+    }
     model_name = model_fn.__name__
+    kwargs = {**defaults, **_model_params.get(model_name, {})}
+    num_classes = kwargs.get("num_classes")
+    input_shape = kwargs.pop("input_shape")
     # test both basicblock and Bottleneck
-    model = model_fn(num_classes=50)
+    model = model_fn(**kwargs)
     model.eval().to(device=dev)
     # RNG always on CPU, to ensure x in cuda tests is bitwise identical to x in cpu tests
     x = torch.rand(input_shape).to(device=dev)
     out = model(x)
+    _assert_expected(out.cpu(), model_name, prec=0.1)
+    assert out.shape[-1] == num_classes
     _check_jit_scriptable(model, (x,), unwrapper=script_model_unwrapper.get(model_name, None), eager_out=out)
     _check_fx_compatible(model, x, eager_out=out)
-    assert out.shape[-1] == 50
+    assert out.shape[-1] == num_classes
 
     if dev == "cuda":
         with torch.cuda.amp.autocast():
             out = model(x)
-            assert out.shape[-1] == 50
+            assert out.shape[-1] == num_classes
 
     _check_input_backprop(model, x)
 

From 9fa6bc5d0f0d62773878a67b425d1d75ee342e82 Mon Sep 17 00:00:00 2001
From: Vasilis Vryniotis <vvryniotis@fb.com>
Date: Tue, 24 May 2022 11:33:10 +0100
Subject: [PATCH 2/2] Plus tests for autocast

---
 test/test_models.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/test_models.py b/test/test_models.py
index acdf232ec97..0acef4dcef6 100644
--- a/test/test_models.py
+++ b/test/test_models.py
@@ -848,6 +848,9 @@ def test_video_model(model_fn, dev):
     if dev == "cuda":
         with torch.cuda.amp.autocast():
             out = model(x)
+            # See autocast_flaky_numerics comment at top of file.
+            if model_name not in autocast_flaky_numerics:
+                _assert_expected(out.cpu(), model_name, prec=0.1)
             assert out.shape[-1] == num_classes
 
     _check_input_backprop(model, x)