bug fix in unit-test

alibaba · Nov 7, 2022 · 88128f2 · 88128f2
1 parent af8b4b5
commit 88128f2
Show file tree

Hide file tree

Showing 20 changed files with 65 additions and 67 deletions.
diff --git a/..._scripts/fednlp/config_client_fednlp.yaml → ...pe/nlp/baseline/config_client_fednlp.yaml b/..._scripts/fednlp/config_client_fednlp.yaml → ...pe/nlp/baseline/config_client_fednlp.yaml
diff --git a/...ipts/isolated/config_client_isolated.yaml → .../nlp/baseline/config_client_isolated.yaml b/...ipts/isolated/config_client_isolated.yaml → .../nlp/baseline/config_client_isolated.yaml
diff --git a/...ipts/pcfednlp/config_client_pcfednlp.yaml → .../nlp/baseline/config_client_pcfednlp.yaml b/...ipts/pcfednlp/config_client_pcfednlp.yaml → .../nlp/baseline/config_client_pcfednlp.yaml
diff --git a/.../pfednlp/train/config_client_pfednlp.yaml → ...e/nlp/baseline/config_client_pfednlp.yaml b/.../pfednlp/train/config_client_pfednlp.yaml → ...e/nlp/baseline/config_client_pfednlp.yaml
diff --git a/...nlp_exp_scripts/fednlp/config_fednlp.yaml → ...atedscope/nlp/baseline/config_fednlp.yaml b/...nlp_exp_scripts/fednlp/config_fednlp.yaml → ...atedscope/nlp/baseline/config_fednlp.yaml
diff --git a/...exp_scripts/isolated/config_isolated.yaml → ...edscope/nlp/baseline/config_isolated.yaml b/...exp_scripts/isolated/config_isolated.yaml → ...edscope/nlp/baseline/config_isolated.yaml
diff --git a/...exp_scripts/pcfednlp/config_pcfednlp.yaml → ...edscope/nlp/baseline/config_pcfednlp.yaml b/...exp_scripts/pcfednlp/config_pcfednlp.yaml → ...edscope/nlp/baseline/config_pcfednlp.yaml
diff --git a/...scripts/pfednlp/train/config_pfednlp.yaml → ...tedscope/nlp/baseline/config_pfednlp.yaml b/...scripts/pfednlp/train/config_pfednlp.yaml → ...tedscope/nlp/baseline/config_pfednlp.yaml
diff --git a/...pts/pfednlp/pretrain/config_pretrain.yaml → ...nlp/baseline/config_pfednlp_pretrain.yaml b/...pts/pfednlp/pretrain/config_pretrain.yaml → ...nlp/baseline/config_pfednlp_pretrain.yaml
diff --git a/scripts/nlp_exp_scripts/fednlp/run.sh b/scripts/nlp_exp_scripts/fednlp/run.sh
diff --git a/scripts/nlp_exp_scripts/isolated/run.sh b/scripts/nlp_exp_scripts/isolated/run.sh
diff --git a/scripts/nlp_exp_scripts/pcfednlp/run.sh b/scripts/nlp_exp_scripts/pcfednlp/run.sh
diff --git a/scripts/nlp_exp_scripts/pfednlp/pretrain/run.sh b/scripts/nlp_exp_scripts/pfednlp/pretrain/run.sh
diff --git a/scripts/nlp_exp_scripts/pfednlp/train/run.sh b/scripts/nlp_exp_scripts/pfednlp/train/run.sh
diff --git a/scripts/nlp_exp_scripts/run_fednlp.sh b/scripts/nlp_exp_scripts/run_fednlp.sh
@@ -0,0 +1,10 @@
+set -e
+
+cd ..
+
+echo "Run fednlp."
+
+python federatedscope/main.py \
+  --cfg federatedscope/nlp/baseline/config_fednlp.yaml \
+  --client_cfg federatedscope/nlp/baseline/config_client_fednlp.yaml \
+  outdir exp/fednlp/train/ \
diff --git a/scripts/nlp_exp_scripts/run_isolated.sh b/scripts/nlp_exp_scripts/run_isolated.sh
@@ -0,0 +1,10 @@
+set -e
+
+cd ..
+
+echo "Run isolated."
+
+python federatedscope/main.py \
+  --cfg federatedscope/nlp/baseline/config_isolated.yaml \
+  --client_cfg federatedscope/nlp/baseline/config_client_isolated.yaml \
+  outdir exp/isolated/train/ \
diff --git a/scripts/nlp_exp_scripts/run_pcfednlp.sh b/scripts/nlp_exp_scripts/run_pcfednlp.sh
@@ -0,0 +1,11 @@
+set -e
+
+cd ..
+
+echo "Run pcfednlp."
+
+python federatedscope/main.py \
+  --cfg federatedscope/nlp/baseline/config_pcfednlp.yaml \
+  --client_cfg federatedscope/nlp/baseline/config_client_pcfednlp.yaml \
+  federate.hfl_load_from exp/pfednlp/pretrain/ckpt/ \
+  outdir exp/pcfednlp/train/ \
diff --git a/scripts/nlp_exp_scripts/run_pfednlp.sh b/scripts/nlp_exp_scripts/run_pfednlp.sh
@@ -0,0 +1,11 @@
+set -e
+
+cd ..
+
+echo "Run pfednlp."
+
+python federatedscope/main.py \
+  --cfg federatedscope/nlp/baseline/config_pfednlp.yaml \
+  --client_cfg federatedscope/nlp/baseline/config_client_pfednlp.yaml \
+  federate.hfl_load_from exp/pfednlp/pretrain/ckpt/ \
+  outdir exp/pfednlp/train/ \
diff --git a/scripts/nlp_exp_scripts/run_pfednlp_pretrain.sh b/scripts/nlp_exp_scripts/run_pfednlp_pretrain.sh
@@ -0,0 +1,9 @@
+set -e
+
+cd ..
+
+echo "Run pfednlp pretrain."
+
+python federatedscope/main.py \
+  --cfg federatedscope/nlp/baseline/config_pfednlp_pretrain.yaml \
+  outdir exp/pfednlp/pretrain/ \
diff --git a/tests/test_nlp.py b/tests/test_nlp.py
@@ -17,50 +17,44 @@ def setUp(self):
 
     def test_isolated(self):
         cfg_alg = CfgNode.load_cfg(
-            open('scripts/nlp_exp_scripts/isolated/config_isolated.yaml', 'r'))
+            open('federatedscope/nlp/baseline/config_isolated.yaml', 'r'))
         cfg_client = CfgNode.load_cfg(
-            open(
-                'scripts/nlp_exp_scripts/isolated/config_client_isolated.yaml',
-                'r'))
+            open('federatedscope/nlp/baseline/config_client_isolated.yaml',
+                 'r'))
         cfg_alg.outdir = 'exp/fedavg/'
         self.fed_runner(cfg_alg, cfg_client)
 
     def test_fednlp(self):
         cfg_alg = CfgNode.load_cfg(
-            open('scripts/nlp_exp_scripts/fednlp/config_fednlp.yaml', 'r'))
+            open('federatedscope/nlp/baseline/config_fednlp.yaml', 'r'))
         cfg_client = CfgNode.load_cfg(
-            open('scripts/nlp_exp_scripts/fednlp/config_client_fednlp.yaml',
-                 'r'))
+            open('federatedscope/nlp/baseline/config_client_fednlp.yaml', 'r'))
         cfg_alg.outdir = 'exp/fednlp/'
         self.fed_runner(cfg_alg, cfg_client)
 
     def test_pfednlp(self):
         # pretrain
         cfg_alg = CfgNode.load_cfg(
-            open(
-                'scripts/nlp_exp_scripts/pfednlp/pretrain/config_pretrain.yaml',
-                'r'))
+            open('federatedscope/nlp/baseline/config_pfednlp_pretrain.yaml',
+                 'r'))
         cfg_alg.outdir = 'exp/pfednlp/pretrain/'
         self.fed_runner(cfg_alg)
 
         # train
         cfg_alg = CfgNode.load_cfg(
-            open('scripts/nlp_exp_scripts/pfednlp/train/config_pfednlp.yaml',
-                 'r'))
+            open('federatedscope/nlp/baseline/config_pfednlp.yaml', 'r'))
         cfg_client = CfgNode.load_cfg(
-            open(
-                'scripts/nlp_exp_scripts/pfednlp/train/config_client_pfednlp'
-                '.yaml', 'r'))
+            open('federatedscope/nlp/baseline/config_client_pfednlp.yaml',
+                 'r'))
         cfg_alg.outdir = 'exp/pfednlp/train/'
         self.fed_runner(cfg_alg, cfg_client)
 
     def test_pcfednlp(self):
         cfg_alg = CfgNode.load_cfg(
-            open('scripts/nlp_exp_scripts/pcfednlp/config_pcfednlp.yaml', 'r'))
+            open('federatedscope/nlp/baseline/config_pcfednlp.yaml', 'r'))
         cfg_client = CfgNode.load_cfg(
-            open(
-                'scripts/nlp_exp_scripts/pcfednlp/config_client_pcfednlp.yaml',
-                'r'))
+            open('federatedscope/nlp/baseline/config_client_pcfednlp.yaml',
+                 'r'))
         cfg_alg.outdir = 'exp/pcfednlp/'
         self.fed_runner(cfg_alg, cfg_client)
 
@@ -69,6 +63,7 @@ def fed_runner(self, cfg_alg, cfg_client=None):
         init_cfg.merge_from_other_cfg(cfg_alg)
         init_cfg.data.debug = True
         init_cfg.data.batch_size = 1
+        init_cfg.data.root = 'test_data/'
         init_cfg.data.datasets = ['imdb', 'agnews', 'squad', 'newsqa']
         init_cfg.data.num_grouped_clients = [1, 3, 3, 2]
         init_cfg.federate.client_num = 9