flwr-nightly 1.4.0.dev20230321__tar.gz → 1.4.0.dev20230323__tar.gz

{flwr_nightly-1.4.0.dev20230321 → flwr_nightly-1.4.0.dev20230323}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.4.0.dev20230321
+Version: 1.4.0.dev20230323
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.dev
 License: Apache-2.0

{flwr_nightly-1.4.0.dev20230321 → flwr_nightly-1.4.0.dev20230323}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.4.0-dev20230321"
+version = "1.4.0-dev20230323"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.dev>"]
@@ -60,11 +60,11 @@ iterators = "^0.0.2"
 # Optional dependencies (VCE)
 ray = { extras = ["default"], version = "~2.3.0", optional = true }
 # Optional dependencies (REST transport layer)
-requests = "^2.28.2"
-fastapi = "^0.92.0"
-starlette = "^0.25.0"
-uvicorn = {extras = ["standard"], version = "^0.20.0"}
-# Optional dependencies (xgboost)
+requests = { version = "^2.28.2", optional = true }
+fastapi = { version = "^0.92.0", optional = true }
+starlette = { version = "^0.25.0", optional = true }
+uvicorn = { extras = ["standard"], version = "^0.20.0", optional = true }
+# Optional dependency (xgboost)
 xgboost = { version = "^1.6.2", optional = true }
 
 [tool.poetry.extras]

{flwr_nightly-1.4.0.dev20230321 → flwr_nightly-1.4.0.dev20230323}/setup.py

@@ -31,14 +31,13 @@ install_requires = \
 ['grpcio>=1.43.0,<2.0.0,!=1.52.0',
  'iterators>=0.0.2,<0.0.3',
  'numpy>=1.21.0,<2.0.0',
- 'protobuf>=3.19.0,<4.0.0',
- 'starlette>=0.25.0,<0.26.0']
+ 'protobuf>=3.19.0,<4.0.0']
 
 extras_require = \
-{':extra == "rest"': ['requests>=2.28.2,<3.0.0',
-                      'fastapi>=0.92.0,<0.93.0',
-                      'uvicorn[standard]>=0.20.0,<0.21.0'],
- ':python_version < "3.8"': ['importlib-metadata>=4.0.0,<5.0.0'],
+{':python_version < "3.8"': ['importlib-metadata>=4.0.0,<5.0.0'],
+ 'rest': ['requests>=2.28.2,<3.0.0',
+          'fastapi>=0.92.0,<0.93.0',
+          'uvicorn[standard]>=0.20.0,<0.21.0'],
  'simulation': ['ray[default]>=2.3.0,<2.4.0'],
  'xgboost': ['xgboost>=1.6.2,<2.0.0']}
 
@@ -50,7 +49,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'flwr-nightly',
-    'version': '1.4.0.dev20230321',
+    'version': '1.4.0.dev20230323',
     'description': 'Flower: A Friendly Federated Learning Framework',
     'long_description': '# Flower: A Friendly Federated Learning Framework\n\n<p align="center">\n  <a href="https://flower.dev/">\n    <img src="https://flower.dev/_next/image/?url=%2F_next%2Fstatic%2Fmedia%2Fflower_white_border.c2012e70.png&w=640&q=75" width="140px" alt="Flower Website" />\n  </a>\n</p>\n<p align="center">\n    <a href="https://flower.dev/">Website</a> |\n    <a href="https://flower.dev/blog">Blog</a> |\n    <a href="https://flower.dev/docs/">Docs</a> |\n    <a href="https://flower.dev/conf/flower-summit-2022">Conference</a> |\n    <a href="https://flower.dev/join-slack">Slack</a>\n    <br /><br />\n</p>\n\n[![GitHub license](https://img.shields.io/github/license/adap/flower)](https://github.com/adap/flower/blob/main/LICENSE)\n[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/adap/flower/blob/main/CONTRIBUTING.md)\n![Build](https://github.com/adap/flower/actions/workflows/flower.yml/badge.svg)\n![Downloads](https://pepy.tech/badge/flwr)\n[![Slack](https://img.shields.io/badge/Chat-Slack-red)](https://flower.dev/join-slack)\n\nFlower (`flwr`) is a framework for building federated learning systems. The\ndesign of Flower is based on a few guiding principles:\n\n* **Customizable**: Federated learning systems vary wildly from one use case to\n  another. Flower allows for a wide range of different configurations depending\n  on the needs of each individual use case.\n\n* **Extendable**: Flower originated from a research project at the University of\n  Oxford, so it was built with AI research in mind. Many components can be\n  extended and overridden to build new state-of-the-art systems.\n\n* **Framework-agnostic**: Different machine learning frameworks have different\n  strengths. Flower can be used with any machine learning framework, for\n  example, [PyTorch](https://pytorch.org),\n  [TensorFlow](https://tensorflow.org), [Hugging Face Transformers](https://huggingface.co/), [PyTorch Lightning](https://pytorchlightning.ai/), [MXNet](https://mxnet.apache.org/), [scikit-learn](https://scikit-learn.org/), [JAX](https://jax.readthedocs.io/), [TFLite](https://tensorflow.org/lite/), [fastai](https://www.fast.ai/), [Pandas](https://pandas.pydata.org/\n) for federated analytics, or even raw [NumPy](https://numpy.org/)\n  for users who enjoy computing gradients by hand.\n\n* **Understandable**: Flower is written with maintainability in mind. The\n  community is encouraged to both read and contribute to the codebase.\n\nMeet the Flower community on [flower.dev](https://flower.dev)!\n\n## Federated Learning Tutorial\n\nFlower\'s goal is to make federated learning accessible to everyone. This series of tutorials introduces the fundamentals of federated learning and how to implement them in Flower.\n\n0. **What is Federated Learning?**\n\n   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/doc/source/tutorial/Flower-0-What-is-FL.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/doc/source/tutorial/Flower-0-What-is-FL.ipynb))\n\n1. **An Introduction to Federated Learning**\n\n   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/doc/source/tutorial/Flower-1-Intro-to-FL-PyTorch.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/doc/source/tutorial/Flower-1-Intro-to-FL-PyTorch.ipynb))\n\n2. **Using Strategies in Federated Learning**\n\n   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/doc/source/tutorial/Flower-2-Strategies-in-FL-PyTorch.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/doc/source/tutorial/Flower-2-Strategies-in-FL-PyTorch.ipynb))\n   \n3. **Building Strategies for Federated Learning**\n\n   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/doc/source/tutorial/Flower-3-Building-a-Strategy-PyTorch.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/doc/source/tutorial/Flower-3-Building-a-Strategy-PyTorch.ipynb))\n   \n4. **Custom Clients for Federated Learning**\n\n   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/doc/source/tutorial/Flower-4-Client-and-NumPyClient-PyTorch.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/doc/source/tutorial/Flower-4-Client-and-NumPyClient-PyTorch.ipynb))\n\nStay tuned, more tutorials are coming soon. Topics include **Privacy and Security in Federated Learning**, and **Scaling Federated Learning**.\n\n## Documentation\n\n[Flower Docs](https://flower.dev/docs):\n* [Installation](https://flower.dev/docs/installation.html)\n* [Quickstart (TensorFlow)](https://flower.dev/docs/quickstart-tensorflow.html)\n* [Quickstart (PyTorch)](https://flower.dev/docs/quickstart-pytorch.html)\n* [Quickstart (Hugging Face [code example])](https://flower.dev/docs/quickstart-huggingface.html)\n* [Quickstart (PyTorch Lightning [code example])](https://flower.dev/docs/quickstart-pytorch-lightning.html)\n* [Quickstart (MXNet)](https://flower.dev/docs/example-mxnet-walk-through.html)\n* [Quickstart (Pandas)](https://flower.dev/docs/quickstart-pandas.html)\n* [Quickstart (fastai)](https://flower.dev/docs/quickstart-fastai.html)\n* [Quickstart (JAX)](https://github.com/adap/flower/tree/main/examples/quickstart_jax)\n* [Quickstart (scikit-learn)](https://github.com/adap/flower/tree/main/examples/sklearn-logreg-mnist)\n* [Quickstart (TFLite on Android [code example])](https://github.com/adap/flower/tree/main/examples/android)\n\n## Flower Baselines\n\nFlower Baselines is a collection of community-contributed experiments that reproduce the experiments performed in popular federated learning publications. Researchers can build on Flower Baselines to quickly evaluate new ideas:\n\n* [FedAvg](https://arxiv.org/abs/1602.05629):\n  * [MNIST](https://github.com/adap/flower/tree/main/baselines/flwr_baselines/publications/fedavg_mnist)\n* [FedProx](https://arxiv.org/abs/1812.06127):\n  * [MNIST](https://github.com/adap/flower/tree/main/baselines/flwr_baselines/publications/fedprox_mnist)\n* [FedBN: Federated Learning on non-IID Features via Local Batch Normalization](https://arxiv.org/abs/2102.07623):\n  * [Convergence Rate](https://github.com/adap/flower/tree/main/baselines/flwr_baselines/publications/fedbn/convergence_rate)\n* [Adaptive Federated Optimization](https://arxiv.org/abs/2003.00295):\n  * [CIFAR-10/100](https://github.com/adap/flower/tree/main/baselines/flwr_baselines/publications/adaptive_federated_optimization)\n\nCheck the Flower documentation to learn more: [Using Baselines](https://flower.dev/docs/using-baselines.html)\n\nThe Flower community loves contributions! Make your work more visible and enable others to build on it by contributing it as a baseline: [Contributing Baselines](https://flower.dev/docs/contributing-baselines.html)\n\n## Flower Usage Examples\n\nSeveral code examples show different usage scenarios of Flower (in combination with popular machine learning frameworks such as PyTorch or TensorFlow).\n\nQuickstart examples:\n\n* [Quickstart (TensorFlow)](https://github.com/adap/flower/tree/main/examples/quickstart_tensorflow)\n* [Quickstart (PyTorch)](https://github.com/adap/flower/tree/main/examples/quickstart_pytorch)\n* [Quickstart (Hugging Face)](https://github.com/adap/flower/tree/main/examples/quickstart_huggingface)\n* [Quickstart (PyTorch Lightning)](https://github.com/adap/flower/tree/main/examples/quickstart_pytorch_lightning)\n* [Quickstart (fastai)](https://github.com/adap/flower/tree/main/examples/quickstart_fastai)\n* [Quickstart (Pandas)](https://github.com/adap/flower/tree/main/examples/quickstart_pandas)\n* [Quickstart (MXNet)](https://github.com/adap/flower/tree/main/examples/quickstart_mxnet)\n* [Quickstart (JAX)](https://github.com/adap/flower/tree/main/examples/quickstart_jax)\n* [Quickstart (scikit-learn)](https://github.com/adap/flower/tree/main/examples/sklearn-logreg-mnist)\n* [Quickstart (TFLite on Android)](https://github.com/adap/flower/tree/main/examples/android)\n\nOther [examples](https://github.com/adap/flower/tree/main/examples):\n\n* [Raspberry Pi & Nvidia Jetson Tutorial](https://github.com/adap/flower/tree/main/examples/embedded_devices)\n* [Android & TFLite](https://github.com/adap/flower/tree/main/examples/android)\n* [PyTorch: From Centralized to Federated](https://github.com/adap/flower/tree/main/examples/pytorch_from_centralized_to_federated)\n* [MXNet: From Centralized to Federated](https://github.com/adap/flower/tree/main/examples/mxnet_from_centralized_to_federated)\n* [Advanced Flower with TensorFlow/Keras](https://github.com/adap/flower/tree/main/examples/advanced_tensorflow)\n* [Advanced Flower with PyTorch](https://github.com/adap/flower/tree/main/examples/advanced_pytorch)\n* Single-Machine Simulation of Federated Learning Systems ([PyTorch](https://github.com/adap/flower/tree/main/examples/simulation_pytorch)) ([Tensorflow](https://github.com/adap/flower/tree/main/examples/simulation_tensorflow))\n\n## Community\n\nFlower is built by a wonderful community of researchers and engineers. [Join Slack](https://flower.dev/join-slack) to meet them, [contributions](#contributing-to-flower) are welcome.\n\n<a href="https://github.com/adap/flower/graphs/contributors">\n  <img src="https://contrib.rocks/image?repo=adap/flower" />\n</a>\n\n## Citation\n\nIf you publish work that uses Flower, please cite Flower as follows: \n\n```bibtex\n@article{beutel2020flower,\n  title={Flower: A Friendly Federated Learning Research Framework},\n  author={Beutel, Daniel J and Topal, Taner and Mathur, Akhil and Qiu, Xinchi and Fernandez-Marques, Javier and Gao, Yan and Sani, Lorenzo and Kwing, Hei Li and Parcollet, Titouan and Gusmão, Pedro PB de and Lane, Nicholas D}, \n  journal={arXiv preprint arXiv:2007.14390},\n  year={2020}\n}\n```\n\nPlease also consider adding your publication to the list of Flower-based publications in the docs, just open a Pull Request.\n\n## Contributing to Flower\n\nWe welcome contributions. Please see [CONTRIBUTING.md](CONTRIBUTING.md) to get started!\n',
     'author': 'The Flower Authors',

{flwr_nightly-1.4.0.dev20230321 → flwr_nightly-1.4.0.dev20230323}/src/py/flwr/__init__.py

@@ -16,10 +16,11 @@
 
 from flwr.common.version import package_version as _package_version
 
-from . import client, server, simulation
+from . import client, common, server, simulation
 
 __all__ = [
     "client",
+    "common",
     "server",
     "simulation",
 ]

{flwr_nightly-1.4.0.dev20230321 → flwr_nightly-1.4.0.dev20230323}/src/py/flwr/client/app.py

@@ -49,7 +49,6 @@ from .numpy_client import has_evaluate as numpyclient_has_evaluate
 from .numpy_client import has_fit as numpyclient_has_fit
 from .numpy_client import has_get_parameters as numpyclient_has_get_parameters
 from .numpy_client import has_get_properties as numpyclient_has_get_properties
-from .rest_client.connection import http_request_response
 
 EXCEPTION_MESSAGE_WRONG_RETURN_TYPE_FIT = """
 NumPyClient.fit did not return a tuple with 3 elements.
@@ -81,6 +80,7 @@ Example
 ClientLike = Union[Client, NumPyClient]
 
 
+# pylint: disable=import-outside-toplevel
 def start_client(
     *,
     server_address: str,
@@ -138,7 +138,17 @@ def start_client(
     event(EventType.START_CLIENT_ENTER)
 
     # Use either gRPC bidirectional streaming or REST request/response
-    connection = http_request_response if rest else grpc_connection
+    if rest:
+        try:
+            from .rest_client.connection import http_request_response
+        except ImportError as missing_dep:
+            raise ImportError(
+                "To use the REST API you must install the "
+                "extra dependencies by running `pip install flwr['rest']`."
+            ) from missing_dep
+        connection = http_request_response
+    else:
+        connection = grpc_connection
     while True:
         sleep_duration: int = 0
         with connection(

{flwr_nightly-1.4.0.dev20230321 → flwr_nightly-1.4.0.dev20230323}/src/py/flwr/client/rest_client/connection.py

@@ -19,7 +19,13 @@ from contextlib import contextmanager
 from logging import ERROR, INFO, WARN
 from typing import Callable, Dict, Iterator, Optional, Tuple
 
-import requests
+try:
+    import requests
+except ImportError as missing_dep:
+    raise ImportError(
+        "To use the REST API you must install the "
+        "extra dependencies by running `pip install flwr['rest']`."
+    ) from missing_dep
 
 from flwr.client.message_handler.task_handler import get_server_message
 from flwr.common import GRPC_MAX_MESSAGE_LENGTH

{flwr_nightly-1.4.0.dev20230321 → flwr_nightly-1.4.0.dev20230323}/src/py/flwr/server/app.py

@@ -25,7 +25,6 @@ from types import FrameType
 from typing import List, Optional, Tuple
 
 import grpc
-import uvicorn
 
 from flwr.common import GRPC_MAX_MESSAGE_LENGTH, EventType, event
 from flwr.common.logger import log
@@ -40,7 +39,6 @@ from flwr.server.grpc_server.grpc_server import (
     start_grpc_server,
 )
 from flwr.server.history import History
-from flwr.server.rest_server.rest_api import app as fast_api_app
 from flwr.server.server import Server
 from flwr.server.state import StateFactory
 from flwr.server.strategy import FedAvg, Strategy
@@ -436,11 +434,22 @@ def _run_fleet_api_grpc_bidi(
     return fleet_grpc_server
 
 
+# pylint: disable=import-outside-toplevel
 def _run_fleet_api_rest(
     address: str,
     state_factory: StateFactory,
 ) -> None:
     """Run Driver API (REST-based)."""
+    try:
+        import uvicorn
+
+        from flwr.server.rest_server.rest_api import app as fast_api_app
+    except ImportError as missing_dep:
+        raise ImportError(
+            "To use the REST API you must install the "
+            "extra dependencies by running "
+            "`pip install flwr['rest']`."
+        ) from missing_dep
     log(INFO, "Starting Flower REST server")
 
     # See: https://www.starlette.io/applications/#accessing-the-app-instance

{flwr_nightly-1.4.0.dev20230321 → flwr_nightly-1.4.0.dev20230323}/src/py/flwr/server/rest_server/rest_api.py

@@ -19,8 +19,14 @@ from logging import INFO
 from typing import List, Optional
 from uuid import UUID
 
-from fastapi import FastAPI, HTTPException, Request, Response
-from starlette.datastructures import Headers
+try:
+    from fastapi import FastAPI, HTTPException, Request, Response
+    from starlette.datastructures import Headers
+except ImportError as missing_dep:
+    raise ImportError(
+        "To use the REST API you must install the "
+        "extra dependencies by running `pip install flwr['rest']`."
+    ) from missing_dep
 
 from flwr.common.logger import log
 from flwr.proto.fleet_pb2 import (
@@ -33,10 +39,10 @@ from flwr.proto.fleet_pb2 import (
 from flwr.proto.task_pb2 import TaskIns, TaskRes
 from flwr.server.state import State
 
-app = FastAPI()
+app: FastAPI = FastAPI()
 
 
-@app.post("/api/v0/fleet/pull-task-ins", response_class=Response)
+@app.post("/api/v0/fleet/pull-task-ins", response_class=Response)  # type: ignore
 async def pull_task_ins(request: Request) -> Response:
     """Pull TaskIns."""
     _check_headers(request.headers)
@@ -72,7 +78,7 @@ async def pull_task_ins(request: Request) -> Response:
     )
 
 
-@app.post("/api/v0/fleet/push-task-res", response_class=Response)
+@app.post("/api/v0/fleet/push-task-res", response_class=Response)  # type: ignore
 async def push_task_res(request: Request) -> Response:  # Check if token is needed here
     """Push TaskRes."""
     _check_headers(request.headers)

{flwr_nightly-1.4.0.dev20230321 → flwr_nightly-1.4.0.dev20230323}/src/py/flwr/server/strategy/fedxgb_nn_avg.py

@@ -37,9 +37,6 @@ from flwr.server.client_proxy import ClientProxy
 from .aggregate import aggregate
 from .fedavg import FedAvg
 
-# from xgboost import XGBClassifier, XGBRegressor  # pylint: disable=W0611
-
-
 WARNING_MIN_AVAILABLE_CLIENTS_TOO_LOW = """
 Setting `min_available_clients` lower than `min_fit_clients` or
 `min_evaluate_clients` can cause the server to fail when there are too few clients

flwr_nightly-1.4.0.dev20230321/src/py/flwr/server/strategy/fedxgb.py

@@ -1,153 +0,0 @@
-# Copyright 2020 Adap GmbH. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""Federated XGBoost utility functions."""
-
-from typing import Any, List, Optional, Tuple, Union
-
-import numpy as np
-import torch  # pylint: disable=E0401
-import xgboost as xgb  # pylint: disable=E0401
-from matplotlib import pyplot as plt  # pylint: disable=E0401
-from torch.utils.data import DataLoader, Dataset  # pylint: disable=E0401
-from xgboost import XGBClassifier, XGBRegressor  # pylint: disable=E0401
-
-from flwr.common.typing import NDArray
-
-
-def plot_xgbtree(tree: Union[XGBClassifier, XGBRegressor], n_tree: int) -> None:
-    """Visualize the built xgboost tree."""
-    xgb.plot_tree(tree, num_trees=n_tree)
-    plt.rcParams["figure.figsize"] = [50, 10]
-    plt.show()
-
-
-def construct_tree(
-    dataset: Dataset, label: NDArray, n_estimators: int, tree_type: str
-) -> Union[XGBClassifier, XGBRegressor]:
-    """Construct a xgboost tree form tabular dataset."""
-    if tree_type == "BINARY":
-        tree = xgb.XGBClassifier(
-            objective="binary:logistic",
-            learning_rate=0.1,
-            max_depth=8,
-            n_estimators=n_estimators,
-            subsample=0.8,
-            colsample_bylevel=1,
-            colsample_bynode=1,
-            colsample_bytree=1,
-            alpha=5,
-            gamma=5,
-            num_parallel_tree=1,
-            min_child_weight=1,
-        )
-
-    elif tree_type == "REG":
-        tree = xgb.XGBRegressor(
-            objective="reg:squarederror",
-            learning_rate=0.1,
-            max_depth=8,
-            n_estimators=n_estimators,
-            subsample=0.8,
-            colsample_bylevel=1,
-            colsample_bynode=1,
-            colsample_bytree=1,
-            alpha=5,
-            gamma=5,
-            num_parallel_tree=1,
-            min_child_weight=1,
-        )
-
-    tree.fit(dataset, label)
-    return tree
-
-
-def construct_tree_from_loader(
-    dataset_loader: DataLoader, n_estimators: int, tree_type: str
-) -> Union[XGBClassifier, XGBRegressor]:
-    """Construct a xgboost tree form tabular dataset loader."""
-    for dataset in dataset_loader:
-        data, label = dataset[0], dataset[1]
-    return construct_tree(data, label, n_estimators, tree_type)
-
-
-def single_tree_prediction(
-    tree: Union[XGBClassifier, XGBRegressor], n_tree: int, dataset: NDArray
-) -> Optional[NDArray]:
-    """Extract the prediction result of a single tree in the xgboost tree
-    ensemble."""
-    # How to access a single tree
-    # https://github.com/bmreiniger/datascience.stackexchange/blob/master/57905.ipynb
-    num_t = len(tree.get_booster().get_dump())
-    if n_tree > num_t:
-        print(
-            "The tree index to be extracted is larger than the total number of trees."
-        )
-        return None
-
-    return tree.predict(  # type: ignore
-        dataset, iteration_range=(n_tree, n_tree + 1), output_margin=True
-    )
-
-
-def tree_encoding(  # pylint: disable=R0914
-    trainloader: DataLoader,
-    client_trees: Union[
-        Tuple[XGBClassifier, int],
-        Tuple[XGBRegressor, int],
-        List[Union[Tuple[XGBClassifier, int], Tuple[XGBRegressor, int]]],
-    ],
-    client_tree_num: int,
-    client_num: int,
-) -> Optional[Tuple[NDArray, NDArray]]:
-    """Transform the tabular dataset into prediction results using the
-    aggregated xgboost tree ensembles from all clients."""
-    if trainloader is None:
-        return None
-
-    for local_dataset in trainloader:
-        x_train, y_train = local_dataset[0], local_dataset[1]
-
-    x_train_enc = np.zeros((x_train.shape[0], client_num * client_tree_num))
-    x_train_enc = np.array(x_train_enc, copy=True)
-
-    temp_trees: Any = None
-    if isinstance(client_trees, list) is False:
-        temp_trees = [client_trees[0]] * client_num
-    elif isinstance(client_trees, list) and len(client_trees) != client_num:
-        temp_trees = [client_trees[0][0]] * client_num
-    else:
-        cids = []
-        temp_trees = []
-        for i, _ in enumerate(client_trees):
-            temp_trees.append(client_trees[i][0])  # type: ignore
-            cids.append(client_trees[i][1])  # type: ignore
-        sorted_index = np.argsort(np.asarray(cids))
-        temp_trees = np.asarray(temp_trees)[sorted_index]
-
-    for i, _ in enumerate(temp_trees):
-        for j in range(client_tree_num):
-            x_train_enc[:, i * client_tree_num + j] = single_tree_prediction(
-                temp_trees[i], j, x_train
-            )
-
-    x_train_enc32: Any = np.float32(x_train_enc)
-    y_train32: Any = np.float32(y_train)
-
-    x_train_enc32, y_train32 = torch.from_numpy(
-        np.expand_dims(x_train_enc32, axis=1)  # type: ignore
-    ), torch.from_numpy(
-        np.expand_dims(y_train32, axis=-1)  # type: ignore
-    )
-    return x_train_enc32, y_train32