Merge latest master into roll-migration

Author: HyosungSink

.github/CODEOWNERS

@@ -3,14 +3,14 @@
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
 
-/src/flag_gems/*      @kiddyjinjin   @0x45f   @zhangpeiyang1  @huangyiqun
+/src/flag_gems/*      @0x45f   @huangyiqun @douxetpur @bin913 @w1120029931-bit
 /src/flag_gems/runtime/backend/*
 
-/tests/*             @kiddyjinjin   @0x45f   @zhangpeiyang1  @huangyiqun
-/modules_tests/*     @kiddyjinjin   @0x45f   @zhangpeiyang1  @huangyiqun
-/benchmark/*         @kiddyjinjin   @0x45f   @zhangpeiyang1  @huangyiqun
+/tests/*             @0x45f   @huangyiqun @douxetpur @bin913 @w1120029931-bit
+/modules_tests/*     @0x45f   @huangyiqun @douxetpur @bin913 @w1120029931-bit
+/benchmark/*         @0x45f   @huangyiqun @douxetpur @bin913 @w1120029931-bit
 
 
-/lib/*                @kiddyjinjin   @0x45f   @zhangpeiyang1  @huangyiqun
-/ctests/*             @kiddyjinjin   @0x45f   @zhangpeiyang1  @huangyiqun
-/include/*            @kiddyjinjin   @0x45f   @zhangpeiyang1  @huangyiqun
+/lib/*                @0x45f   @huangyiqun @douxetpur @bin913 @w1120029931-bit
+/ctests/*             @0x45f   @huangyiqun @douxetpur @bin913 @w1120029931-bit
+/include/*            @0x45f   @huangyiqun @douxetpur @bin913 @w1120029931-bit

.github/workflows/backend-test.yaml

@@ -59,6 +59,14 @@ jobs:
       - uses: actions/checkout@v6
         with:
           ssh-key: ${{ secrets.RUNNER_SSH_KEY }}
+      - name: Setup FlagGems
+        shell: bash
+        run: |
+          if [[ "${RUNNER_LABEL}" != "h20" ]]; then
+            export HTTP_PROXY="http://10.1.12.38:38002"
+            export HTTPS_PROXY="http://10.1.12.38:38002"
+          fi
+          ./setup.sh ${{ inputs.vendor }}
       - name: Check GPU availability
         if: ${{ inputs.gpu_check_script != '' }}
         shell: bash
@@ -78,9 +86,4 @@ jobs:
           CHANGED_FILES: ${{ inputs.changed_files }}
           RUNNER_LABEL: ${{ inputs.runner_label }}
         run: |
-          if [[ "${RUNNER_LABEL}" != "h20" ]]; then
-            export HTTP_PROXY="http://10.1.12.38:38002"
-            export HTTPS_PROXY="http://10.1.12.38:38002"
-          fi
-
-          tools/test_backends.sh ${{ inputs.vendor }} ${{ inputs.pr_id }}
+          tools/test-op.sh ${{ inputs.pr_id }}

benchmark/conftest.py

@@ -137,14 +137,19 @@ def pytest_addoption(parser):
         help="Specify the shape file name for benchmarks. If not specified, a default shape list will be used.",
     )
 
-    parser.addoption(
-        "--record",
-        action="store",
-        default="none",
-        required=False,
-        choices=["none", "log"],
-        help="Benchmark info recorded in log files or not",
-    )
+    try:
+        parser.addoption(
+            "--record",
+            action="store",
+            default="none",
+            required=False,
+            choices=["none", "log"],
+            help="Benchmark info recorded in log files or not",
+        )
+    except ValueError:
+        # Mixed test+benchmark pytest runs may already register --record in
+        # tests/conftest.py. Reuse the existing option in that case.
+        pass
 
     parser.addoption(
         "--parallel",
@@ -158,11 +163,16 @@ def pytest_addoption(parser):
         ),
     )
 
-    parser.addoption(
-        "--collect-marks",
-        action="store_true",
-        help="Collect the tests with marker information without executing them",
-    )
+    try:
+        parser.addoption(
+            "--collect-marks",
+            action="store_true",
+            help="Collect the tests with marker information without executing them",
+        )
+    except ValueError:
+        # Mixed test+benchmark pytest runs may already register this option in
+        # tests/conftest.py. Reuse the existing option in that case.
+        pass
 
 
 def pytest_configure(config):