pytorch · arnavmehta7 · Sep 15, 2022 · Sep 15, 2022 · Sep 15, 2022 · Sep 16, 2022
diff --git a/.circleci/unittest/linux/scripts/run_test.sh b/.circleci/unittest/linux/scripts/run_test.sh
@@ -6,4 +6,5 @@ eval "$(./conda/bin/conda shell.bash hook)"
 conda activate ./env
 
 python -m torch.utils.collect_env
-pytest --cov=torchtext --junitxml=test-results/junit.xml -v --durations 20 test
+cd test
+pytest --cov=torchtext --junitxml=test-results/junit.xml -v --durations 20 torchtext_unittest
diff --git a/.circleci/unittest/windows/scripts/run_test.sh b/.circleci/unittest/windows/scripts/run_test.sh
@@ -6,4 +6,5 @@ eval "$(./conda/Scripts/conda.exe 'shell.bash' 'hook')"
 conda activate ./env
 
 python -m torch.utils.collect_env
-pytest --cov=torchtext --junitxml=test-results/junit.xml -v --durations 20 test
+cd test
+pytest --cov=torchtext --junitxml=test-results/junit.xml -v --durations 20 torchtext_unittest
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -0,0 +1,31 @@
+name: Integration Test
+
+on:
+  pull_request:
+    branches: [main]
+
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [3.8]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install packages
+        run: |
+          python -m pip install --quiet --upgrade pip
+          python -m pip install --quiet --pre torch -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
+          python -m pip install --quiet pytest requests cmake ninja sentencepiece parameterized tqdm expecttest
+          python setup.py install
+      - name: Run integration test
+        run: |
+          cd test && pytest integration_tests -v --use-tmp-hub-dir
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -51,6 +51,7 @@ option(BUILD_TORCHTEXT_PYTHON_EXTENSION "Build Python extension" OFF)
 
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(TORCH_INSTALL_PREFIX "${CMAKE_PREFIX_PATH}/../.." CACHE STRING "Install path for torch")
+set(TORCH_COMPILED_WITH_CXX_ABI "-D_GLIBCXX_USE_CXX11_ABI=0" CACHE STRING "Compile torchtext with cxx11_abi")
 
 find_library(TORCH_C10_LIBRARY c10 PATHS "${TORCH_INSTALL_PREFIX}/lib")
 find_library(TORCH_LIBRARY torch PATHS "${TORCH_INSTALL_PREFIX}/lib")
@@ -60,8 +61,7 @@ if(MSVC)
   set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 endif()
 
-# TORCH_CXX_FLAGS contains the same -D_GLIBCXX_USE_CXX11_ABI value as PyTorch
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ${TORCH_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_COMPILED_WITH_CXX_ABI} -Wall ${TORCH_CXX_FLAGS}")
 
 add_subdirectory(third_party)
 add_subdirectory(torchtext/csrc)
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,5 +1,5 @@
 Jinja2<3.1.0
 sphinx==3.5.4
--e git+https://github.com/pytorch/pytorch_sphinx_theme.git@b4d0005#egg=pytorch_sphinx_theme
+-e git+https://github.com/pytorch/pytorch_sphinx_theme.git@cece053#egg=pytorch_sphinx_theme
 matplotlib
 sphinx_gallery
diff --git a/docs/source/experimental_datasets_raw.rst b/docs/source/experimental_datasets_raw.rst
diff --git a/test/.gitignore b/test/.gitignore
diff --git a/test/integration_tests/conftest.py b/test/integration_tests/conftest.py
@@ -15,9 +15,9 @@ def pytest_addoption(parser):
     )
 
 
-@pytest.fixture(scope="class")
+@pytest.fixture(autouse=True, scope="class")
 def temp_hub_dir(tmp_path_factory, pytestconfig):
-    if not pytestconfig.getoption("--use-tmp-hub-dir"):
+    if not pytestconfig.getoption("use_tmp_hub_dir"):
         yield
     else:
         tmp_dir = tmp_path_factory.mktemp("hub", numbered=True).resolve()

diff --git a/...rototype/integration_tests/test_models.py → ...ntegration_tests/prototype/test_models.py b/...rototype/integration_tests/test_models.py → ...ntegration_tests/prototype/test_models.py
@@ -1,9 +1,6 @@
 import pytest  # noqa: F401
 import torch
 from parameterized import parameterized, parameterized_class
-from test.common.assets import get_asset_path
-from test.common.parameterized_utils import nested_params
-from test.common.torchtext_test_case import TorchtextTestCase
 from torchtext.prototype.models import (
     T5_BASE_ENCODER,
     T5_BASE,
@@ -18,6 +15,9 @@
     T5Transform,
 )
 from torchtext.prototype.models.t5.wrapper import T5Wrapper
+from torchtext_unittest.common.assets import get_asset_path
+from torchtext_unittest.common.parameterized_utils import nested_params
+from torchtext_unittest.common.torchtext_test_case import TorchtextTestCase
 
 
 BUNDLERS = {

diff --git a/test/integration_tests/test_models.py b/test/integration_tests/test_models.py
@@ -7,9 +7,15 @@
     XLMR_BASE_ENCODER,
     XLMR_LARGE_ENCODER,
 )
+from torchtext_unittest.common.assets import get_asset_path
+from torchtext_unittest.common.torchtext_test_case import TorchtextTestCase
 
-from ..common.assets import get_asset_path
-from ..common.torchtext_test_case import TorchtextTestCase
+BUNDLERS = {
+    "xlmr_base": XLMR_BASE_ENCODER,
+    "xlmr_large": XLMR_LARGE_ENCODER,
+    "roberta_base": ROBERTA_BASE_ENCODER,
+    "roberta_large": ROBERTA_LARGE_ENCODER,
+}
 
 BUNDLERS = {
     "xlmr_base": XLMR_BASE_ENCODER,

diff --git a/test/prototype/models/__init__.py b/test/prototype/models/__init__.py
diff --git a/test/__init__.py → test/torchtext_unittest/__init__.py b/test/__init__.py → test/torchtext_unittest/__init__.py
diff --git a/test/asset/SST2/SST-2.zip → test/torchtext_unittest/asset/SST2/SST-2.zip b/test/asset/SST2/SST-2.zip → test/torchtext_unittest/asset/SST2/SST-2.zip
diff --git a/test/asset/bert_base_cased_vocab.txt → ..._unittest/asset/bert_base_cased_vocab.txt b/test/asset/bert_base_cased_vocab.txt → ..._unittest/asset/bert_base_cased_vocab.txt
diff --git a/test/asset/bert_base_uncased_vocab.txt → ...nittest/asset/bert_base_uncased_vocab.txt b/test/asset/bert_base_uncased_vocab.txt → ...nittest/asset/bert_base_uncased_vocab.txt
diff --git a/test/asset/clip_encoder.json → ...orchtext_unittest/asset/clip_encoder.json b/test/asset/clip_encoder.json → ...orchtext_unittest/asset/clip_encoder.json
diff --git a/test/asset/clip_vocab.bpe → test/torchtext_unittest/asset/clip_vocab.bpe b/test/asset/clip_vocab.bpe → test/torchtext_unittest/asset/clip_vocab.bpe
diff --git a/test/asset/glove.6B.zip → test/torchtext_unittest/asset/glove.6B.zip b/test/asset/glove.6B.zip → test/torchtext_unittest/asset/glove.6B.zip
diff --git a/test/asset/glove.840B.300d.zip → ...chtext_unittest/asset/glove.840B.300d.zip b/test/asset/glove.840B.300d.zip → ...chtext_unittest/asset/glove.840B.300d.zip
diff --git a/test/asset/gpt2_bpe_encoder.json → ...text_unittest/asset/gpt2_bpe_encoder.json b/test/asset/gpt2_bpe_encoder.json → ...text_unittest/asset/gpt2_bpe_encoder.json
diff --git a/test/asset/gpt2_bpe_vocab.bpe → ...rchtext_unittest/asset/gpt2_bpe_vocab.bpe b/test/asset/gpt2_bpe_vocab.bpe → ...rchtext_unittest/asset/gpt2_bpe_vocab.bpe
diff --git a/test/asset/label_names.txt → .../torchtext_unittest/asset/label_names.txt b/test/asset/label_names.txt → .../torchtext_unittest/asset/label_names.txt
diff --git a/test/asset/raw_datasets.jsonl → ...rchtext_unittest/asset/raw_datasets.jsonl b/test/asset/raw_datasets.jsonl → ...rchtext_unittest/asset/raw_datasets.jsonl
diff --git a/test/asset/roberta.base.output.pt → ...ext_unittest/asset/roberta.base.output.pt b/test/asset/roberta.base.output.pt → ...ext_unittest/asset/roberta.base.output.pt
diff --git a/test/asset/roberta.large.output.pt → ...xt_unittest/asset/roberta.large.output.pt b/test/asset/roberta.large.output.pt → ...xt_unittest/asset/roberta.large.output.pt
diff --git a/test/asset/spm_example.model → ...orchtext_unittest/asset/spm_example.model b/test/asset/spm_example.model → ...orchtext_unittest/asset/spm_example.model
diff --git a/test/asset/t5.base.encoder.output.pt → ..._unittest/asset/t5.base.encoder.output.pt b/test/asset/t5.base.encoder.output.pt → ..._unittest/asset/t5.base.encoder.output.pt
diff --git a/test/asset/t5.base.generation.output.pt → ...ittest/asset/t5.base.generation.output.pt b/test/asset/t5.base.generation.output.pt → ...ittest/asset/t5.base.generation.output.pt
diff --git a/test/asset/t5.base.model.output.pt → ...xt_unittest/asset/t5.base.model.output.pt b/test/asset/t5.base.model.output.pt → ...xt_unittest/asset/t5.base.model.output.pt
diff --git a/test/asset/t5.large.encoder.output.pt → ...unittest/asset/t5.large.encoder.output.pt b/test/asset/t5.large.encoder.output.pt → ...unittest/asset/t5.large.encoder.output.pt
diff --git a/test/asset/t5.large.generation.output.pt → ...ttest/asset/t5.large.generation.output.pt b/test/asset/t5.large.generation.output.pt → ...ttest/asset/t5.large.generation.output.pt
diff --git a/test/asset/t5.large.model.output.pt → ...t_unittest/asset/t5.large.model.output.pt b/test/asset/t5.large.model.output.pt → ...t_unittest/asset/t5.large.model.output.pt
diff --git a/test/asset/t5.small.encoder.output.pt → ...unittest/asset/t5.small.encoder.output.pt b/test/asset/t5.small.encoder.output.pt → ...unittest/asset/t5.small.encoder.output.pt
diff --git a/test/asset/t5.small.generation.output.pt → ...ttest/asset/t5.small.generation.output.pt b/test/asset/t5.small.generation.output.pt → ...ttest/asset/t5.small.generation.output.pt
diff --git a/test/asset/t5.small.model.output.pt → ...t_unittest/asset/t5.small.model.output.pt b/test/asset/t5.small.model.output.pt → ...t_unittest/asset/t5.small.model.output.pt
diff --git a/test/asset/t5_tokenizer_base.model → ...xt_unittest/asset/t5_tokenizer_base.model b/test/asset/t5_tokenizer_base.model → ...xt_unittest/asset/t5_tokenizer_base.model
diff --git a/...xt_normalization_ag_news_ref_results.test → ...xt_normalization_ag_news_ref_results.test b/...xt_normalization_ag_news_ref_results.test → ...xt_normalization_ag_news_ref_results.test
diff --git a/...asset/text_normalization_ag_news_test.csv → ...asset/text_normalization_ag_news_test.csv b/...asset/text_normalization_ag_news_test.csv → ...asset/text_normalization_ag_news_test.csv
diff --git a/test/asset/vectors_test.csv → ...torchtext_unittest/asset/vectors_test.csv b/test/asset/vectors_test.csv → ...torchtext_unittest/asset/vectors_test.csv
diff --git a/test/asset/vocab_raw_text_test.txt → ...xt_unittest/asset/vocab_raw_text_test.txt b/test/asset/vocab_raw_text_test.txt → ...xt_unittest/asset/vocab_raw_text_test.txt
diff --git a/test/asset/vocab_test.txt → test/torchtext_unittest/asset/vocab_test.txt b/test/asset/vocab_test.txt → test/torchtext_unittest/asset/vocab_test.txt
diff --git a/test/asset/vocab_test2.txt → .../torchtext_unittest/asset/vocab_test2.txt b/test/asset/vocab_test2.txt → .../torchtext_unittest/asset/vocab_test2.txt
diff --git a/test/asset/wiki.en.vec → test/torchtext_unittest/asset/wiki.en.vec b/test/asset/wiki.en.vec → test/torchtext_unittest/asset/wiki.en.vec
diff --git a/test/asset/xlmr.base.output.pt → ...chtext_unittest/asset/xlmr.base.output.pt b/test/asset/xlmr.base.output.pt → ...chtext_unittest/asset/xlmr.base.output.pt
diff --git a/test/asset/xlmr.large.output.pt → ...htext_unittest/asset/xlmr.large.output.pt b/test/asset/xlmr.large.output.pt → ...htext_unittest/asset/xlmr.large.output.pt
diff --git a/test/common/__init__.py → test/torchtext_unittest/common/__init__.py b/test/common/__init__.py → test/torchtext_unittest/common/__init__.py
diff --git a/test/common/assets.py → test/torchtext_unittest/common/assets.py b/test/common/assets.py → test/torchtext_unittest/common/assets.py
diff --git a/test/common/case_utils.py → test/torchtext_unittest/common/case_utils.py b/test/common/case_utils.py → test/torchtext_unittest/common/case_utils.py
diff --git a/test/common/parameterized_utils.py → ...xt_unittest/common/parameterized_utils.py b/test/common/parameterized_utils.py → ...xt_unittest/common/parameterized_utils.py
diff --git a/test/common/torchtext_test_case.py → ...xt_unittest/common/torchtext_test_case.py b/test/common/torchtext_test_case.py → ...xt_unittest/common/torchtext_test_case.py
diff --git a/test/csrc/__init__.py → test/torchtext_unittest/csrc/__init__.py b/test/csrc/__init__.py → test/torchtext_unittest/csrc/__init__.py
diff --git a/test/csrc/test_gpt2_bpe_tokenizer.py → ..._unittest/csrc/test_gpt2_bpe_tokenizer.py b/test/csrc/test_gpt2_bpe_tokenizer.py → ..._unittest/csrc/test_gpt2_bpe_tokenizer.py
diff --git a/test/data/__init__.py → test/torchtext_unittest/data/__init__.py b/test/data/__init__.py → test/torchtext_unittest/data/__init__.py
diff --git a/test/data/test_dataset_utils.py → ...htext_unittest/data/test_dataset_utils.py b/test/data/test_dataset_utils.py → ...htext_unittest/data/test_dataset_utils.py
diff --git a/test/data/test_functional.py → ...orchtext_unittest/data/test_functional.py b/test/data/test_functional.py → ...orchtext_unittest/data/test_functional.py
diff --git a/test/data/test_jit.py → test/torchtext_unittest/data/test_jit.py b/test/data/test_jit.py → test/torchtext_unittest/data/test_jit.py
diff --git a/test/data/test_metrics.py → test/torchtext_unittest/data/test_metrics.py b/test/data/test_metrics.py → test/torchtext_unittest/data/test_metrics.py
diff --git a/test/data/test_modules.py → test/torchtext_unittest/data/test_modules.py b/test/data/test_modules.py → test/torchtext_unittest/data/test_modules.py
diff --git a/test/data/test_utils.py → test/torchtext_unittest/data/test_utils.py b/test/data/test_utils.py → test/torchtext_unittest/data/test_utils.py
diff --git a/test/datasets/__init__.py → test/torchtext_unittest/datasets/__init__.py b/test/datasets/__init__.py → test/torchtext_unittest/datasets/__init__.py
diff --git a/test/datasets/common.py → test/torchtext_unittest/datasets/common.py b/test/datasets/common.py → test/torchtext_unittest/datasets/common.py
diff --git a/test/datasets/test_agnews.py → ...orchtext_unittest/datasets/test_agnews.py b/test/datasets/test_agnews.py → ...orchtext_unittest/datasets/test_agnews.py
diff --git a/test/datasets/test_amazonreviews.py → ...t_unittest/datasets/test_amazonreviews.py b/test/datasets/test_amazonreviews.py → ...t_unittest/datasets/test_amazonreviews.py
diff --git a/test/datasets/test_cc100.py → ...torchtext_unittest/datasets/test_cc100.py b/test/datasets/test_cc100.py → ...torchtext_unittest/datasets/test_cc100.py
diff --git a/test/datasets/test_cnndm.py → ...torchtext_unittest/datasets/test_cnndm.py b/test/datasets/test_cnndm.py → ...torchtext_unittest/datasets/test_cnndm.py
diff --git a/test/datasets/test_cola.py → .../torchtext_unittest/datasets/test_cola.py b/test/datasets/test_cola.py → .../torchtext_unittest/datasets/test_cola.py
diff --git a/test/datasets/test_conll2000chunking.py → ...ittest/datasets/test_conll2000chunking.py b/test/datasets/test_conll2000chunking.py → ...ittest/datasets/test_conll2000chunking.py
diff --git a/test/datasets/test_dbpedia.py → ...rchtext_unittest/datasets/test_dbpedia.py b/test/datasets/test_dbpedia.py → ...rchtext_unittest/datasets/test_dbpedia.py
diff --git a/test/datasets/test_enwik9.py → ...orchtext_unittest/datasets/test_enwik9.py b/test/datasets/test_enwik9.py → ...orchtext_unittest/datasets/test_enwik9.py
diff --git a/test/datasets/test_imdb.py → .../torchtext_unittest/datasets/test_imdb.py b/test/datasets/test_imdb.py → .../torchtext_unittest/datasets/test_imdb.py
diff --git a/test/datasets/test_iwslt2016.py → ...htext_unittest/datasets/test_iwslt2016.py b/test/datasets/test_iwslt2016.py → ...htext_unittest/datasets/test_iwslt2016.py
diff --git a/test/datasets/test_iwslt2017.py → ...htext_unittest/datasets/test_iwslt2017.py b/test/datasets/test_iwslt2017.py → ...htext_unittest/datasets/test_iwslt2017.py
diff --git a/test/datasets/test_mnli.py → .../torchtext_unittest/datasets/test_mnli.py b/test/datasets/test_mnli.py → .../torchtext_unittest/datasets/test_mnli.py
diff --git a/test/datasets/test_mrpc.py → .../torchtext_unittest/datasets/test_mrpc.py b/test/datasets/test_mrpc.py → .../torchtext_unittest/datasets/test_mrpc.py
diff --git a/test/datasets/test_multi30k.py → ...chtext_unittest/datasets/test_multi30k.py b/test/datasets/test_multi30k.py → ...chtext_unittest/datasets/test_multi30k.py
diff --git a/test/datasets/test_penntreebank.py → ...xt_unittest/datasets/test_penntreebank.py b/test/datasets/test_penntreebank.py → ...xt_unittest/datasets/test_penntreebank.py
diff --git a/test/datasets/test_qnli.py → .../torchtext_unittest/datasets/test_qnli.py b/test/datasets/test_qnli.py → .../torchtext_unittest/datasets/test_qnli.py
diff --git a/test/datasets/test_qqp.py → test/torchtext_unittest/datasets/test_qqp.py b/test/datasets/test_qqp.py → test/torchtext_unittest/datasets/test_qqp.py
diff --git a/test/datasets/test_rte.py → test/torchtext_unittest/datasets/test_rte.py b/test/datasets/test_rte.py → test/torchtext_unittest/datasets/test_rte.py
diff --git a/test/datasets/test_sogounews.py → ...htext_unittest/datasets/test_sogounews.py b/test/datasets/test_sogounews.py → ...htext_unittest/datasets/test_sogounews.py
diff --git a/test/datasets/test_squads.py → ...orchtext_unittest/datasets/test_squads.py b/test/datasets/test_squads.py → ...orchtext_unittest/datasets/test_squads.py
diff --git a/test/datasets/test_sst2.py → .../torchtext_unittest/datasets/test_sst2.py b/test/datasets/test_sst2.py → .../torchtext_unittest/datasets/test_sst2.py
diff --git a/test/datasets/test_stsb.py → .../torchtext_unittest/datasets/test_stsb.py b/test/datasets/test_stsb.py → .../torchtext_unittest/datasets/test_stsb.py
diff --git a/test/datasets/test_udpos.py → ...torchtext_unittest/datasets/test_udpos.py b/test/datasets/test_udpos.py → ...torchtext_unittest/datasets/test_udpos.py
diff --git a/test/datasets/test_wikitexts.py → ...htext_unittest/datasets/test_wikitexts.py b/test/datasets/test_wikitexts.py → ...htext_unittest/datasets/test_wikitexts.py
diff --git a/test/datasets/test_wnli.py → .../torchtext_unittest/datasets/test_wnli.py b/test/datasets/test_wnli.py → .../torchtext_unittest/datasets/test_wnli.py
diff --git a/test/datasets/test_yahooanswers.py → ...xt_unittest/datasets/test_yahooanswers.py b/test/datasets/test_yahooanswers.py → ...xt_unittest/datasets/test_yahooanswers.py
diff --git a/test/datasets/test_yelpreviews.py → ...ext_unittest/datasets/test_yelpreviews.py b/test/datasets/test_yelpreviews.py → ...ext_unittest/datasets/test_yelpreviews.py
diff --git a/test/models/__init__.py → test/torchtext_unittest/models/__init__.py b/test/models/__init__.py → test/torchtext_unittest/models/__init__.py
diff --git a/test/models/test_models.py → .../torchtext_unittest/models/test_models.py b/test/models/test_models.py → .../torchtext_unittest/models/test_models.py
diff --git a/test/models/test_transformers.py → ...text_unittest/models/test_transformers.py b/test/models/test_transformers.py → ...text_unittest/models/test_transformers.py
diff --git a/test/prototype/__init__.py → .../torchtext_unittest/prototype/__init__.py b/test/prototype/__init__.py → .../torchtext_unittest/prototype/__init__.py
diff --git a/test/prototype/integration_tests/__init__.py → ...ext_unittest/prototype/models/__init__.py b/test/prototype/integration_tests/__init__.py → ...ext_unittest/prototype/models/__init__.py
diff --git a/test/prototype/models/test_models.py → ..._unittest/prototype/models/test_models.py b/test/prototype/models/test_models.py → ..._unittest/prototype/models/test_models.py
@@ -2,8 +2,8 @@
 from unittest.mock import patch
 
 import torch
-from test.common.torchtext_test_case import TorchtextTestCase
 from torch.nn import functional as F
+from torchtext_unittest.common.torchtext_test_case import TorchtextTestCase
 
 
 class TestModels(TorchtextTestCase):

diff --git a/test/prototype/models/test_transforms.py → ...ttest/prototype/models/test_transforms.py b/test/prototype/models/test_transforms.py → ...ttest/prototype/models/test_transforms.py
@@ -1,7 +1,7 @@
 import torch
-from test.common.assets import get_asset_path
-from test.common.torchtext_test_case import TorchtextTestCase
 from torchtext.prototype.models import T5Transform
+from torchtext_unittest.common.assets import get_asset_path
+from torchtext_unittest.common.torchtext_test_case import TorchtextTestCase
 
 
 class TestTransforms(TorchtextTestCase):

diff --git a/test/prototype/test_functional.py → ...ext_unittest/prototype/test_functional.py b/test/prototype/test_functional.py → ...ext_unittest/prototype/test_functional.py
@@ -1,6 +1,4 @@
 import os
-import platform
-import unittest
 
 import torch
 import torchtext.data as data
@@ -10,8 +8,6 @@
 
 
 class TestFunctional(TorchtextTestCase):
-    # TODO(Nayef211): remove decorator once https://github.com/pytorch/pytorch/issues/38207 is closed
-    @unittest.skipIf(platform.system() == "Windows", "Test is known to fail on Windows.")
     def test_BasicEnglishNormalize(self) -> None:
         test_sample = "'\".<br />,()!?;:   Basic English Normalization for a Line of Text   '\".<br />,()!?;:"
         ref_results = [

diff --git a/test/prototype/test_transforms.py → ...ext_unittest/prototype/test_transforms.py b/test/prototype/test_transforms.py → ...ext_unittest/prototype/test_transforms.py
@@ -3,14 +3,14 @@
 import tempfile
 
 import torch
-from test.common.assets import get_asset_path
-from test.common.torchtext_test_case import TorchtextTestCase
 from torchtext.prototype.transforms import (
     sentencepiece_processor,
     sentencepiece_tokenizer,
     VectorTransform,
 )
 from torchtext.prototype.vectors import FastText
+from torchtext_unittest.common.assets import get_asset_path
+from torchtext_unittest.common.torchtext_test_case import TorchtextTestCase
 
 
 class TestTransforms(TorchtextTestCase):

diff --git a/test/prototype/test_vectors.py → ...chtext_unittest/prototype/test_vectors.py b/test/prototype/test_vectors.py → ...chtext_unittest/prototype/test_vectors.py
@@ -4,8 +4,8 @@
 import unittest
 
 import torch
-from test.common.torchtext_test_case import TorchtextTestCase
 from torchtext.prototype.vectors import build_vectors
+from torchtext_unittest.common.torchtext_test_case import TorchtextTestCase
 
 
 class TestVectors(TorchtextTestCase):

diff --git a/test/prototype/test_with_asset.py → ...ext_unittest/prototype/test_with_asset.py b/test/prototype/test_with_asset.py → ...ext_unittest/prototype/test_with_asset.py
@@ -6,7 +6,6 @@
 from functools import partial
 
 import torch
-from test.common.torchtext_test_case import TorchtextTestCase
 from torch.utils.data import DataLoader
 from torchtext.data.functional import custom_replace
 from torchtext.prototype.transforms import (
@@ -19,6 +18,7 @@
 from torchtext.prototype.vectors import build_vectors, FastText, GloVe, load_vectors_from_file_path
 from torchtext.prototype.vocab_factory import build_vocab_from_text_file, load_vocab_from_file
 from torchtext.utils import download_from_url
+from torchtext_unittest.common.torchtext_test_case import TorchtextTestCase
 
 from ..common.assets import get_asset_path
 

diff --git a/test/test_build.py → test/torchtext_unittest/test_build.py b/test/test_build.py → test/torchtext_unittest/test_build.py
diff --git a/test/test_functional.py → test/torchtext_unittest/test_functional.py b/test/test_functional.py → test/torchtext_unittest/test_functional.py
diff --git a/test/test_transforms.py → test/torchtext_unittest/test_transforms.py b/test/test_transforms.py → test/torchtext_unittest/test_transforms.py
diff --git a/test/test_utils.py → test/torchtext_unittest/test_utils.py b/test/test_utils.py → test/torchtext_unittest/test_utils.py
@@ -5,9 +5,9 @@
 import unittest
 from urllib.parse import urljoin
 
-from test.common.assets import conditional_remove, get_asset_path
 from torchtext import _TEXT_BUCKET
 from torchtext import utils
+from torchtext_unittest.common.assets import conditional_remove, get_asset_path
 
 from .common.torchtext_test_case import TorchtextTestCase
 

diff --git a/test/test_vocab.py → test/torchtext_unittest/test_vocab.py b/test/test_vocab.py → test/torchtext_unittest/test_vocab.py
@@ -4,8 +4,8 @@
 
 import pytest
 import torch
-from test.common.torchtext_test_case import TorchtextTestCase
 from torchtext.vocab import build_vocab_from_iterator, vocab
+from torchtext_unittest.common.torchtext_test_case import TorchtextTestCase
 
 
 class TestVocab(TorchtextTestCase):

diff --git a/tools/setup_helpers/extension.py b/tools/setup_helpers/extension.py
@@ -21,6 +21,10 @@
 _ROOT_DIR = _THIS_DIR.parent.parent.resolve()
 
 
+def _get_cxx11_abi():
+    return "-D_GLIBCXX_USE_CXX11_ABI=" + str(int(torch.compiled_with_cxx11_abi()))
+
+
 def get_ext_modules():
     modules = [
         Extension(name=_LIBTORCHTEXT_NAME, sources=[]),
@@ -72,6 +76,7 @@ def build_extension(self, ext):
             "-DBUILD_SHARED_LIBS=OFF",
             "-DCMAKE_POLICY_DEFAULT_CMP0063=NEW",
             "-DSPM_ENABLE_SHARED=OFF",
+            f"-DTORCH_COMPILED_WITH_CXX_ABI={_get_cxx11_abi()}",
         ]
         build_args = ["--target", "install"]
 

diff --git a/torchtext/datasets/multi30k.py b/torchtext/datasets/multi30k.py
@@ -12,11 +12,10 @@
     from torchdata.datapipes.iter import FileOpener, IterableWrapper
     from torchtext._download_hooks import HttpReader
 
-# TODO: Update URL to original once the server is back up (see https://github.com/pytorch/text/issues/1756)
 URL = {
-    "train": r"https://raw.githubusercontent.com/neychev/small_DL_repo/master/datasets/Multi30k/training.tar.gz",
-    "valid": r"https://raw.githubusercontent.com/neychev/small_DL_repo/master/datasets/Multi30k/validation.tar.gz",
-    "test": r"https://raw.githubusercontent.com/neychev/small_DL_repo/master/datasets/Multi30k/mmt16_task1_test.tar.gz",
+    "train": r"http://www.quest.dcs.shef.ac.uk/wmt16_files_mmt/training.tar.gz",
+    "valid": r"http://www.quest.dcs.shef.ac.uk/wmt16_files_mmt/validation.tar.gz",
+    "test": r"http://www.quest.dcs.shef.ac.uk/wmt16_files_mmt/mmt16_task1_test.tar.gz",
 }
 
 MD5 = {

diff --git a/torchtext/models/roberta/modules.py b/torchtext/models/roberta/modules.py
@@ -120,7 +120,12 @@ def __init__(
             batch_first=True,
             norm_first=normalize_before,
         )
-        self.layers = torch.nn.TransformerEncoder(encoder_layer=layer, num_layers=num_encoder_layers)
+        self.layers = torch.nn.TransformerEncoder(
+            encoder_layer=layer,
+            num_layers=num_encoder_layers,
+            enable_nested_tensor=True,
+            mask_check=False,
+        )
         self.positional_embedding = PositionalEmbedding(max_seq_len, embedding_dim, padding_idx)
         self.embedding_layer_norm = nn.LayerNorm(embedding_dim)
         self.dropout = nn.Dropout(dropout)