From 2d5e4ebfe05269a307391d2ea50a98f4afd15d59 Mon Sep 17 00:00:00 2001 From: Logan Adams Date: Wed, 6 Nov 2024 09:19:55 -0800 Subject: [PATCH 1/5] Update flake8 version --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b89c872eefe5..a4682b528c4d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ repos: - id: check-useless-excludes - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + rev: v6.1.0 hooks: - id: check-case-conflict - id: check-json From 98cf543af8453fb7ac0044e9a5f5beaba7d2de90 Mon Sep 17 00:00:00 2001 From: Logan Adams Date: Wed, 6 Nov 2024 09:22:32 -0800 Subject: [PATCH 2/5] Actually update the flake8 version --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a4682b528c4d..354cd381a6d0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ repos: - id: check-useless-excludes - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v6.1.0 + rev: v4.0.1 hooks: - id: check-case-conflict - id: check-json @@ -65,7 +65,7 @@ repos: ] - repo: https://github.com/pycqa/flake8 - rev: 4.0.1 + rev: 6.1.0 hooks: - id: flake8 args: ['--config=.flake8'] From de61c1d640f1cc52f32c1b15c03b84ceeb992020 Mon Sep 17 00:00:00 2001 From: Logan Adams Date: Wed, 6 Nov 2024 09:35:51 -0800 Subject: [PATCH 3/5] Update for failing test --- .../inference/v2/model_implementations/layer_container_base.py | 1 - 1 file changed, 1 deletion(-) diff --git a/deepspeed/inference/v2/model_implementations/layer_container_base.py b/deepspeed/inference/v2/model_implementations/layer_container_base.py index f26c87556665..62d240820c7b 100644 --- a/deepspeed/inference/v2/model_implementations/layer_container_base.py +++ b/deepspeed/inference/v2/model_implementations/layer_container_base.py @@ -14,7 +14,6 @@ # Currently have dependency loops for the type hints. InferenceModel = Type["InferenceModel"] -LayerContainer = Type["LayerContainer"] MAPPING_KEY = "PARAM_MAPPING" PLIST_HELPERS = "_ds_plist_strip_vals" From b8287fa6d5525144195253fb7b6a236573efef50 Mon Sep 17 00:00:00 2001 From: Logan Adams Date: Wed, 6 Nov 2024 11:03:58 -0800 Subject: [PATCH 4/5] Update pre-commit version of flake8 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 354cd381a6d0..c6282b4c1cea 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -65,7 +65,7 @@ repos: ] - repo: https://github.com/pycqa/flake8 - rev: 6.1.0 + rev: 5.0.4 hooks: - id: flake8 args: ['--config=.flake8'] From 2c5740a03e357bf73409f7a0dd8d94dc47c371ba Mon Sep 17 00:00:00 2001 From: Logan Adams Date: Wed, 6 Nov 2024 11:05:31 -0800 Subject: [PATCH 5/5] Revert "Update for failing test" This reverts commit de61c1d640f1cc52f32c1b15c03b84ceeb992020. --- .../inference/v2/model_implementations/layer_container_base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/deepspeed/inference/v2/model_implementations/layer_container_base.py b/deepspeed/inference/v2/model_implementations/layer_container_base.py index 62d240820c7b..f26c87556665 100644 --- a/deepspeed/inference/v2/model_implementations/layer_container_base.py +++ b/deepspeed/inference/v2/model_implementations/layer_container_base.py @@ -14,6 +14,7 @@ # Currently have dependency loops for the type hints. InferenceModel = Type["InferenceModel"] +LayerContainer = Type["LayerContainer"] MAPPING_KEY = "PARAM_MAPPING" PLIST_HELPERS = "_ds_plist_strip_vals"