diff --git a/docs/about/features_index/pynative.rst b/docs/about/features_index/pynative.rst index 83d4143cf8..562bda3a05 100644 --- a/docs/about/features_index/pynative.rst +++ b/docs/about/features_index/pynative.rst @@ -7,7 +7,7 @@ :orphan: ================= -Python Native API +Python Native API (Deprecated) ================= TODO diff --git a/docs/developer_guide/advanced_topics/overriding_agg_fn.rst b/docs/developer_guide/advanced_topics/overriding_agg_fn.rst index ba393f86ca..e2bc2fd396 100644 --- a/docs/developer_guide/advanced_topics/overriding_agg_fn.rst +++ b/docs/developer_guide/advanced_topics/overriding_agg_fn.rst @@ -10,7 +10,7 @@ Override Aggregation Function With the aggregator-based workflow, you can use custom aggregation functions for each task via Python\*\ API or command line interface. -Python API +Python API (Deprecated) ========== 1. Create an implementation of :class:`openfl.interface.aggregation_functions.core.AggregationFunction`. diff --git a/docs/developer_guide/advanced_topics/overriding_plan_settings.rst b/docs/developer_guide/advanced_topics/overriding_plan_settings.rst index 629e8a017a..aae1f7ea02 100644 --- a/docs/developer_guide/advanced_topics/overriding_plan_settings.rst +++ b/docs/developer_guide/advanced_topics/overriding_plan_settings.rst @@ -11,7 +11,7 @@ With the director-based workflow, you can use custom plan settings before starti When using Python API or Director Envoy based interactive API (Deprecated), **override_config** can be used to update plan settings. -Python API +Python API (Deprecated) ========== Modify the plan settings: diff --git a/docs/developer_guide/running_the_federation.notebook.rst b/docs/developer_guide/running_the_federation.notebook.rst index ce8c75df72..d335c112d0 100644 --- a/docs/developer_guide/running_the_federation.notebook.rst +++ b/docs/developer_guide/running_the_federation.notebook.rst @@ -4,7 +4,7 @@ .. _running_notebook: ********************************** -Aggregator-Based Workflow Tutorial +Aggregator-Based Workflow Tutorial (Deprecated) ********************************** You will start a Jupyter\* \ lab server and receive a URL you can use to access the tutorials. Jupyter notebooks are provided for PyTorch\* \ and TensorFlow\* \ that simulate a federation on a local machine. diff --git a/docs/developer_guide/utilities/splitters_data.rst b/docs/developer_guide/utilities/splitters_data.rst index 56b08ee6a1..66064706d1 100644 --- a/docs/developer_guide/utilities/splitters_data.rst +++ b/docs/developer_guide/utilities/splitters_data.rst @@ -13,7 +13,7 @@ Dataset Splitters You may apply data splitters differently depending on the |productName| workflow that you follow. -OPTION 1: Use **Native Python API** (Aggregator-Based Workflow) Functions to Split the Data +OPTION 1: Use **Native Python API** (Aggregator-Based Workflow) Functions to Split the Data (Deprecated) =========================================================================================== Predefined |productName| data splitters functions are as follows: diff --git a/docs/get_started/examples.rst b/docs/get_started/examples.rst index f358090e06..ff1e3f0364 100644 --- a/docs/get_started/examples.rst +++ b/docs/get_started/examples.rst @@ -30,7 +30,7 @@ See :ref:`running_the_task_runner` :ref:`running_the_task_runner` ------------------------- -Python Native API +Python Native API (Deprecated) ------------------------- Intended for quick simulation purposes diff --git a/docs/get_started/examples/python_native_pytorch_mnist.rst b/docs/get_started/examples/python_native_pytorch_mnist.rst index 8105ad495c..11bbe7d88c 100644 --- a/docs/get_started/examples/python_native_pytorch_mnist.rst +++ b/docs/get_started/examples/python_native_pytorch_mnist.rst @@ -4,7 +4,7 @@ .. _python_native_pytorch_mnist: ========================================== -Python Native API: Federated PyTorch MNIST +Python Native API: Federated PyTorch MNIST (Deprecated) ========================================== In this tutorial, we will set up a federation and train a basic PyTorch model on the MNIST dataset using the Python Native API. diff --git a/docs/source/api/openfl_native.rst b/docs/source/api/openfl_native.rst index bd9eb608d3..5f3f513340 100644 --- a/docs/source/api/openfl_native.rst +++ b/docs/source/api/openfl_native.rst @@ -2,7 +2,7 @@ .. # SPDX-License-Identifier: Apache-2.0 ************************************************* -Native Module +Native Module (Deprecated) ************************************************* Native modules reference: diff --git a/openfl-tutorials/Federated_FedProx_Keras_MNIST_Tutorial.ipynb b/openfl-tutorials/deprecated/native_api/Federated_FedProx_Keras_MNIST_Tutorial.ipynb similarity index 100% rename from openfl-tutorials/Federated_FedProx_Keras_MNIST_Tutorial.ipynb rename to openfl-tutorials/deprecated/native_api/Federated_FedProx_Keras_MNIST_Tutorial.ipynb diff --git a/openfl-tutorials/Federated_FedProx_PyTorch_MNIST_Tutorial.ipynb b/openfl-tutorials/deprecated/native_api/Federated_FedProx_PyTorch_MNIST_Tutorial.ipynb similarity index 100% rename from openfl-tutorials/Federated_FedProx_PyTorch_MNIST_Tutorial.ipynb rename to openfl-tutorials/deprecated/native_api/Federated_FedProx_PyTorch_MNIST_Tutorial.ipynb diff --git a/openfl-tutorials/Federated_Keras_MNIST_Tutorial.ipynb b/openfl-tutorials/deprecated/native_api/Federated_Keras_MNIST_Tutorial.ipynb similarity index 100% rename from openfl-tutorials/Federated_Keras_MNIST_Tutorial.ipynb rename to openfl-tutorials/deprecated/native_api/Federated_Keras_MNIST_Tutorial.ipynb diff --git a/openfl-tutorials/Federated_PyTorch_TinyImageNet.ipynb b/openfl-tutorials/deprecated/native_api/Federated_PyTorch_TinyImageNet.ipynb similarity index 100% rename from openfl-tutorials/Federated_PyTorch_TinyImageNet.ipynb rename to openfl-tutorials/deprecated/native_api/Federated_PyTorch_TinyImageNet.ipynb diff --git a/openfl-tutorials/Federated_PyTorch_UNET_Tutorial.ipynb b/openfl-tutorials/deprecated/native_api/Federated_PyTorch_UNET_Tutorial.ipynb similarity index 100% rename from openfl-tutorials/Federated_PyTorch_UNET_Tutorial.ipynb rename to openfl-tutorials/deprecated/native_api/Federated_PyTorch_UNET_Tutorial.ipynb diff --git a/openfl-tutorials/Federated_Pytorch_MNIST_Tutorial.ipynb b/openfl-tutorials/deprecated/native_api/Federated_Pytorch_MNIST_Tutorial.ipynb similarity index 100% rename from openfl-tutorials/Federated_Pytorch_MNIST_Tutorial.ipynb rename to openfl-tutorials/deprecated/native_api/Federated_Pytorch_MNIST_Tutorial.ipynb diff --git a/openfl-tutorials/Federated_Pytorch_MNIST_custom_aggregation_Tutorial.ipynb b/openfl-tutorials/deprecated/native_api/Federated_Pytorch_MNIST_custom_aggregation_Tutorial.ipynb similarity index 100% rename from openfl-tutorials/Federated_Pytorch_MNIST_custom_aggregation_Tutorial.ipynb rename to openfl-tutorials/deprecated/native_api/Federated_Pytorch_MNIST_custom_aggregation_Tutorial.ipynb diff --git a/openfl-workspace/torch_llm_horovod/src/InHorovodrun.py b/openfl-workspace/torch_llm_horovod/src/InHorovodrun.py index e4e24bf760..3c7746d831 100644 --- a/openfl-workspace/torch_llm_horovod/src/InHorovodrun.py +++ b/openfl-workspace/torch_llm_horovod/src/InHorovodrun.py @@ -9,7 +9,7 @@ import horovod.torch as hvd -import openfl.native as fx +from openfl.interface.cli import setup_logging SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) sys.path.append(os.path.dirname(SCRIPT_DIR)) @@ -50,7 +50,7 @@ def get_args(): def main(): logger = getLogger(__name__) - fx.setup_logging(level="INFO", log_file=None) + setup_logging() try: logger.info("starting horovod") hvd.init()