Re-sync with internal repository (facebookresearch#341)

Co-authored-by: Facebook Community Bot <[email protected]>
petitchow · Sep 30, 2022 · 905cfbd · 905cfbd
1 parent 3f7141c
commit 905cfbd
Show file tree

Hide file tree

Showing 65 changed files with 46 additions and 46 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,9 +1,9 @@
 [run]
 omit =
-    *test/*
+    *tests/*
     *examples/*
 
 [report]
 omit =
-    *test/*
+    *tests/*
     *examples/*
diff --git a/test/__init__.py → tests/__init__.py b/test/__init__.py → tests/__init__.py
diff --git a/test/assets/clip_vocab.bpe → tests/assets/clip_vocab.bpe b/test/assets/clip_vocab.bpe → tests/assets/clip_vocab.bpe
diff --git a/test/models/__init__.py → tests/models/__init__.py b/test/models/__init__.py → tests/models/__init__.py
diff --git a/test/models/albef/__init__.py → tests/models/albef/__init__.py b/test/models/albef/__init__.py → tests/models/albef/__init__.py
diff --git a/test/models/albef/test_albef.py → tests/models/albef/test_albef.py b/test/models/albef/test_albef.py → tests/models/albef/test_albef.py
@@ -8,7 +8,7 @@
 
 import pytest
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torch import nn, Tensor
 from torchmultimodal.models.albef.image_encoder import ALBEFVisionEncoder
 from torchmultimodal.models.albef.model import (

diff --git a/test/models/albef/test_image_encoder.py → tests/models/albef/test_image_encoder.py b/test/models/albef/test_image_encoder.py → tests/models/albef/test_image_encoder.py
@@ -7,7 +7,7 @@
 
 import pytest
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torch import Tensor
 from torchmultimodal.models.albef.image_encoder import ALBEFVisionEncoder
 

diff --git a/test/models/albef/test_multimodal_encoder.py → ...s/models/albef/test_multimodal_encoder.py b/test/models/albef/test_multimodal_encoder.py → ...s/models/albef/test_multimodal_encoder.py
@@ -6,7 +6,7 @@
 
 import pytest
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torch import Tensor
 from torchmultimodal.models.albef.multimodal_encoder import ALBEFMultimodalEncoder
 

diff --git a/test/models/clip/__init__.py → tests/models/clip/__init__.py b/test/models/clip/__init__.py → tests/models/clip/__init__.py
diff --git a/test/models/clip/test_clip.py → tests/models/clip/test_clip.py b/test/models/clip/test_clip.py → tests/models/clip/test_clip.py
@@ -6,7 +6,7 @@
 
 import pytest
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torchmultimodal.models.clip.image_encoder import ResNetForCLIP
 from torchmultimodal.models.clip.model import CLIP
 from torchmultimodal.models.clip.text_encoder import CLIPTextEncoder

diff --git a/test/models/clip/test_image_encoder.py → tests/models/clip/test_image_encoder.py b/test/models/clip/test_image_encoder.py → tests/models/clip/test_image_encoder.py
@@ -7,7 +7,7 @@
 import pytest
 
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torch import Tensor
 from torchmultimodal.models.clip.image_encoder import CLIPViTEncoder, ResNetForCLIP
 from torchmultimodal.utils.common import get_current_device

diff --git a/test/models/clip/test_text_encoder.py → tests/models/clip/test_text_encoder.py b/test/models/clip/test_text_encoder.py → tests/models/clip/test_text_encoder.py
@@ -8,7 +8,7 @@
 
 import pytest
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torchmultimodal.models.clip.text_encoder import CLIPTextEncoder
 
 

diff --git a/test/models/flava/__init__.py → tests/models/flava/__init__.py b/test/models/flava/__init__.py → tests/models/flava/__init__.py
diff --git a/test/models/flava/test_checkpoint.py → tests/models/flava/test_checkpoint.py b/test/models/flava/test_checkpoint.py → tests/models/flava/test_checkpoint.py
@@ -6,7 +6,7 @@
 
 import pytest
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torchmultimodal.models.flava.model import (
     flava_model,
     flava_model_for_classification,

diff --git a/test/models/flava/test_flava.py → tests/models/flava/test_flava.py b/test/models/flava/test_flava.py → tests/models/flava/test_flava.py
@@ -7,7 +7,7 @@
 import pytest
 
 import torch
-from test.test_utils import assert_expected, assert_expected_namedtuple, set_rng_seed
+from tests.test_utils import assert_expected, assert_expected_namedtuple, set_rng_seed
 from torch import nn
 from torchmultimodal.models.flava.model import (
     flava_image_encoder,

diff --git a/test/models/flava/test_image_encoder.py → tests/models/flava/test_image_encoder.py b/test/models/flava/test_image_encoder.py → tests/models/flava/test_image_encoder.py
@@ -7,7 +7,7 @@
 import pytest
 
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torch import nn
 from torchmultimodal.models.flava.image_encoder import ImageEmbeddings, ImageTransformer
 from torchmultimodal.modules.layers.transformer import TransformerEncoder

diff --git a/test/models/flava/test_text_encoder.py → tests/models/flava/test_text_encoder.py b/test/models/flava/test_text_encoder.py → tests/models/flava/test_text_encoder.py
@@ -9,7 +9,7 @@
 import pytest
 
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torch import nn
 from torchmultimodal.models.flava.transformer import init_transformer_weights
 from torchmultimodal.modules.encoders.bert_text_encoder import BERTTextEncoder

diff --git a/test/models/mdetr/__init__.py → tests/models/mdetr/__init__.py b/test/models/mdetr/__init__.py → tests/models/mdetr/__init__.py
diff --git a/test/models/mdetr/test_image_encoder.py → tests/models/mdetr/test_image_encoder.py b/test/models/mdetr/test_image_encoder.py → tests/models/mdetr/test_image_encoder.py
@@ -7,7 +7,7 @@
 import unittest
 
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torchmultimodal.models.mdetr.image_encoder import mdetr_resnet101_backbone
 
 

diff --git a/test/models/mdetr/test_mdetr.py → tests/models/mdetr/test_mdetr.py b/test/models/mdetr/test_mdetr.py → tests/models/mdetr/test_mdetr.py
@@ -7,7 +7,7 @@
 import pytest
 import torch
 
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torchmultimodal.models.mdetr.model import (
     mdetr_for_phrase_grounding,
     mdetr_for_vqa,

diff --git a/test/models/mdetr/test_text_encoder.py → tests/models/mdetr/test_text_encoder.py b/test/models/mdetr/test_text_encoder.py → tests/models/mdetr/test_text_encoder.py
@@ -8,7 +8,7 @@
 
 import torch
 
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torchmultimodal.models.mdetr.text_encoder import ModifiedTransformerEncoder
 
 

diff --git a/test/models/mdetr/test_transformer.py → tests/models/mdetr/test_transformer.py b/test/models/mdetr/test_transformer.py → tests/models/mdetr/test_transformer.py
@@ -7,7 +7,7 @@
 import pytest
 import torch
 
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torchmultimodal.models.mdetr.transformer import MDETRTransformer
 
 

diff --git a/test/models/test_gpt.py → tests/models/test_gpt.py b/test/models/test_gpt.py → tests/models/test_gpt.py
@@ -7,7 +7,8 @@
 import pytest
 
 import torch
-from test.test_utils import assert_expected, assert_expected_namedtuple, set_rng_seed
+
+from tests.test_utils import assert_expected, assert_expected_namedtuple, set_rng_seed
 from torch import nn
 from torch.nn import functional as F
 from torchmultimodal.models.gpt import (

diff --git a/test/models/test_late_fusion.py → tests/models/test_late_fusion.py b/test/models/test_late_fusion.py → tests/models/test_late_fusion.py
@@ -7,7 +7,7 @@
 import pytest
 
 import torch
-from test.test_utils import assert_expected
+from tests.test_utils import assert_expected
 from torchmultimodal.models.late_fusion import LateFusion
 from torchmultimodal.modules.fusions.concat_fusion import ConcatFusionModule
 

diff --git a/test/models/test_omnivore.py → tests/models/test_omnivore.py b/test/models/test_omnivore.py → tests/models/test_omnivore.py
@@ -8,7 +8,7 @@
 import torch
 import torchmultimodal.models.omnivore as omnivore
 
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torchmultimodal.utils.common import get_current_device
 
 

diff --git a/test/models/test_two_tower.py → tests/models/test_two_tower.py b/test/models/test_two_tower.py → tests/models/test_two_tower.py
@@ -9,7 +9,7 @@
 import pytest
 
 import torch
-from test.test_utils import assert_expected
+from tests.test_utils import assert_expected
 from torch import nn, Tensor
 from torchmultimodal.models.late_fusion import LateFusion
 from torchmultimodal.models.two_tower import TwoTower

diff --git a/test/models/test_video_gpt.py → tests/models/test_video_gpt.py b/test/models/test_video_gpt.py → tests/models/test_video_gpt.py
@@ -8,7 +8,7 @@
 
 import torch
 
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 
 from torchmultimodal.models.video_gpt import video_gpt, video_vqvae
 

diff --git a/test/models/test_video_vqvae.py → tests/models/test_video_vqvae.py b/test/models/test_video_vqvae.py → tests/models/test_video_vqvae.py
@@ -6,7 +6,7 @@
 
 import pytest
 import torch
-from test.test_utils import assert_expected, assert_expected_namedtuple, set_rng_seed
+from tests.test_utils import assert_expected, assert_expected_namedtuple, set_rng_seed
 
 from torchmultimodal.models.video_vqvae import (
     AttentionResidualBlock,

diff --git a/test/models/test_vqvae.py → tests/models/test_vqvae.py b/test/models/test_vqvae.py → tests/models/test_vqvae.py
@@ -8,7 +8,7 @@
 
 import torch
 
-from test.test_utils import assert_expected, assert_expected_namedtuple, set_rng_seed
+from tests.test_utils import assert_expected, assert_expected_namedtuple, set_rng_seed
 from torch import nn
 
 from torchmultimodal.models.vqvae import VQVAE

diff --git a/test/modules/__init__.py → tests/modules/__init__.py b/test/modules/__init__.py → tests/modules/__init__.py
diff --git a/test/modules/encoders/__init__.py → tests/modules/encoders/__init__.py b/test/modules/encoders/__init__.py → tests/modules/encoders/__init__.py
diff --git a/...odules/encoders/test_bert_text_encoder.py → ...odules/encoders/test_bert_text_encoder.py b/...odules/encoders/test_bert_text_encoder.py → ...odules/encoders/test_bert_text_encoder.py
@@ -6,7 +6,7 @@
 
 import pytest
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torch import Tensor
 from torchmultimodal.modules.encoders.bert_text_encoder import bert_text_encoder
 

diff --git a/...odules/encoders/test_embedding_encoder.py → ...odules/encoders/test_embedding_encoder.py b/...odules/encoders/test_embedding_encoder.py → ...odules/encoders/test_embedding_encoder.py
@@ -7,7 +7,7 @@
 import unittest
 
 import torch
-from test.test_utils import assert_expected
+from tests.test_utils import assert_expected
 from torch import nn
 from torchmultimodal.modules.encoders.embedding_encoder import EmbeddingEncoder
 

diff --git a/test/modules/encoders/test_mil_encoder.py → tests/modules/encoders/test_mil_encoder.py b/test/modules/encoders/test_mil_encoder.py → tests/modules/encoders/test_mil_encoder.py
diff --git a/...oders/test_swin_transformer_3d_encoder.py → ...oders/test_swin_transformer_3d_encoder.py b/...oders/test_swin_transformer_3d_encoder.py → ...oders/test_swin_transformer_3d_encoder.py
@@ -8,7 +8,7 @@
 
 import torch
 
-from test.test_utils import set_rng_seed
+from tests.test_utils import set_rng_seed
 from torchmultimodal.modules.encoders.swin_transformer_3d_encoder import (
     PatchEmbed3d,
     PatchMerging,

diff --git a/...coders/test_weighted_embedding_encoder.py → ...coders/test_weighted_embedding_encoder.py b/...coders/test_weighted_embedding_encoder.py → ...coders/test_weighted_embedding_encoder.py
@@ -5,10 +5,9 @@
 # LICENSE file in the root directory of this source tree.
 
 import unittest
-from copy import deepcopy
 
 import torch
-from test.test_utils import assert_expected
+from tests.test_utils import assert_expected
 from torch import nn
 from torchmultimodal.modules.encoders.weighted_embedding_encoder import (
     WeightedEmbeddingEncoder,

diff --git a/test/modules/fusions/__init__.py → tests/modules/fusions/__init__.py b/test/modules/fusions/__init__.py → tests/modules/fusions/__init__.py
diff --git a/.../modules/fusions/test_attention_fusion.py → .../modules/fusions/test_attention_fusion.py b/.../modules/fusions/test_attention_fusion.py → .../modules/fusions/test_attention_fusion.py
diff --git a/test/modules/fusions/test_deepset_fusion.py → tests/modules/fusions/test_deepset_fusion.py b/test/modules/fusions/test_deepset_fusion.py → tests/modules/fusions/test_deepset_fusion.py
diff --git a/test/modules/layers/__init__.py → tests/modules/layers/__init__.py b/test/modules/layers/__init__.py → tests/modules/layers/__init__.py
diff --git a/test/modules/layers/test_activation.py → tests/modules/layers/test_activation.py b/test/modules/layers/test_activation.py → tests/modules/layers/test_activation.py
@@ -6,7 +6,7 @@
 
 import torch
 
-from test.test_utils import assert_expected
+from tests.test_utils import assert_expected
 from torchmultimodal.modules.layers.activation import SiLU
 
 

diff --git a/test/modules/layers/test_attention.py → tests/modules/layers/test_attention.py b/test/modules/layers/test_attention.py → tests/modules/layers/test_attention.py
@@ -9,7 +9,7 @@
 import pytest
 
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torchmultimodal.modules.layers.attention import (
     AxialAttention,
     AxialAttentionBlock,

diff --git a/test/modules/layers/test_codebook.py → tests/modules/layers/test_codebook.py b/test/modules/layers/test_codebook.py → tests/modules/layers/test_codebook.py
@@ -10,7 +10,7 @@
 import pytest
 
 import torch
-from test.test_utils import assert_expected, assert_expected_namedtuple, set_rng_seed
+from tests.test_utils import assert_expected, assert_expected_namedtuple, set_rng_seed
 from torch import nn, tensor
 from torchmultimodal.modules.layers.codebook import Codebook
 

diff --git a/test/modules/layers/test_conv.py → tests/modules/layers/test_conv.py b/test/modules/layers/test_conv.py → tests/modules/layers/test_conv.py
@@ -9,7 +9,7 @@
 from itertools import product
 
 import torch
-from test.test_utils import assert_expected
+from tests.test_utils import assert_expected
 from torchmultimodal.modules.layers.conv import (
     calculate_same_padding,
     calculate_transpose_padding,

diff --git a/test/modules/layers/test_mlp.py → tests/modules/layers/test_mlp.py b/test/modules/layers/test_mlp.py → tests/modules/layers/test_mlp.py
@@ -8,7 +8,7 @@
 from functools import partial
 
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torch import nn
 from torchmultimodal.modules.layers.mlp import MLP
 

diff --git a/test/modules/layers/test_normalizations.py → tests/modules/layers/test_normalizations.py b/test/modules/layers/test_normalizations.py → tests/modules/layers/test_normalizations.py
diff --git a/...modules/layers/test_position_embedding.py → ...modules/layers/test_position_embedding.py b/...modules/layers/test_position_embedding.py → ...modules/layers/test_position_embedding.py
@@ -7,7 +7,7 @@
 import pytest
 
 import torch
-from test.test_utils import assert_expected
+from tests.test_utils import assert_expected
 from torch import nn
 from torchmultimodal.modules.layers.position_embedding import (
     BroadcastedPositionEmbedding,

diff --git a/test/modules/layers/test_text_embedding.py → tests/modules/layers/test_text_embedding.py b/test/modules/layers/test_text_embedding.py → tests/modules/layers/test_text_embedding.py
@@ -6,7 +6,7 @@
 
 import pytest
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torchmultimodal.modules.layers.text_embedding import BERTTextEmbeddings
 
 

diff --git a/test/modules/layers/test_transformer.py → tests/modules/layers/test_transformer.py b/test/modules/layers/test_transformer.py → tests/modules/layers/test_transformer.py
@@ -7,7 +7,7 @@
 import pytest
 
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torch import nn
 from torchmultimodal.modules.layers.transformer import (
     TransformerCrossAttentionLayer,

diff --git a/test/modules/losses/__init__.py → tests/modules/losses/__init__.py b/test/modules/losses/__init__.py → tests/modules/losses/__init__.py
diff --git a/test/modules/losses/test_albef.py → tests/modules/losses/test_albef.py b/test/modules/losses/test_albef.py → tests/modules/losses/test_albef.py
@@ -7,7 +7,7 @@
 
 import pytest
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torch import Tensor
 from torchmultimodal.modules.losses.albef import (
     CausalLanguageModelingLoss,

diff --git a/test/modules/losses/test_commitment.py → tests/modules/losses/test_commitment.py b/test/modules/losses/test_commitment.py → tests/modules/losses/test_commitment.py
@@ -7,7 +7,7 @@
 import unittest
 
 import torch
-from test.test_utils import assert_expected
+from tests.test_utils import assert_expected
 from torchmultimodal.modules.losses.vqvae import CommitmentLoss
 
 

diff --git a/...test_contrastive_loss_with_temperature.py → ...test_contrastive_loss_with_temperature.py b/...test_contrastive_loss_with_temperature.py → ...test_contrastive_loss_with_temperature.py
@@ -14,7 +14,7 @@
 import torch.nn as nn
 import torch.optim as optim
 
-from test.test_utils import (
+from tests.test_utils import (
     assert_expected,
     gpu_test,
     init_distributed_on_file,

diff --git a/test/modules/losses/test_mdetr_losses.py → tests/modules/losses/test_mdetr_losses.py b/test/modules/losses/test_mdetr_losses.py → tests/modules/losses/test_mdetr_losses.py
@@ -8,7 +8,7 @@
 
 import pytest
 import torch
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torchmultimodal.modules.losses.mdetr import box_losses, soft_token_prediction_loss
 from torchvision.ops.boxes import box_convert
 

diff --git a/test/test_utils.py → tests/test_utils.py b/test/test_utils.py → tests/test_utils.py
diff --git a/test/transforms/__init__.py → tests/transforms/__init__.py b/test/transforms/__init__.py → tests/transforms/__init__.py
diff --git a/test/transforms/test_bert_text_transform.py → tests/transforms/test_bert_text_transform.py b/test/transforms/test_bert_text_transform.py → tests/transforms/test_bert_text_transform.py
@@ -7,7 +7,7 @@
 import pytest
 import torch
 
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torchmultimodal.transforms.bert_text_transform import BertTextTransform
 
 

diff --git a/test/transforms/test_clip_transform.py → tests/transforms/test_clip_transform.py b/test/transforms/test_clip_transform.py → tests/transforms/test_clip_transform.py
@@ -7,7 +7,7 @@
 import unittest
 
 import torch
-from test.test_utils import assert_expected, get_asset_path, set_rng_seed
+from tests.test_utils import assert_expected, get_asset_path, set_rng_seed
 from torchmultimodal.transforms.clip_transform import CLIPTransform
 from torchvision.transforms import ToPILImage
 

diff --git a/test/transforms/test_video_transform.py → tests/transforms/test_video_transform.py b/test/transforms/test_video_transform.py → tests/transforms/test_video_transform.py
@@ -7,7 +7,7 @@
 import pytest
 import torch
 
-from test.test_utils import assert_expected, set_rng_seed
+from tests.test_utils import assert_expected, set_rng_seed
 from torchmultimodal.transforms.video_transform import VideoTransform
 
 

diff --git a/test/utils/__init__.py → tests/utils/__init__.py b/test/utils/__init__.py → tests/utils/__init__.py
diff --git a/test/utils/test_assertion.py → tests/utils/test_assertion.py b/test/utils/test_assertion.py → tests/utils/test_assertion.py
diff --git a/test/utils/test_attention_utils.py → tests/utils/test_attention_utils.py b/test/utils/test_attention_utils.py → tests/utils/test_attention_utils.py
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree.
 
 import torch
-from test.test_utils import assert_expected
+from tests.test_utils import assert_expected
 from torchmultimodal.utils.attention import get_causal_attention_mask
 
 

diff --git a/test/utils/test_ckpt_load.py → tests/utils/test_ckpt_load.py b/test/utils/test_ckpt_load.py → tests/utils/test_ckpt_load.py
diff --git a/test/utils/test_common.py → tests/utils/test_common.py b/test/utils/test_common.py → tests/utils/test_common.py
@@ -8,7 +8,7 @@
 
 import torch
 
-from test.test_utils import assert_expected
+from tests.test_utils import assert_expected
 from torch import nn
 from torch.utils.checkpoint import checkpoint
 from torchmultimodal.utils.common import (