diff --git a/docker/consistency.dockerfile b/docker/consistency.dockerfile index 1f09626d890..a564d76c9bb 100644 --- a/docker/consistency.dockerfile +++ b/docker/consistency.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.9-slim ENV PYTHONDONTWRITEBYTECODE=1 USER root ARG REF=main diff --git a/docker/custom-tokenizers.dockerfile b/docker/custom-tokenizers.dockerfile index 5d95e689654..87601bcf3f4 100644 --- a/docker/custom-tokenizers.dockerfile +++ b/docker/custom-tokenizers.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.9-slim ENV PYTHONDONTWRITEBYTECODE=1 USER root RUN apt-get update && apt-get install -y libsndfile1-dev espeak-ng time git cmake wget xz-utils build-essential g++5 libprotobuf-dev protobuf-compiler diff --git a/docker/examples-tf.dockerfile b/docker/examples-tf.dockerfile index 9281630d3af..ffbaafd8b86 100644 --- a/docker/examples-tf.dockerfile +++ b/docker/examples-tf.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.9-slim ENV PYTHONDONTWRITEBYTECODE=1 USER root RUN apt-get update && apt-get install -y libsndfile1-dev espeak-ng time git diff --git a/docker/examples-torch.dockerfile b/docker/examples-torch.dockerfile index da9afcb801d..f9c7257b9cc 100644 --- a/docker/examples-torch.dockerfile +++ b/docker/examples-torch.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.9-slim ENV PYTHONDONTWRITEBYTECODE=1 USER root RUN apt-get update && apt-get install -y --no-install-recommends libsndfile1-dev espeak-ng time git g++ cmake pkg-config openssh-client git diff --git a/docker/exotic-models.dockerfile b/docker/exotic-models.dockerfile index 2371ffb91c9..dd40476064a 100644 --- a/docker/exotic-models.dockerfile +++ b/docker/exotic-models.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.9-slim ENV PYTHONDONTWRITEBYTECODE=1 ARG REF=main USER root diff --git a/docker/jax-light.dockerfile b/docker/jax-light.dockerfile index 315b526a714..df1e1144c0e 100644 --- a/docker/jax-light.dockerfile +++ b/docker/jax-light.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.9-slim ENV PYTHONDONTWRITEBYTECODE=1 ARG REF=main USER root diff --git a/docker/pipeline-tf.dockerfile b/docker/pipeline-tf.dockerfile index 393738ff87f..dd38b52acbb 100644 --- a/docker/pipeline-tf.dockerfile +++ b/docker/pipeline-tf.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.9-slim ENV PYTHONDONTWRITEBYTECODE=1 ARG REF=main USER root diff --git a/docker/pipeline-torch.dockerfile b/docker/pipeline-torch.dockerfile index 992891a54a4..2b4014b4fff 100644 --- a/docker/pipeline-torch.dockerfile +++ b/docker/pipeline-torch.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.9-slim ENV PYTHONDONTWRITEBYTECODE=1 ARG REF=main USER root diff --git a/docker/quality.dockerfile b/docker/quality.dockerfile index 7a4145517a7..7e6999e40f2 100644 --- a/docker/quality.dockerfile +++ b/docker/quality.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.9-slim ENV PYTHONDONTWRITEBYTECODE=1 ARG REF=main USER root diff --git a/docker/tf-light.dockerfile b/docker/tf-light.dockerfile index 7168ddae122..67dc928c22f 100644 --- a/docker/tf-light.dockerfile +++ b/docker/tf-light.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.9-slim ENV PYTHONDONTWRITEBYTECODE=1 ARG REF=main USER root diff --git a/docker/torch-jax-light.dockerfile b/docker/torch-jax-light.dockerfile index 7cfa141732f..b779fcbfac9 100644 --- a/docker/torch-jax-light.dockerfile +++ b/docker/torch-jax-light.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.9-slim ENV PYTHONDONTWRITEBYTECODE=1 ARG REF=main USER root diff --git a/docker/torch-light.dockerfile b/docker/torch-light.dockerfile index 710a599abbe..c1a8f8ac0f5 100644 --- a/docker/torch-light.dockerfile +++ b/docker/torch-light.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.9-slim ENV PYTHONDONTWRITEBYTECODE=1 ARG REF=main USER root diff --git a/docker/torch-tf-light.dockerfile b/docker/torch-tf-light.dockerfile index ac35b6be81f..0556b79ffdb 100644 --- a/docker/torch-tf-light.dockerfile +++ b/docker/torch-tf-light.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.9-slim ENV PYTHONDONTWRITEBYTECODE=1 ARG REF=main RUN echo ${REF} diff --git a/utils/modular_model_converter.py b/utils/modular_model_converter.py index e75393364ff..482f9c32a6a 100644 --- a/utils/modular_model_converter.py +++ b/utils/modular_model_converter.py @@ -19,7 +19,7 @@ import os import re from abc import ABC, abstractmethod from collections import Counter, defaultdict, deque -from typing import Dict, Set +from typing import Dict, Optional, Set, Union import libcst as cst from check_copies import run_ruff @@ -169,7 +169,7 @@ def is_call_to_super(node, func_name): ) -def get_full_attribute_name(node: cst.Attribute | cst.Name) -> str | None: +def get_full_attribute_name(node: Union[cst.Attribute, cst.Name]) -> Optional[str]: """Get the full name of an Attribute or Name node (e.g. `"nn.Module"` for an Attribute representing it). If the successive value of an Attribute are not Name nodes, return `None`.""" if m.matches(node, m.Name()): @@ -430,11 +430,11 @@ class SuperTransformer(cst.CSTTransformer): def find_all_dependencies( dependency_mapping: Dict[str, set], - start_entity: str | None = None, - initial_dependencies: set | None = None, - initial_checked_dependencies: set | None = None, + start_entity: Optional[str] = None, + initial_dependencies: Optional[set] = None, + initial_checked_dependencies: Optional[set] = None, return_parent: bool = False, -) -> list | set: +) -> Union[list, set]: """Return all the dependencies of the given `start_entity` or `initial_dependencies`. This is basically some kind of BFS traversal algorithm. It can either start from `start_entity`, or `initial_dependencies`. @@ -525,7 +525,7 @@ class ClassDependencyMapper(CSTVisitor): """ def __init__( - self, class_name: str, global_names: set[str], objects_imported_from_modeling: set[str] | None = None + self, class_name: str, global_names: set[str], objects_imported_from_modeling: Optional[set[str]] = None ): super().__init__() self.class_name = class_name @@ -553,7 +553,7 @@ def dependencies_for_class_node(node: cst.ClassDef, global_names: set[str]) -> s def augmented_dependencies_for_class_node( - node: cst.ClassDef, mapper: "ModuleMapper", objects_imported_from_modeling: set[str] | None = None + node: cst.ClassDef, mapper: "ModuleMapper", objects_imported_from_modeling: Optional[set[str]] = None ) -> set: """Create augmented dependencies for a class node based on a `mapper`. Augmented dependencies means immediate dependencies + recursive function and assignments dependencies.