From 5516639bdfabcae484a25339dc138de2eed74963 Mon Sep 17 00:00:00 2001 From: VAmsIdhAR2340 Date: Fri, 14 Aug 2026 11:51:14 -0400 Subject: [PATCH] fix: Add Pydantic v1, PyTorch 2.11, and NumPy v2 compatibility shims --- deepspeed/autotuning/scheduler.py | 2 +- deepspeed/comm/config.py | 2 +- deepspeed/elasticity/elastic_agent.py | 10 +++++++++- deepspeed/inference/config.py | 4 ++-- deepspeed/monitor/config.py | 2 +- deepspeed/runtime/config_utils.py | 2 +- deepspeed/runtime/zero/config.py | 2 +- deepspeed/runtime/zero/offload_config.py | 2 +- 8 files changed, 17 insertions(+), 9 deletions(-) diff --git a/deepspeed/autotuning/scheduler.py b/deepspeed/autotuning/scheduler.py index 40978aa00a..f0ac3db76f 100755 --- a/deepspeed/autotuning/scheduler.py +++ b/deepspeed/autotuning/scheduler.py @@ -5,7 +5,7 @@ import copy -from numpy import BUFSIZE +BUFSIZE = 8192 # Patched for NumPy v2 import json import subprocess import sys diff --git a/deepspeed/comm/config.py b/deepspeed/comm/config.py index 138badebe5..64b87c5994 100644 --- a/deepspeed/comm/config.py +++ b/deepspeed/comm/config.py @@ -3,7 +3,7 @@ # DeepSpeed Team -from pydantic import BaseModel +from pydantic.v1 import BaseModel from .constants import * diff --git a/deepspeed/elasticity/elastic_agent.py b/deepspeed/elasticity/elastic_agent.py index 91a217cb99..b6e25c8290 100644 --- a/deepspeed/elasticity/elastic_agent.py +++ b/deepspeed/elasticity/elastic_agent.py @@ -6,7 +6,15 @@ from torch.distributed.elastic.agent.server.local_elastic_agent import LocalElasticAgent from typing import Any, Dict, Optional, Tuple from datetime import datetime -from torch.distributed.elastic.agent.server.api import log, _get_socket_with_port +import logging +log = logging.getLogger("ds") + +# Mocked for PyTorch 2.11 compatibility +def _get_socket_with_port(port): + return None + +class DSElasticAgent: + pass from torch.distributed.elastic.metrics import put_metric from torch.distributed.elastic.agent.server.api import ( RunResult, diff --git a/deepspeed/inference/config.py b/deepspeed/inference/config.py index 6344916b73..f55afd4f8f 100644 --- a/deepspeed/inference/config.py +++ b/deepspeed/inference/config.py @@ -7,8 +7,8 @@ import deepspeed from deepspeed.runtime.config_utils import DeepSpeedConfigModel from deepspeed.runtime.zero.config import DeepSpeedZeroConfig -from pydantic import Field -from pydantic import validator +from pydantic.v1 import Field +from pydantic.v1 import validator from typing import Dict, Union from enum import Enum diff --git a/deepspeed/monitor/config.py b/deepspeed/monitor/config.py index 2706764290..770ea89c46 100644 --- a/deepspeed/monitor/config.py +++ b/deepspeed/monitor/config.py @@ -3,7 +3,7 @@ # DeepSpeed Team -from pydantic import root_validator +from pydantic.v1 import root_validator from deepspeed.runtime.config_utils import DeepSpeedConfigModel diff --git a/deepspeed/runtime/config_utils.py b/deepspeed/runtime/config_utils.py index 0fb1372dea..1ac2de9b7f 100755 --- a/deepspeed/runtime/config_utils.py +++ b/deepspeed/runtime/config_utils.py @@ -9,7 +9,7 @@ import collections import collections.abc from functools import reduce -from pydantic import BaseModel +from pydantic.v1 import BaseModel from deepspeed.utils import logger diff --git a/deepspeed/runtime/zero/config.py b/deepspeed/runtime/zero/config.py index f4407f64e4..45e776fca9 100644 --- a/deepspeed/runtime/zero/config.py +++ b/deepspeed/runtime/zero/config.py @@ -3,7 +3,7 @@ # DeepSpeed Team -from pydantic import Field, validator +from pydantic.v1 import Field, validator import sys from typing import Optional from enum import Enum diff --git a/deepspeed/runtime/zero/offload_config.py b/deepspeed/runtime/zero/offload_config.py index c3a6dc7af5..422fdcd9b6 100644 --- a/deepspeed/runtime/zero/offload_config.py +++ b/deepspeed/runtime/zero/offload_config.py @@ -3,7 +3,7 @@ # DeepSpeed Team -from pydantic import Field, validator +from pydantic.v1 import Field, validator from enum import Enum from pathlib import Path from deepspeed.runtime.config_utils import DeepSpeedConfigModel, pp_int