solve conflict

Author: grimoire

autotest/benchmark/test_throughput_performance.py

@@ -1,3 +1,5 @@
+import os
+
 import pytest
 from utils.benchmark_utils import throughput_test
 from utils.config_utils import get_benchmark_model_list, get_cuda_id_by_workerid, get_cuda_prefix_by_workerid
@@ -92,11 +94,15 @@ def test_throughput_func_tp2(config, run_id, run_config, worker_id):
     'tp_num': 1
 }])
 def test_throughput_prtest_tp1(config, run_id, run_config, worker_id):
+    device_type = os.environ.get('DEVICE', 'cuda')
+    if device_type == 'ascend':
+        env_var = 'ASCEND_RT_VISIBLE_DEVICES='
+    else:
+        env_var = 'CUDA_VISIBLE_DEVICES='
     result, msg = throughput_test(config,
                                   run_id,
                                   run_config,
-                                  cuda_prefix='CUDA_VISIBLE_DEVICES=' +
-                                  str(int(get_cuda_id_by_workerid(worker_id)) + 5),
+                                  cuda_prefix=f'{env_var}' + str(int(get_cuda_id_by_workerid(worker_id)) + 5),
                                   worker_id=worker_id,
                                   is_smoke=True)
 

autotest/conftest.py

@@ -10,7 +10,17 @@
 
 @pytest.fixture(scope='session')
 def config():
-    config_path = os.path.join(config_file)
+    # Use device-specific config file if DEVICE environment variable is set
+    device = os.environ.get('DEVICE', '')
+    if device:
+        device_config_path = f'autotest/config-{device}.yaml'
+        if os.path.exists(device_config_path):
+            config_path = device_config_path
+        else:
+            config_path = config_file
+    else:
+        config_path = config_file
+
     with open(config_path) as f:
         env_config = yaml.load(f.read(), Loader=yaml.SafeLoader)
     return env_config
@@ -34,8 +44,21 @@ def common_case_config():
 
 def pytest_addoption(parser):
     parser.addoption('--run_id', action='store', default='', help='github run_id')
+    parser.addoption('--device', action='store', default='', help='device config suffix')
+
+
+def pytest_configure(config):
+    # Set DEVICE environment variable before test execution
+    device = config.getoption('--device')
+    if device:
+        os.environ['DEVICE'] = device
 
 
 @pytest.fixture(scope='session')
 def run_id(request):
     return request.config.getoption('--run_id')
+
+
+@pytest.fixture(scope='session')
+def device(request):
+    return request.config.getoption('--device')