Merge pull request #5 from payalcha/fix-global-writer-1

Remove get_writer function and initialize writer variable in calling function
securefederatedai · Dec 11, 2024 · 8e7a9c3 · 8e7a9c3
2 parents fe48944 + db2730e
commit 8e7a9c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 30 deletions.
diff --git a/openfl-tutorials/deprecated/native_api/Federated_Pytorch_MNIST_Tutorial.ipynb b/openfl-tutorials/deprecated/native_api/Federated_Pytorch_MNIST_Tutorial.ipynb
@@ -135,15 +135,8 @@
    "source": [
     "from torch.utils.tensorboard import SummaryWriter\n",
     "\n",
-    "writer = None\n",
-    "\n",
-    "def get_writer():\n",
-    "    global writer\n",
-    "    if not writer:\n",
-    "        writer = SummaryWriter('./logs/cnn_mnist', flush_secs=5)\n",
-    "\n",
     "def write_metric(node_name, task_name, metric_name, metric, round_number):\n",
-    "    get_writer()\n",
+    "    writer = SummaryWriter('./logs/cnn_mnist', flush_secs=5)\n",
     "    writer.add_scalar(\"{}/{}/{}\".format(node_name, task_name, metric_name),\n",
     "                      metric, round_number)"
    ]

diff --git a/...pace/experimental/workflow/AggregatorBasedWorkflow/102_aggregator_validation/src/utils.py b/...pace/experimental/workflow/AggregatorBasedWorkflow/102_aggregator_validation/src/utils.py
@@ -4,18 +4,7 @@
 from torch.utils.tensorboard import SummaryWriter
 
 
-writer = None
-
-
-def get_writer():
-    """Create global writer object."""
-    global writer
-    if not writer:
-        writer = SummaryWriter('./logs/cnn_mnist', flush_secs=5)
-    return writer
-
-
 def write_metric(node_name, task_name, metric_name, metric, round_number):
     """Write metric callback."""
-    writer = get_writer()
+    writer = SummaryWriter('./logs/cnn_mnist', flush_secs=5)
     writer.add_scalar(f'{node_name}/{task_name}/{metric_name}', metric, round_number)
diff --git a/openfl-workspace/experimental/workflow/AggregatorBasedWorkflow/104_keras_mnist/src/utils.py b/openfl-workspace/experimental/workflow/AggregatorBasedWorkflow/104_keras_mnist/src/utils.py
@@ -3,16 +3,7 @@
 
 from tensorflow.summary import SummaryWriter
 
-writer = None
-
-def get_writer():
-    """Create global writer object."""
-    global writer
-    if not writer:
-        writer = SummaryWriter('./logs/cnn_mnist', flush_secs=5)
-    return writer
-
 def write_metric(node_name, task_name, metric_name, metric, round_number):
     """Write metric callback."""
-    writer = get_writer()
+    writer = SummaryWriter('./logs/cnn_mnist', flush_secs=5)
     writer.add_scalar(f'{node_name}/{task_name}/{metric_name}', metric, round_number)