Merge branch 'master' of github.com:alibaba/EasyCV

Cathy0908 · Jun 14, 2023 · b185db3 · b185db3
2 parents b474236 + 269aa6d
commit b185db3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/citest.yaml b/.github/workflows/citest.yaml
@@ -39,7 +39,7 @@ concurrency:
 jobs:
   ut-torch180:
     # The type of runner that the job will run on
-    runs-on: [unittest-t4]
+    runs-on: [self-hosted]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -64,7 +64,7 @@ jobs:
           # pip install -r requirements.txt
           #run test
           export CUDA_VISIBLE_DEVICES=7
-          source ~/workspace/anaconda2/etc/profile.d/conda.sh
+          source ~/anaconda3/etc/profile.d/conda.sh
           conda activate easycv_torch1.8.0
 
           # pip install pai-easycv
@@ -84,7 +84,7 @@ jobs:
 # blade test env will be updated! we do not support test with trt_efficient_nms
   ut-torch181-blade:
     # The type of runner that the job will run on
-    runs-on: [unittest-t4]
+    runs-on: [self-hosted]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -110,7 +110,7 @@ jobs:
           # pip install -r requirements.txt
           #run test
           export CUDA_VISIBLE_DEVICES=6
-          source ~/workspace/anaconda2/etc/profile.d/conda.sh
+          source ~/anaconda3/etc/profile.d/conda.sh
           conda activate torch1.8.1_blade
           PYTHONPATH=. python tests/test_predictors/test_detector_blade.py
           PYTHONPATH=. python tests/test_apis/test_export_blade.py
diff --git a/tests/test_toolkit/modelscope/trainers/test_easycv_trainer_detection_dino.py b/tests/test_toolkit/modelscope/trainers/test_easycv_trainer_detection_dino.py
@@ -40,6 +40,7 @@ def _train(self, tmp_dir):
             train_dataset=train_dataset,
             eval_dataset=eval_dataset,
             work_dir=tmp_dir,
+            use_fp16=True,
             cfg_options=cfg_options)
 
         trainer = build_trainer(trainer_name, kwargs)

diff --git a/tests/test_tools/test_classification_train.py b/tests/test_tools/test_classification_train.py
@@ -98,7 +98,9 @@ def _base_train(self, train_cfgs, adapt_pai=False):
               (tmp_cfg_file, work_dir, args_str)
 
         logging.info('run command: %s' % cmd)
-        run_in_subprocess(cmd)
+        # run_in_subprocess(cmd)  # 管道缓冲区被写满，后面的写入请求都hang住了
+        import subprocess
+        subprocess.call(cmd, shell=True)
 
         output_files = io.listdir(work_dir)
         self.assertIn('epoch_1.pth', output_files)