From be54e97147646e7fbc5bd91033ed598577476e8d Mon Sep 17 00:00:00 2001 From: ThibaultFy Date: Mon, 26 Feb 2024 17:47:16 +0100 Subject: [PATCH] chore: rebase legacy Signed-off-by: ThibaultFy --- substrafl/evaluation_strategy.py | 2 +- substrafl/strategies/scaffold.py | 4 ---- substrafl/strategies/strategy.py | 7 ------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/substrafl/evaluation_strategy.py b/substrafl/evaluation_strategy.py index 162b39f7..c21c7921 100644 --- a/substrafl/evaluation_strategy.py +++ b/substrafl/evaluation_strategy.py @@ -84,7 +84,7 @@ def __init__( raise ValueError("test_data_nodes lists cannot be empty") if not all(isinstance(node, TestDataNodeProtocol) for node in test_data_nodes): - raise TypeError("test_data_nodes must respect the TestDataNodeProtocol") + raise TypeError("test_data_nodes must implement the TestDataNodeProtocol") if eval_frequency is None and eval_rounds is None: raise ValueError("At least one of eval_frequency or eval_rounds must be defined") diff --git a/substrafl/strategies/scaffold.py b/substrafl/strategies/scaffold.py index 3afb7942..fc73381a 100644 --- a/substrafl/strategies/scaffold.py +++ b/substrafl/strategies/scaffold.py @@ -158,11 +158,7 @@ def perform_evaluation( test_data_node.update_states( operation=self.evaluate( -<<<<<<< HEAD data_samples=test_data_node.data_sample_keys, -======= - data_samples=test_data_node.test_data_sample_keys, ->>>>>>> a79ee49 (rebase) _algo_name=f"Evaluating with {self.__class__.__name__}", ), traintask_id=local_state.key, diff --git a/substrafl/strategies/strategy.py b/substrafl/strategies/strategy.py index 0f202b87..3442ae6e 100644 --- a/substrafl/strategies/strategy.py +++ b/substrafl/strategies/strategy.py @@ -15,17 +15,10 @@ from substrafl.algorithms.algo import Algo from substrafl.compute_plan_builder import ComputePlanBuilder from substrafl.evaluation_strategy import EvaluationStrategy -<<<<<<< HEAD from substrafl.nodes import AggregationNodeProtocol from substrafl.nodes import TestDataNodeProtocol from substrafl.nodes import TrainDataNodeProtocol from substrafl.nodes.schemas import OutputIdentifiers -======= -from substrafl.nodes.aggregation_node import AggregationNode -from substrafl.nodes.node import OutputIdentifiers -from substrafl.nodes.test_data_node import TestDataNode -from substrafl.nodes.train_data_node import TrainDataNode ->>>>>>> a79ee49 (rebase) from substrafl.remote.decorators import remote_data from substrafl.strategies.schemas import StrategyName