fix computing and federation import for tests

Signed-off-by: sagewe <wbwmat@gmail.com>
FederatedAI · Dec 11, 2023 · 3de1825 · 3de1825
1 parent a1d55ba
commit 3de1825
Show file tree

Hide file tree

Showing 24 changed files with 47 additions and 47 deletions.
diff --git a/python/fate/ml/aggregator/test/test_aggregator.py b/python/fate/ml/aggregator/test/test_aggregator.py
@@ -10,8 +10,8 @@
 
 def create_ctx(local):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
     logger = logging.getLogger()
     logger.setLevel(logging.DEBUG)

diff --git a/python/fate/ml/aggregator/test/test_fate_utils.py b/python/fate/ml/aggregator/test/test_fate_utils.py
@@ -8,8 +8,8 @@
 
 def create_ctx(local):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
     logger = logging.getLogger()
     logger.setLevel(logging.DEBUG)

diff --git a/python/fate/ml/ensemble/algo/secureboost/test/test_goss.py b/python/fate/ml/ensemble/algo/secureboost/test/test_goss.py
@@ -15,8 +15,8 @@ def get_current_datetime_str():
 
 def create_ctx(local, context_name):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     # prepare log

diff --git a/python/fate/ml/ensemble/algo/secureboost/test/test_hetero_sbt_binary.py b/python/fate/ml/ensemble/algo/secureboost/test/test_hetero_sbt_binary.py
@@ -15,8 +15,8 @@ def get_current_datetime_str():
 
 def create_ctx(local, context_name):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     # prepare log

diff --git a/python/fate/ml/ensemble/algo/secureboost/test/test_hetero_sbt_binary_multi_host.py b/python/fate/ml/ensemble/algo/secureboost/test/test_hetero_sbt_binary_multi_host.py
@@ -17,8 +17,8 @@ def get_current_datetime_str():
 
 def create_ctx(local, context_name):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     # prepare log

diff --git a/python/fate/ml/ensemble/algo/secureboost/test/test_hetero_sbt_binary_with_goss.py b/python/fate/ml/ensemble/algo/secureboost/test/test_hetero_sbt_binary_with_goss.py
@@ -16,8 +16,8 @@ def get_current_datetime_str():
 
 def create_ctx(local, context_name):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     # prepare log

diff --git a/python/fate/ml/ensemble/algo/secureboost/test/test_hetero_sbt_multi.py b/python/fate/ml/ensemble/algo/secureboost/test/test_hetero_sbt_multi.py
@@ -19,8 +19,8 @@ def get_current_datetime_str():
 
 def create_ctx(local):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     logger = logging.getLogger()

diff --git a/python/fate/ml/ensemble/algo/secureboost/test/test_hetero_sbt_regression.py b/python/fate/ml/ensemble/algo/secureboost/test/test_hetero_sbt_regression.py
@@ -19,8 +19,8 @@ def get_current_datetime_str():
 
 def create_ctx(local):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     logger = logging.getLogger()

diff --git a/python/fate/ml/ensemble/learner/decision_tree/test/test_decision_tree.py b/python/fate/ml/ensemble/learner/decision_tree/test/test_decision_tree.py
@@ -16,8 +16,8 @@
 
 def create_ctx(local):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     logger = logging.getLogger()

diff --git a/python/fate/ml/ensemble/learner/decision_tree/test/test_local_decision_tree.py b/python/fate/ml/ensemble/learner/decision_tree/test/test_local_decision_tree.py
@@ -14,8 +14,8 @@
 
 def create_ctx(local):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     logger = logging.getLogger()

diff --git a/python/fate/ml/ensemble/learner/decision_tree/tree_core/test/test_loss.py b/python/fate/ml/ensemble/learner/decision_tree/tree_core/test/test_loss.py
@@ -21,8 +21,8 @@
 
 def create_ctx(local):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     logger = logging.getLogger()

diff --git a/python/fate/ml/glm/homo/lr/test/test_fed_lr.py b/python/fate/ml/glm/homo/lr/test/test_fed_lr.py
@@ -13,8 +13,8 @@
 
 def create_ctx(local):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
     logger = logging.getLogger()
     logger.setLevel(logging.DEBUG)

diff --git a/python/fate/ml/glm/homo/lr/test/test_local.py b/python/fate/ml/glm/homo/lr/test/test_local.py
@@ -1,7 +1,7 @@
 from fate.arch import Context
-from fate.arch.computing.standalone import CSession
+from fate.arch.computing.backends.standalone import CSession
 from fate.arch.context import Context
-from fate.arch.federation.standalone import StandaloneFederation
+from fate.arch.federation.backends.standalone import StandaloneFederation
 import pandas as pd
 from fate.arch.dataframe import PandasReader
 from fate.ml.nn.dataset.table import TableDataset

diff --git a/python/fate/ml/nn/test/test_agglayer.py b/python/fate/ml/nn/test/test_agglayer.py
@@ -14,8 +14,8 @@ def get_current_datetime_str():
 
 def create_ctx(local, context_name):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     # prepare log

diff --git a/python/fate/ml/nn/test/test_fedpass_alexnet.py b/python/fate/ml/nn/test/test_fedpass_alexnet.py
@@ -25,7 +25,7 @@ def get_current_datetime_str():
 
 def create_ctx(local, context_name):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
+    from fate.arch.computing.backends.standalone import CSession
     from fate.arch.federation.standalone import StandaloneFederation
     import logging
 

diff --git a/python/fate/ml/nn/test/test_fedpass_lenet.py b/python/fate/ml/nn/test/test_fedpass_lenet.py
@@ -24,8 +24,8 @@ def get_current_datetime_str():
 
 def create_ctx(local, context_name):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     # prepare log

diff --git a/python/fate/ml/nn/test/test_fedpass_tabular.py b/python/fate/ml/nn/test/test_fedpass_tabular.py
@@ -16,8 +16,8 @@ def get_current_datetime_str():
 
 def create_ctx(local, context_name):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     # prepare log

diff --git a/python/fate/ml/nn/test/test_hetero_nn_algo.py b/python/fate/ml/nn/test/test_hetero_nn_algo.py
@@ -17,8 +17,8 @@ def get_current_datetime_str():
 
 def create_ctx(local, context_name):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     # prepare log

diff --git a/python/fate/ml/nn/test/test_hetero_nn_algo_no_guest.py b/python/fate/ml/nn/test/test_hetero_nn_algo_no_guest.py
@@ -17,8 +17,8 @@ def get_current_datetime_str():
 
 def create_ctx(local, context_name):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     # prepare log

diff --git a/python/fate/ml/nn/test/test_hetero_nn_algo_val.py b/python/fate/ml/nn/test/test_hetero_nn_algo_val.py
@@ -17,8 +17,8 @@ def get_current_datetime_str():
 
 def create_ctx(local, context_name):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     # prepare log

diff --git a/python/fate/ml/nn/test/test_homo_nn_binary.py b/python/fate/ml/nn/test/test_homo_nn_binary.py
@@ -12,8 +12,8 @@
 
 def create_ctx(local):
     from fate.arch import Context
-    from fate.arch.computing.standalone import CSession
-    from fate.arch.federation.standalone import StandaloneFederation
+    from fate.arch.computing.backends.standalone import CSession
+    from fate.arch.federation.backends.standalone import StandaloneFederation
     import logging
 
     logger = logging.getLogger()

diff --git a/python/fate/ml/utils/test/test_predict_format.py b/python/fate/ml/utils/test/test_predict_format.py
@@ -1,7 +1,7 @@
 from fate.arch import Context
-from fate.arch.computing.standalone import CSession
+from fate.arch.computing.backends.standalone import CSession
 from fate.arch.context import Context
-from fate.arch.federation.standalone import StandaloneFederation
+from fate.arch.federation.backends.standalone import StandaloneFederation
 import pandas as pd
 from fate.ml.utils.predict_tools import compute_predict_details, PREDICT_SCORE, LABEL, BINARY, REGRESSION, MULTI
 from fate.arch.dataframe import PandasReader

diff --git a/python/fate/test/test_dtensor.py b/python/fate/test/test_dtensor.py
@@ -1,8 +1,8 @@
 import pytest
 import torch
 from fate.arch import Context
-from fate.arch.computing.standalone import CSession
-from fate.arch.federation.standalone import StandaloneFederation
+from fate.arch.computing.backends.standalone import CSession
+from fate.arch.federation.backends.standalone import StandaloneFederation
 from fate.arch.tensor import DTensor
 from pytest import fixture
 

diff --git a/python/fate/test/test_matmul.py b/python/fate/test/test_matmul.py
@@ -1,7 +1,7 @@
 import torch
-from fate.arch.computing.standalone import CSession
+from fate.arch.computing.backends.standalone import CSession
 from fate.arch.context import Context
-from fate.arch.federation.standalone import StandaloneFederation
+from fate.arch.federation.backends.standalone import StandaloneFederation
 from fate.arch.tensor import DTensor
 from pytest import fixture