[BE] Import Literal, Protocol, and Final from standard library …

…`typing` as of Python 3.8+ (pytorch#94490)

Changes:

1. `typing_extensions -> typing-extentions` in dependency. Use dash rather than underline to fit the [PEP 503: Normalized Names](https://peps.python.org/pep-0503/#normalized-names) convention.

```python
import re

def normalize(name):
    return re.sub(r"[-_.]+", "-", name).lower()
```

2. Import `Literal`, `Protocal`, and `Final` from standard library as of Python 3.8+
3. Replace `Union[Literal[XXX], Literal[YYY]]` to `Literal[XXX, YYY]`.

Pull Request resolved: pytorch#94490
Approved by: https://github.com/ezyang, https://github.com/albanD

.ci/docker/common/install_conda.sh

@@ -90,8 +90,8 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then
     # Install llvm-8 as it is required to compile llvmlite-0.30.0 from source
     conda_install numpy=1.18.5 ${CONDA_COMMON_DEPS} llvmdev=8.0.0
   else
-    # Install `typing_extensions` for 3.7
-    conda_install numpy=1.18.5 ${CONDA_COMMON_DEPS} typing_extensions
+    # Install `typing-extensions` for 3.7
+    conda_install numpy=1.18.5 ${CONDA_COMMON_DEPS} typing-extensions
   fi
 
   # Use conda cmake in some cases. Conda cmake will be newer than our supported

.circleci/scripts/binary_ios_build.sh

@@ -15,7 +15,7 @@ export PATH="~/anaconda/bin:${PATH}"
 source ~/anaconda/bin/activate
 
 # Install dependencies
-conda install numpy ninja pyyaml mkl mkl-include setuptools cmake requests typing_extensions --yes
+conda install numpy ninja pyyaml mkl mkl-include setuptools cmake requests typing-extensions --yes
 conda install -c conda-forge valgrind --yes
 export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname $(which conda))/../"}
 

.circleci/verbatim-sources/job-specs/job-specs-custom.yml

@@ -562,7 +562,7 @@
                 $*  || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*)
             }
 
-            retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake requests typing_extensions --yes
+            retry conda install numpy ninja pyyaml mkl mkl-include setuptools cmake requests typing-extensions --yes
 
             # sync submodules
             cd ${PROJ_ROOT}

.github/requirements/conda-env-Linux-X64

@@ -6,4 +6,4 @@ numpy=1.23.3
 pyyaml=6.0
 requests=2.28.1
 setuptools=65.5.0
-typing_extensions=4.3.0
+typing-extensions=4.3.0

.github/requirements/conda-env-iOS

@@ -7,4 +7,4 @@ numpy=1.23.3
 pyyaml=6.0
 requests=2.28.1
 setuptools=63.4.1
-typing_extensions=4.3.0
+typing-extensions=4.3.0

.github/requirements/conda-env-macOS-ARM64

@@ -2,7 +2,7 @@ numpy=1.22.3
 pyyaml=6.0
 setuptools=61.2.0
 cmake=3.22.*
-typing_extensions=4.3.0
+typing-extensions=4.3.0
 dataclasses=0.8
 pip=22.2.2
 six=1.16.0

.github/requirements/conda-env-macOS-X64

@@ -4,7 +4,7 @@ numpy=1.18.5
 pyyaml=5.3
 setuptools=46.0.0
 cmake=3.22.*
-typing_extensions=4.3.0
+typing-extensions=4.3.0
 dataclasses=0.8
 pip=22.2.2
 six=1.16.0

.github/requirements/regenerate-requirements.txt

@@ -1,2 +1,2 @@
-typing_extensions
+typing-extensions
 jinja2

.github/scripts/generate_ci_workflows.py

@@ -2,13 +2,13 @@
 
 from dataclasses import asdict, dataclass, field
 from pathlib import Path
-from typing import Dict, Set, List, Iterable
+from typing import Dict, Set, List, Literal, Iterable
 
 import jinja2
 
 import os
 import sys
-from typing_extensions import Literal, TypedDict
+from typing_extensions import TypedDict  # Python 3.11+
 
 import generate_binary_build_matrix  # type: ignore[import]
 

.github/workflows/run_torchbench.yml

@@ -40,7 +40,7 @@ jobs:
           . "${SETUP_SCRIPT}"
           conda activate pr-ci
           conda install -y numpy="${NUMPY_VERSION}" requests ninja pyyaml mkl mkl-include \
-                           setuptools cmake=3.22.* typing_extensions boto3 \
+                           setuptools cmake=3.22.* typing-extensions boto3 \
                            six pillow pytest tabulate gitpython git-lfs tqdm psutil
           pip install --pre torch torchvision torchtext -f https://download.pytorch.org/whl/nightly/cu116/torch_nightly.html
       - name: Setup TorchBench branch

benchmarks/dynamo/Makefile

@@ -18,7 +18,7 @@ pull-deps: clone-deps
 	(cd ../../../torchvision    && git pull && git submodule update --init --recursive)
 	(cd ../../../torchdata      && git pull && git submodule update --init --recursive)
 	(cd ../../../torchtext      && git pull && git submodule update --init --recursive)
-	(cd ../../../torchaudio      && git pull && git submodule update --init --recursive)
+	(cd ../../../torchaudio     && git pull && git submodule update --init --recursive)
 	(cd ../../../detectron2     && git pull && git submodule update --init --recursive)
 	(cd ../../../torchbenchmark && git pull && git submodule update --init --recursive)
 	(cd ../../../triton         && git fetch && git checkout $(TRITON_VERSION) && git submodule update --init --recursive)
@@ -28,7 +28,7 @@ build-deps: clone-deps
 	# conda create --name torchdynamo -y python=3.8
 	# conda activate torchdynamo
 	conda install -y astunparse numpy scipy ninja pyyaml mkl mkl-include setuptools cmake \
-		typing_extensions six requests protobuf numba cython scikit-learn
+		typing-extensions six requests protobuf numba cython scikit-learn
 	conda install -y -c pytorch magma-cuda116
 	conda install -y -c conda-forge librosa
 	(cd ../../../torchvision && python setup.py clean && python setup.py develop)

docs/source/jit.rst

@@ -831,12 +831,7 @@ New API:
 
 ::
 
-    try:
-        from typing_extensions import Final
-    except:
-        # If you don't have `typing_extensions` installed, you can use a
-        # polyfill from `torch.jit`.
-        from torch.jit import Final
+    from typing import Final
 
     class MyModule(torch.nn.Module):
 

pyproject.toml

@@ -8,7 +8,7 @@ requires = [
     "pyyaml",
     "setuptools",
     "cmake",
-    "typing_extensions",
+    "typing-extensions",
     "six",
     "requests",
 ]

requirements.txt

@@ -8,7 +8,7 @@ pyyaml
 requests
 setuptools
 types-dataclasses
-typing_extensions
+typing-extensions
 sympy
 filelock
 networkx

setup.py

@@ -1014,7 +1014,7 @@ def main():
     # the list of runtime dependencies required by this built package
     install_requires = [
         'filelock',
-        'typing_extensions',
+        'typing-extensions',
         'sympy',
         'networkx',
     ]

tools/extract_scripts.py

@@ -7,7 +7,7 @@
 from typing import Any, Dict, Optional
 
 import yaml
-from typing_extensions import TypedDict
+from typing_extensions import TypedDict  # Python 3.11+
 
 Step = Dict[str, Any]
 

tools/fast_nvcc/fast_nvcc.py

@@ -16,7 +16,7 @@
 import time
 from typing import Awaitable, cast, DefaultDict, Dict, List, Match, Optional, Set
 
-from typing_extensions import TypedDict
+from typing_extensions import TypedDict  # Python 3.11+
 
 help_msg = """fast_nvcc [OPTION]... -- [NVCC_ARG]...
 

tools/jit/gen_unboxing.py

@@ -4,7 +4,7 @@
 import pathlib
 import sys
 from dataclasses import dataclass
-from typing import List, Sequence, Union
+from typing import List, Literal, Sequence, Union
 
 import yaml
 
@@ -17,13 +17,12 @@
 from torchgen.model import Argument, NativeFunction, NativeFunctionsGroup, Variant
 from torchgen.selective_build.selector import SelectiveBuilder
 from torchgen.utils import FileManager, make_file_manager, mapMaybe, Target
-from typing_extensions import Literal
 
 
 # Generates UnboxingFunctions.h & UnboxingFunctions.cpp.
 @dataclass(frozen=True)
 class ComputeUnboxingFunctions:
-    target: Union[Literal[Target.DECLARATION], Literal[Target.DEFINITION]]
+    target: Literal[Target.DECLARATION, Target.DEFINITION]
     selector: SelectiveBuilder
 
     @method_with_native_function

tools/onnx/sarif/gen_sarif.sh

@@ -33,7 +33,7 @@ python -m jschema_to_python \
     -vv
 
 # Generate SARIF version file
-echo "from typing_extensions import Final" > "${ROOT}/${SARIF_DIR}/version.py"
+echo "from typing import Final" > "${ROOT}/${SARIF_DIR}/version.py"
 echo "SARIF_VERSION: Final = \"${SARIF_VERSION}\"" >> "${ROOT}/${SARIF_DIR}/version.py"
 echo "SARIF_SCHEMA_LINK: Final = \"${SARIF_SCHEMA_LINK}\"" >> "${ROOT}/${SARIF_DIR}/version.py"
 

torch/_C/_VariableFunctions.pyi.in

@@ -1,8 +1,7 @@
 # ${generated_comment}
 
 from torch import Tensor, Generator, strided, memory_format, contiguous_format, strided
-from typing import List, Tuple, Optional, Union, Any, ContextManager, Callable, overload, Iterator, NamedTuple, Sequence, TypeVar
-from typing_extensions import Literal
+from typing import List, Tuple, Optional, Union, Any, ContextManager, Callable, overload, Iterator, NamedTuple, Sequence, Literal, TypeVar
 from torch._six import inf
 
 from torch.types import _int, _float, _bool, Number, _dtype, _device, _qscheme, _size, _layout, SymInt, Device

torch/_C/__init__.pyi.in

@@ -9,8 +9,7 @@ from pathlib import Path
 from typing import (
     Any, BinaryIO, Callable, ContextManager, Dict, Iterable, Iterator, List,
     NamedTuple, Optional, overload, Sequence, Tuple, TypeVar, Type, Union,
-    Generic, Set, AnyStr)
-from typing_extensions import Literal
+    Literal, Generic, Set, AnyStr)
 from torch._six import inf
 
 from torch.types import (

torch/_C/_profiler.pyi

@@ -1,10 +1,8 @@
 from enum import Enum
-from typing import List, Optional, Tuple, Union
+from typing import List, Literal, Optional, Tuple, Union
 
 from torch._C import device, dtype, layout
 
-from typing_extensions import Literal
-
 # defined in torch/csrc/profiler/python/init.cpp
 
 class RecordScope(Enum):

torch/_C/return_types.pyi.in

@@ -1,8 +1,7 @@
 # ${generated_comment}
 
 from torch import Tensor, Generator, strided, memory_format, contiguous_format, strided
-from typing import List, Tuple, Optional, Union, Any, ContextManager, Callable, overload, Iterator, NamedTuple, Sequence, TypeVar
-from typing_extensions import Literal
+from typing import List, Tuple, Optional, Union, Any, ContextManager, Callable, overload, Iterator, NamedTuple, Sequence, Literal, TypeVar
 from torch._six import inf
 
 from torch.types import _int, _float, _bool, Number, _dtype, _device, _qscheme, _size, _layout

torch/_dynamo/backends/registry.py

@@ -1,7 +1,5 @@
 import functools
-from typing import Callable, Dict, List, Optional, Sequence, Tuple
-
-from typing_extensions import Protocol
+from typing import Callable, Dict, List, Optional, Protocol, Sequence, Tuple
 
 import torch
 from torch import fx

torch/_dynamo/types.py

@@ -1,9 +1,17 @@
 import dataclasses
 import sys
 import types
-from typing import Callable, Dict, List, NamedTuple, Optional, OrderedDict, Union
+from typing import (
+    Callable,
+    Dict,
+    List,
+    NamedTuple,
+    Optional,
+    OrderedDict,
+    Protocol,
+    Union,
+)
 
-from typing_extensions import Protocol
 
 if sys.version_info >= (3, 11):
     from torch._C._dynamo import eval_frame

torch/_refs/fft.py

@@ -1,8 +1,6 @@
 import math
 
-from typing import Iterable, List, NamedTuple, Optional, Sequence, Tuple, Union
-
-from typing_extensions import Literal
+from typing import Iterable, List, Literal, NamedTuple, Optional, Sequence, Tuple, Union
 
 import torch
 import torch._prims as prims

torch/distributed/pipeline/sync/checkpoint.py

@@ -28,12 +28,12 @@
 from contextlib import contextmanager
 import threading
 from typing import (
-    TYPE_CHECKING,
     Any,
     Deque,
     Generator,
     List,
     Optional,
+    Protocol,
     Union,
     Sequence,
     Tuple
@@ -60,12 +60,6 @@
 RNGStates = Tuple[Tensor, Optional[Tensor]]  # (cpu_rng_state, gpu_rng_state)
 
 
-if TYPE_CHECKING:
-    from typing_extensions import Protocol
-else:
-    Protocol = object
-
-
 # Protocol with __call__ instead of Callable can be used as an attribute type.
 # See: https://github.com/python/mypy/issues/708#issuecomment-561735949
 class Function(Protocol):

torch/nn/modules/lazy.py

@@ -1,6 +1,6 @@
 import itertools
-from typing_extensions import Protocol
 import warnings
+from typing import Protocol
 
 import torch
 from ..parameter import is_lazy

torch/onnx/_internal/diagnostics/infra/sarif/_artifact.py

@@ -4,9 +4,7 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import Any, List, Optional
-
-from typing_extensions import Literal
+from typing import Any, List, Literal, Optional
 
 from torch.onnx._internal.diagnostics.infra.sarif import (
     _artifact_content,

torch/onnx/_internal/diagnostics/infra/sarif/_external_properties.py

@@ -4,9 +4,7 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import List, Optional
-
-from typing_extensions import Literal
+from typing import List, Literal, Optional
 
 from torch.onnx._internal.diagnostics.infra.sarif import (
     _address,

torch/onnx/_internal/diagnostics/infra/sarif/_notification.py

@@ -4,9 +4,7 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import List, Optional
-
-from typing_extensions import Literal
+from typing import List, Literal, Optional
 
 from torch.onnx._internal.diagnostics.infra.sarif import (
     _exception,

torch/onnx/_internal/diagnostics/infra/sarif/_reporting_configuration.py

@@ -4,9 +4,7 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import Optional
-
-from typing_extensions import Literal
+from typing import Literal, Optional
 
 from torch.onnx._internal.diagnostics.infra.sarif import _property_bag
 

torch/onnx/_internal/diagnostics/infra/sarif/_result.py

@@ -4,9 +4,7 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import Any, List, Optional
-
-from typing_extensions import Literal
+from typing import Any, List, Literal, Optional
 
 from torch.onnx._internal.diagnostics.infra.sarif import (
     _artifact_location,

torch/onnx/_internal/diagnostics/infra/sarif/_run.py

@@ -4,9 +4,7 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import Any, List, Optional
-
-from typing_extensions import Literal
+from typing import Any, List, Literal, Optional
 
 from torch.onnx._internal.diagnostics.infra.sarif import (
     _address,

torch/onnx/_internal/diagnostics/infra/sarif/_sarif_log.py

@@ -4,9 +4,7 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import List, Optional
-
-from typing_extensions import Literal
+from typing import List, Literal, Optional
 
 from torch.onnx._internal.diagnostics.infra.sarif import (
     _external_properties,