Resolving merge conflicts in experimental local-runtme tutorials 101,…

… 103, 201, & 301 fixing FedAvg in workflow interface tutorials to be compatible with latest numpy stable release (1.24.3) (securefederatedai#833) * fixing FedAvg averaging in order to be compatible with numpy v1.24+ Signed-off-by: kta-intel <kevin.ta@intel.com> * uncommenting installations for consistency with other tutorials Signed-off-by: kta-intel <kevin.ta@intel.com> * fixing 301_MNIST_Watermarking tutorial FedAvg Signed-off-by: kta-intel <kevin.ta@intel.com> * fixing 301_MNIST_Watermarki ng tutorial FedAvg Signed-off-by: kta-intel <kevin.ta@intel.com> * Switching to py38 kernel and clearing cell outputs Signed-off-by: kta-intel <kevin.ta@intel.com> --------- Signed-off-by: kta-intel <kevin.ta@intel.com> --------- Signed-off-by: Parth Mandaliya <parth.mandaliya.007@gmail.com>
ParthMandaliya · Oct 5, 2023 · 4c11e06 · 4c11e06
1 parent 3386c54
commit 4c11e06
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/openfl-tutorials/experimental/Workflow_Interface_101_MNIST.ipynb b/openfl-tutorials/experimental/Workflow_Interface_101_MNIST.ipynb
@@ -223,6 +223,7 @@
     "from openfl.experimental.runtime import LocalRuntime\n",
     "from openfl.experimental.placement import aggregator, collaborator\n",
     "\n",
+    "\n",
     "def FedAvg(models, weights=None):\n",
     "    new_model = models[0]\n",
     "    state_dicts = [model.state_dict() for model in models]\n",
@@ -737,9 +738,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "workflow-interface-py38",
    "language": "python",
-   "name": "python3"
+   "name": "workflow-interface-py38"
   },
   "language_info": {
    "codemirror_mode": {

diff --git a/...rials/experimental/Workflow_Interface_103_Cyclic_Institutional_Incremental_Learning.ipynb b/...rials/experimental/Workflow_Interface_103_Cyclic_Institutional_Incremental_Learning.ipynb
@@ -662,9 +662,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "workflow-interface-py38",
    "language": "python",
-   "name": "python3"
+   "name": "workflow-interface-py38"
   },
   "language_info": {
    "codemirror_mode": {

diff --git a/openfl-tutorials/experimental/Workflow_Interface_201_Exclusive_GPUs_with_Ray.ipynb b/openfl-tutorials/experimental/Workflow_Interface_201_Exclusive_GPUs_with_Ray.ipynb
@@ -626,9 +626,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "openfl_github_collab_private",
+   "display_name": "workflow-interface-py38",
    "language": "python",
-   "name": "python3"
+   "name": "workflow-interface-py38"
   },
   "language_info": {
    "codemirror_mode": {

diff --git a/openfl-tutorials/experimental/Workflow_Interface_301_MNIST_Watermarking.ipynb b/openfl-tutorials/experimental/Workflow_Interface_301_MNIST_Watermarking.ipynb
@@ -935,9 +935,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "workflow-interface-py38",
    "language": "python",
-   "name": "python3"
+   "name": "workflow-interface-py38"
   },
   "language_info": {
    "codemirror_mode": {