From 915fd7b134014a649793dc8a7ae11c862f765f78 Mon Sep 17 00:00:00 2001
From: scap3yvt <149599669+scap3yvt@users.noreply.github.com>
Date: Sat, 3 Feb 2024 17:30:33 +0000
Subject: [PATCH 1/7] updated openfl tests

---
 .github/workflows/openfl-test.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/openfl-test.yml b/.github/workflows/openfl-test.yml
index 86ce00a4d..f2478eb40 100644
--- a/.github/workflows/openfl-test.yml
+++ b/.github/workflows/openfl-test.yml
@@ -90,15 +90,16 @@ jobs:
         git clone --depth=1 https://github.com/securefederatedai/openfl.git
         cd openfl
         git fetch --tags
-        echo "Checkout the latest OpenFL tag"
-        latestTag=$(git describe --tags "$(git rev-list --tags --max-count=1)")
-        git checkout $latestTag
-        sed -i -e 's/protobuf==3.19.6/protobuf/g' setup.py ## this should NOT be there
+        # echo "Checkout the latest OpenFL tag"
+        # latestTag=$(git describe --tags "$(git rev-list --tags --max-count=1)")
+        # git checkout $latestTag
+        # sed -i -e 's/protobuf==3.19.6/protobuf/g' setup.py ## this should NOT be there
         pip install -e .
         cd ..
         echo "Copying files to appropriate directories and updated headers"
         head -n 1 testing/data/train_3d_rad_segmentation.csv > /home/runner/work/GaNDLF/GaNDLF/openfl/valid.csv
         tail -n +9 testing/data/train_3d_rad_segmentation.csv >> /home/runner/work/GaNDLF/GaNDLF/openfl/valid.csv
         head -n 8 testing/data/train_3d_rad_segmentation.csv > /home/runner/work/GaNDLF/GaNDLF/openfl/train.csv
+        sed -i 's/# n_channels: 3/num_channels: 3/g' testing/config_segmentation.yaml
         cd openfl
-        python -m tests.github.test_gandlf --template gandlf_seg_test --fed_workspace aggregator --col1 one --col2 two --rounds-to-train 1
+        python -m tests.github.test_gandlf --template gandlf_seg_test --fed_workspace aggregator --col1 one --col2 two --rounds-to-train 1 --gandlf_config ../testing/config_segmentation.yaml

From 8dbe2b2c16bc2b6b6e4d8d07ccb87b8cc0cd3ae5 Mon Sep 17 00:00:00 2001
From: scap3yvt <149599669+scap3yvt@users.noreply.github.com>
Date: Sat, 3 Feb 2024 17:48:04 +0000
Subject: [PATCH 2/7] updated the api

---
 .github/workflows/openfl-test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/openfl-test.yml b/.github/workflows/openfl-test.yml
index f2478eb40..0c8800a0c 100644
--- a/.github/workflows/openfl-test.yml
+++ b/.github/workflows/openfl-test.yml
@@ -102,4 +102,8 @@ jobs:
         head -n 8 testing/data/train_3d_rad_segmentation.csv > /home/runner/work/GaNDLF/GaNDLF/openfl/train.csv
         sed -i 's/# n_channels: 3/num_channels: 3/g' testing/config_segmentation.yaml
         cd openfl
+        ### this should not be there
+        sed -i "s/from GANDLF.parseConfig import parseConfig/from GANDLF.config_manager import ConfigManager/" openfl/federated/task/runner_gandlf.py
+        sed -i "s/parseConfig/ConfigManager/" openfl/federated/task/runner_gandlf.py
+        ### this should not be there
         python -m tests.github.test_gandlf --template gandlf_seg_test --fed_workspace aggregator --col1 one --col2 two --rounds-to-train 1 --gandlf_config ../testing/config_segmentation.yaml

From 6390891c678b8eaf39e9e5cf60531a55246810be Mon Sep 17 00:00:00 2001
From: scap3yvt <149599669+scap3yvt@users.noreply.github.com>
Date: Sat, 3 Feb 2024 17:50:52 +0000
Subject: [PATCH 3/7] using 2d data

---
 .github/workflows/openfl-test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/openfl-test.yml b/.github/workflows/openfl-test.yml
index 0c8800a0c..195f1892f 100644
--- a/.github/workflows/openfl-test.yml
+++ b/.github/workflows/openfl-test.yml
@@ -97,9 +97,9 @@ jobs:
         pip install -e .
         cd ..
         echo "Copying files to appropriate directories and updated headers"
-        head -n 1 testing/data/train_3d_rad_segmentation.csv > /home/runner/work/GaNDLF/GaNDLF/openfl/valid.csv
-        tail -n +9 testing/data/train_3d_rad_segmentation.csv >> /home/runner/work/GaNDLF/GaNDLF/openfl/valid.csv
-        head -n 8 testing/data/train_3d_rad_segmentation.csv > /home/runner/work/GaNDLF/GaNDLF/openfl/train.csv
+        head -n 1 testing/data/train_2d_rad_segmentation.csv > /home/runner/work/GaNDLF/GaNDLF/openfl/valid.csv
+        tail -n +9 testing/data/train_2d_rad_segmentation.csv >> /home/runner/work/GaNDLF/GaNDLF/openfl/valid.csv
+        head -n 8 testing/data/train_2d_rad_segmentation.csv > /home/runner/work/GaNDLF/GaNDLF/openfl/train.csv
         sed -i 's/# n_channels: 3/num_channels: 3/g' testing/config_segmentation.yaml
         cd openfl
         ### this should not be there

From f8b4b74280573add44fcde97563bda528615a046 Mon Sep 17 00:00:00 2001
From: scap3yvt <149599669+scap3yvt@users.noreply.github.com>
Date: Sat, 3 Feb 2024 19:29:19 +0000
Subject: [PATCH 4/7] trying a better way

---
 .github/workflows/openfl-test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/openfl-test.yml b/.github/workflows/openfl-test.yml
index 195f1892f..e8e386ba7 100644
--- a/.github/workflows/openfl-test.yml
+++ b/.github/workflows/openfl-test.yml
@@ -101,9 +101,10 @@ jobs:
         tail -n +9 testing/data/train_2d_rad_segmentation.csv >> /home/runner/work/GaNDLF/GaNDLF/openfl/valid.csv
         head -n 8 testing/data/train_2d_rad_segmentation.csv > /home/runner/work/GaNDLF/GaNDLF/openfl/train.csv
         sed -i 's/# n_channels: 3/num_channels: 3/g' testing/config_segmentation.yaml
+        config_to_use=$(pwd)/testing/config_segmentation.yaml
         cd openfl
         ### this should not be there
         sed -i "s/from GANDLF.parseConfig import parseConfig/from GANDLF.config_manager import ConfigManager/" openfl/federated/task/runner_gandlf.py
         sed -i "s/parseConfig/ConfigManager/" openfl/federated/task/runner_gandlf.py
         ### this should not be there
-        python -m tests.github.test_gandlf --template gandlf_seg_test --fed_workspace aggregator --col1 one --col2 two --rounds-to-train 1 --gandlf_config ../testing/config_segmentation.yaml
+        python -m tests.github.test_gandlf --template gandlf_seg_test --fed_workspace aggregator --col1 one --col2 two --rounds-to-train 1 --gandlf_config config_to_use

From 198d5952ccb166c108f63d58445c3078026ad378 Mon Sep 17 00:00:00 2001
From: scap3yvt <149599669+scap3yvt@users.noreply.github.com>
Date: Sat, 3 Feb 2024 19:34:35 +0000
Subject: [PATCH 5/7] typo fix

---
 .github/workflows/openfl-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/openfl-test.yml b/.github/workflows/openfl-test.yml
index e8e386ba7..2e231e21e 100644
--- a/.github/workflows/openfl-test.yml
+++ b/.github/workflows/openfl-test.yml
@@ -107,4 +107,4 @@ jobs:
         sed -i "s/from GANDLF.parseConfig import parseConfig/from GANDLF.config_manager import ConfigManager/" openfl/federated/task/runner_gandlf.py
         sed -i "s/parseConfig/ConfigManager/" openfl/federated/task/runner_gandlf.py
         ### this should not be there
-        python -m tests.github.test_gandlf --template gandlf_seg_test --fed_workspace aggregator --col1 one --col2 two --rounds-to-train 1 --gandlf_config config_to_use
+        python -m tests.github.test_gandlf --template gandlf_seg_test --fed_workspace aggregator --col1 one --col2 two --rounds-to-train 1 --gandlf_config $config_to_use

From edfb40f9aa6573b534662ca14b9edbdf613a4da1 Mon Sep 17 00:00:00 2001
From: scap3yvt <149599669+scap3yvt@users.noreply.github.com>
Date: Thu, 8 Feb 2024 11:04:31 -0500
Subject: [PATCH 6/7] this should be fixed with latest merge #791

---
 .github/workflows/openfl-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/openfl-test.yml b/.github/workflows/openfl-test.yml
index 2e231e21e..3c825e676 100644
--- a/.github/workflows/openfl-test.yml
+++ b/.github/workflows/openfl-test.yml
@@ -104,7 +104,7 @@ jobs:
         config_to_use=$(pwd)/testing/config_segmentation.yaml
         cd openfl
         ### this should not be there
-        sed -i "s/from GANDLF.parseConfig import parseConfig/from GANDLF.config_manager import ConfigManager/" openfl/federated/task/runner_gandlf.py
-        sed -i "s/parseConfig/ConfigManager/" openfl/federated/task/runner_gandlf.py
+        # sed -i "s/from GANDLF.parseConfig import parseConfig/from GANDLF.config_manager import ConfigManager/" openfl/federated/task/runner_gandlf.py
+        # sed -i "s/parseConfig/ConfigManager/" openfl/federated/task/runner_gandlf.py
         ### this should not be there
         python -m tests.github.test_gandlf --template gandlf_seg_test --fed_workspace aggregator --col1 one --col2 two --rounds-to-train 1 --gandlf_config $config_to_use

From ff3376195f0cddabdcab1361ad19a701b6281db2 Mon Sep 17 00:00:00 2001
From: scap3yvt <149599669+scap3yvt@users.noreply.github.com>
Date: Thu, 8 Feb 2024 11:20:05 -0500
Subject: [PATCH 7/7] removed commented files

---
 .github/workflows/openfl-test.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/openfl-test.yml b/.github/workflows/openfl-test.yml
index 3c825e676..4c48b54b7 100644
--- a/.github/workflows/openfl-test.yml
+++ b/.github/workflows/openfl-test.yml
@@ -103,8 +103,4 @@ jobs:
         sed -i 's/# n_channels: 3/num_channels: 3/g' testing/config_segmentation.yaml
         config_to_use=$(pwd)/testing/config_segmentation.yaml
         cd openfl
-        ### this should not be there
-        # sed -i "s/from GANDLF.parseConfig import parseConfig/from GANDLF.config_manager import ConfigManager/" openfl/federated/task/runner_gandlf.py
-        # sed -i "s/parseConfig/ConfigManager/" openfl/federated/task/runner_gandlf.py
-        ### this should not be there
         python -m tests.github.test_gandlf --template gandlf_seg_test --fed_workspace aggregator --col1 one --col2 two --rounds-to-train 1 --gandlf_config $config_to_use