Refactor integration test (step 4) - refactor test file tree structure (#4895)

test/config/pr_tests.yml → test/training_service/config/pr_tests.yml

@@ -13,8 +13,8 @@ testCases:
 #########################################################################
 
 - name: naive-test
-  configFile: test/config/naive_test/local.yml
-  launchCommand: python3 nni_test/nnitest/naive_test.py --config $configFile
+  configFile: test/training_service/config/naive_test/local.yml
+  launchCommand: python3 training_service/nnitest/naive_test.py --config $configFile
   experimentStatusCheck: False
   stopCommand:
   platform: linux darwin
@@ -23,7 +23,7 @@ testCases:
 # nni features test
 #########################################################################
 - name: metrics-float
-  configFile: test/config/metrics_test/config.yml
+  configFile: test/training_service/config/metrics_test/config.yml
   config:
     maxTrialNum: 1
     trialConcurrency: 1
@@ -33,7 +33,7 @@ testCases:
       expected_result_file: expected_metrics.json
 
 - name: metrics-dict
-  configFile: test/config/metrics_test/config_dict_metrics.yml
+  configFile: test/training_service/config/metrics_test/config_dict_metrics.yml
   config:
     maxTrialNum: 1
     trialConcurrency: 1
@@ -46,7 +46,7 @@ testCases:
 # nni assessor test
 #########################################################################
 - name: assessor-curvefitting
-  configFile: test/config/assessors/curvefitting.yml
+  configFile: test/training_service/config/assessors/curvefitting.yml
   config:
     maxTrialNum: 2
     trialConcurrency: 2
@@ -55,7 +55,7 @@ testCases:
       command: python3 naive_trial.py
 
 - name: assessor-medianstop
-  configFile: test/config/assessors/medianstop.yml
+  configFile: test/training_service/config/assessors/medianstop.yml
   config:
     maxTrialNum: 2
     trialConcurrency: 2
@@ -67,7 +67,7 @@ testCases:
 # nni tuners test
 #########################################################################
 - name: tuner-annel
-  configFile: test/config/tuners/anneal.yml
+  configFile: test/training_service/config/tuners/anneal.yml
   config:
     maxTrialNum: 2
     trialConcurrency: 2
@@ -78,7 +78,7 @@ testCases:
       command: python3 naive_trial.py
 
 - name: tuner-evolution
-  configFile: test/config/tuners/evolution.yml
+  configFile: test/training_service/config/tuners/evolution.yml
   config:
     maxTrialNum: 2
     trialConcurrency: 2
@@ -89,7 +89,7 @@ testCases:
       command: python3 naive_trial.py
 
 - name: tuner-random
-  configFile: test/config/tuners/random.yml
+  configFile: test/training_service/config/tuners/random.yml
   config:
     maxTrialNum: 2
     trialConcurrency: 2
@@ -100,7 +100,7 @@ testCases:
       command: python3 naive_trial.py
 
 - name: tuner-tpe
-  configFile: test/config/tuners/tpe.yml
+  configFile: test/training_service/config/tuners/tpe.yml
   config:
     maxTrialNum: 2
     trialConcurrency: 2
@@ -111,7 +111,7 @@ testCases:
       command: python3 naive_trial.py
 
 - name: tuner-batch
-  configFile: test/config/tuners/batch.yml
+  configFile: test/training_service/config/tuners/batch.yml
   config:
     maxTrialNum: 2
     trialConcurrency: 2
@@ -122,7 +122,7 @@ testCases:
       command: python3 trial_choices.py
 
 - name: tuner-gp
-  configFile: test/config/tuners/gp.yml
+  configFile: test/training_service/config/tuners/gp.yml
   config:
     maxTrialNum: 2
     trialConcurrency: 2
@@ -133,7 +133,7 @@ testCases:
       command: python3 naive_trial.py
 
 - name: tuner-grid
-  configFile: test/config/tuners/gridsearch.yml
+  configFile: test/training_service/config/tuners/gridsearch.yml
   config:
     maxTrialNum: 2
     trialConcurrency: 2

test/config/tuners/anneal.yml → test/training_service/config/tuners/anneal.yml

@@ -13,7 +13,7 @@ assessor:
   classArgs:
     optimize_mode: maximize
 trial:
-  codeDir: ../../../examples/trials/mnist-annotation
+  codeDir: ../../../../examples/trials/mnist-annotation
   command: python3 mnist.py --batch_num 100
   gpuNum: 0
 

test/config/tuners/batch.yml → test/training_service/config/tuners/batch.yml

@@ -12,7 +12,7 @@ assessor:
   classArgs:
     optimize_mode: maximize
 trial:
-  codeDir: ../../../examples/trials/mnist-batch-tune-keras
+  codeDir: ../../../../examples/trials/mnist-batch-tune-keras
   command: python3 mnist-keras.py --epochs 1
   gpuNum: 0
 

test/config/tuners/bohb.yml → test/training_service/config/tuners/bohb.yml

@@ -13,7 +13,7 @@ advisor:
     eta: 3
     optimize_mode: maximize
 trial:
-  codeDir: ../../../examples/trials/mnist-advisor
+  codeDir: ../../../../examples/trials/mnist-advisor
   command: python3 mnist.py
   gpuNum: 0
 

test/config/tuners/evolution.yml → test/training_service/config/tuners/evolution.yml

@@ -13,7 +13,7 @@ assessor:
   classArgs:
     optimize_mode: maximize
 trial:
-  codeDir: ../../../examples/trials/mnist-annotation
+  codeDir: ../../../../examples/trials/mnist-annotation
   command: python3 mnist.py --batch_num 100
   gpuNum: 0
 

test/config/tuners/gp.yml → test/training_service/config/tuners/gp.yml

@@ -22,7 +22,7 @@ assessor:
   classArgs:
     optimize_mode: maximize
 trial:
-  codeDir: ../../../examples/trials/mnist-tfv1
+  codeDir: ../../../../examples/trials/mnist-tfv1
   command: python3 mnist.py --batch_num 100
   gpuNum: 0
 

test/config/tuners/gridsearch.yml → test/training_service/config/tuners/gridsearch.yml

@@ -12,7 +12,7 @@ assessor:
   classArgs:
     optimize_mode: maximize
 trial:
-  codeDir: ../../../examples/trials/mnist-tfv1
+  codeDir: ../../../../examples/trials/mnist-tfv1
   command: python3 mnist.py --batch_num 100
   gpuNum: 0
 

test/config/tuners/hyperband.yml → test/training_service/config/tuners/hyperband.yml

@@ -13,7 +13,7 @@ advisor:
     eta: 3
     exec_mode: parallelism
 trial:
-  codeDir: ../../../examples/trials/mnist-advisor
+  codeDir: ../../../../examples/trials/mnist-advisor
   command: python3 mnist.py
   gpuNum: 0
 

test/config/tuners/metis.yml → test/training_service/config/tuners/metis.yml

@@ -14,7 +14,7 @@ assessor:
   classArgs:
     optimize_mode: maximize
 trial:
-  codeDir: ../../../examples/trials/mnist-tfv1
+  codeDir: ../../../../examples/trials/mnist-tfv1
   command: python3 mnist.py --batch_num 100
   gpuNum: 0
 

test/config/tuners/random.yml → test/training_service/config/tuners/random.yml

@@ -11,7 +11,7 @@ assessor:
   classArgs:
     optimize_mode: maximize
 trial:
-  codeDir: ../../../examples/trials/mnist-annotation
+  codeDir: ../../../../examples/trials/mnist-annotation
   command: python3 mnist.py --batch_num 100
   gpuNum: 0
 

test/config/tuners/regularized_evolution_tuner-v2.yml → test/training_service/config/tuners/regularized_evolution_tuner-v2.yml

 experimentName: default_test
 searchSpaceFile: seach_space_classic_nas.json
 trialCommand: python3 mnist.py --epochs 1
-trialCodeDirectory: ../../../examples/nas/legacy/classic_nas
+trialCodeDirectory: ../../../../examples/nas/legacy/classic_nas
 trialGpuNumber: 0
 trialConcurrency: 1
 maxExperimentDuration: 15m

test/config/tuners/regularized_evolution_tuner.yml → test/training_service/config/tuners/regularized_evolution_tuner.yml

@@ -9,7 +9,7 @@ tuner:
   classArgs:
     optimize_mode: maximize
 trial:
-  codeDir: ../../../examples/nas/legacy/classic_nas
+  codeDir: ../../../../examples/nas/legacy/classic_nas
   command: python3 mnist.py --epochs 1
   gpuNum: 0