From 45105f5e6af009c15f856355f1d49dbf4f5faaae Mon Sep 17 00:00:00 2001 From: Heng Pan Date: Fri, 24 Nov 2023 19:04:05 +0000 Subject: [PATCH] fix conflicts --- src/py/flwr/client/middleware/typing.py | 2 +- src/py/flwr/client/middleware/utils.py | 2 +- src/py/flwr/client/middleware/utils_test.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/py/flwr/client/middleware/typing.py b/src/py/flwr/client/middleware/typing.py index a4339736d4b8..8e0915a485c9 100644 --- a/src/py/flwr/client/middleware/typing.py +++ b/src/py/flwr/client/middleware/typing.py @@ -16,7 +16,7 @@ from typing import Callable -from flwr.client.typing import Bwd, Fwd +from flwr.client.flower import Bwd, Fwd App = Callable[[Fwd], Bwd] Layer = Callable[[Fwd, App], Bwd] diff --git a/src/py/flwr/client/middleware/utils.py b/src/py/flwr/client/middleware/utils.py index 4755adc0f340..177ffeb47436 100644 --- a/src/py/flwr/client/middleware/utils.py +++ b/src/py/flwr/client/middleware/utils.py @@ -16,7 +16,7 @@ from typing import List -from flwr.client.typing import Bwd, Fwd +from flwr.client.flower import Bwd, Fwd from .typing import App, Layer diff --git a/src/py/flwr/client/middleware/utils_test.py b/src/py/flwr/client/middleware/utils_test.py index 61b8e9e12f01..37c7e889957e 100644 --- a/src/py/flwr/client/middleware/utils_test.py +++ b/src/py/flwr/client/middleware/utils_test.py @@ -18,7 +18,7 @@ import unittest from typing import List -from flwr.client.typing import Bwd, Fwd +from flwr.client.flower import Bwd, Fwd from flwr.client.workload_state import WorkloadState from flwr.proto.task_pb2 import TaskIns, TaskRes