[ci] Removing ROCM organization variable amdgpu_family_matrix.py logic

.github/workflows/build_linux_jax_wheels.yml

@@ -217,9 +217,6 @@ jobs:
         env:
           TARGET: ${{ inputs.amdgpu_family }}
           PLATFORM: "linux"
-          # Variable comes from ROCm organization variable 'ROCM_THEROCK_TEST_RUNNERS'
-          ROCM_THEROCK_TEST_RUNNERS: ${{ vars.ROCM_THEROCK_TEST_RUNNERS }}
-          LOAD_TEST_RUNNERS_FROM_VAR: false
         run: python ./build_tools/github_actions/configure_target_run.py
 
   test_jax_wheels:

.github/workflows/build_portable_linux_pytorch_wheels.yml

@@ -262,9 +262,6 @@ jobs:
         env:
           TARGET: ${{ inputs.amdgpu_family }}
           PLATFORM: "linux"
-          # Variable comes from ROCm organization variable 'ROCM_THEROCK_TEST_RUNNERS'
-          ROCM_THEROCK_TEST_RUNNERS: ${{ vars.ROCM_THEROCK_TEST_RUNNERS }}
-          LOAD_TEST_RUNNERS_FROM_VAR: false
         run: python ./build_tools/github_actions/configure_target_run.py
 
   test_pytorch_wheels:

.github/workflows/build_windows_pytorch_wheels.yml

@@ -297,9 +297,6 @@ jobs:
         env:
           TARGET: ${{ inputs.amdgpu_family }}
           PLATFORM: "windows"
-          # Variable comes from ROCm organization variable 'ROCM_THEROCK_TEST_RUNNERS'
-          ROCM_THEROCK_TEST_RUNNERS: ${{ vars.ROCM_THEROCK_TEST_RUNNERS }}
-          LOAD_TEST_RUNNERS_FROM_VAR: false
         run: python ./build_tools/github_actions/configure_target_run.py
 
   test_pytorch_wheels:

.github/workflows/release_portable_linux_packages.yml

@@ -150,9 +150,6 @@ jobs:
         env:
           AMDGPU_FAMILIES: ${{ inputs.families }}
           THEROCK_PACKAGE_PLATFORM: "linux"
-          # Variable comes from ROCm organization variable 'ROCM_THEROCK_TEST_RUNNERS'
-          ROCM_THEROCK_TEST_RUNNERS: ${{ vars.ROCM_THEROCK_TEST_RUNNERS }}
-          LOAD_TEST_RUNNERS_FROM_VAR: false
         run: python ./build_tools/github_actions/fetch_package_targets.py
 
   portable_linux_packages:

.github/workflows/release_windows_packages.yml

@@ -132,9 +132,6 @@ jobs:
         env:
           AMDGPU_FAMILIES: ${{ inputs.families }}
           THEROCK_PACKAGE_PLATFORM: "windows"
-          # Variable comes from ROCm organization variable 'ROCM_THEROCK_TEST_RUNNERS'
-          ROCM_THEROCK_TEST_RUNNERS: ${{ vars.ROCM_THEROCK_TEST_RUNNERS }}
-          LOAD_TEST_RUNNERS_FROM_VAR: false
         run: python ./build_tools/github_actions/fetch_package_targets.py
 
   windows_packages:

.github/workflows/setup.yml

@@ -78,9 +78,6 @@ jobs:
           ADDITIONAL_LABEL_OPTIONS: ${{ github.event.inputs.additional_label_options }}
           BUILD_VARIANT: ${{ inputs.build_variant }}
           MULTI_ARCH: ${{ inputs.multi_arch }}
-          # Variable comes from ROCm organization variable 'ROCM_THEROCK_TEST_RUNNERS'
-          ROCM_THEROCK_TEST_RUNNERS: ${{ vars.ROCM_THEROCK_TEST_RUNNERS }}
-          LOAD_TEST_RUNNERS_FROM_VAR: false
         run: ./build_tools/github_actions/configure_ci.py
 
       - name: Compute package version

.github/workflows/therock_test_harness.yml

@@ -49,9 +49,6 @@ jobs:
           AMDGPU_FAMILIES: ${{ inputs.families }}
           THEROCK_PACKAGE_PLATFORM: "linux"
           TEST_HARNESS_TARGET_FETCH: true
-          # Variable comes from ROCm organization variable 'ROCM_THEROCK_TEST_RUNNERS'
-          ROCM_THEROCK_TEST_RUNNERS: ${{ vars.ROCM_THEROCK_TEST_RUNNERS }}
-          LOAD_TEST_RUNNERS_FROM_VAR: false
         run: python ./build_tools/github_actions/fetch_package_targets.py
 
 

build_tools/github_actions/amdgpu_family_matrix.py

@@ -13,11 +13,6 @@
 TODO(#2200): clarify AMD GPU family selection
 """
 
-from github_actions_utils import str2bool
-
-import json
-import os
-
 #############################################################################################
 # NOTE: when doing changes here, also check that they are done in new_amdgpu_family_matrix.py
 #############################################################################################
@@ -226,53 +221,11 @@
 }
 
 
-def load_test_runner_from_gh_variables():
-    """
-    As test runner names are frequently updated, we are pulling the runner label data from the ROCm organization variable called "ROCM_THEROCK_TEST_RUNNERS"
-
-    For more info, go to 'docs/development/test_runner_info.md'
-    """
-    test_runner_json_str = os.getenv("ROCM_THEROCK_TEST_RUNNERS", "{}")
-    test_runner_dict = json.loads(test_runner_json_str)
-    for key in test_runner_dict.keys():
-        for platform in test_runner_dict[key].keys():
-            # Checking in presubmit dictionary
-            if (
-                key in amdgpu_family_info_matrix_presubmit
-                and platform in amdgpu_family_info_matrix_presubmit[key]
-            ):
-                amdgpu_family_info_matrix_presubmit[key][platform]["test-runs-on"] = (
-                    test_runner_dict[key][platform]
-                )
-            # Checking in postsubmit dictionary
-            if (
-                key in amdgpu_family_info_matrix_postsubmit
-                and platform in amdgpu_family_info_matrix_postsubmit[key]
-            ):
-                amdgpu_family_info_matrix_postsubmit[key][platform]["test-runs-on"] = (
-                    test_runner_dict[key][platform]
-                )
-            # Checking in nightly dictionary
-            if (
-                key in amdgpu_family_info_matrix_nightly
-                and platform in amdgpu_family_info_matrix_nightly[key]
-            ):
-                amdgpu_family_info_matrix_nightly[key][platform]["test-runs-on"] = (
-                    test_runner_dict[key][platform]
-                )
-
-
 def get_all_families_for_trigger_types(trigger_types):
     """
     Returns a combined family matrix for the specified trigger types.
     trigger_types: list of strings, e.g. ['presubmit', 'postsubmit', 'nightly']
     """
-    # Load in test runners from ROCm organization variable "ROCM_THEROCK_TEST_RUNNERS"
-    load_test_runners_from_var = str2bool(
-        os.getenv("LOAD_TEST_RUNNERS_FROM_VAR", "true")
-    )
-    if load_test_runners_from_var:
-        load_test_runner_from_gh_variables()
     result = {}
     matrix_map = {
         "presubmit": amdgpu_family_info_matrix_presubmit,

build_tools/github_actions/configure_ci.py

@@ -18,8 +18,6 @@
   * WINDOWS_USE_PREBUILT_ARTIFACTS (optional): If enabled, CI will only run Windows tests
   * BRANCH_NAME (optional): The branch name
   * BUILD_VARIANT (optional): The build variant to run (ex: release, asan, tsan)
-  * ROCM_THEROCK_TEST_RUNNERS (optional): Test runner JSON object, coming from ROCm organization
-  * LOAD_TEST_RUNNERS_FROM_VAR (optional): boolean env variable that loads in ROCm org data if enabled
 
   Environment variables (for pull requests):
   * PR_LABELS (optional) : JSON list of PR label names.

build_tools/github_actions/configure_target_run.py

@@ -4,8 +4,6 @@
     * 'TARGET': A GPU family like 'gfx95X-dcgpu' or 'gfx1151', corresponding
                 to a release index.
     * 'PLATFORM': "linux" or "windows"
-    * ROCM_THEROCK_TEST_RUNNERS (optional): Test runner JSON object, coming from ROCm organization
-    * LOAD_TEST_RUNNERS_FROM_VAR (optional): boolean env variable that loads in ROCm org data if enabled
 """
 
 import os

build_tools/github_actions/fetch_package_targets.py

@@ -4,8 +4,6 @@
     * 'AMDGPU_FAMILIES': A comma separated list of AMD GPU families, e.g.
                     `gfx94X,gfx103x`, or empty for the default list
     * 'THEROCK_PACKAGE_PLATFORM': "linux" or "windows"
-    * ROCM_THEROCK_TEST_RUNNERS (optional): Test runner JSON object, coming from ROCm organization
-    * LOAD_TEST_RUNNERS_FROM_VAR (optional): boolean env variable that loads in ROCm org data if enabled
 
 Outputs written to GITHUB_OUTPUT:
     * 'package_targets': JSON list of the form

build_tools/github_actions/tests/configure_ci_test.py

@@ -9,15 +9,6 @@
 import configure_ci
 from benchmarks.benchmark_test_matrix import benchmark_matrix
 
-therock_test_runner_dict = {
-    "gfx110x": {
-        "linux": "linux-gfx110X-gpu-rocm-test",
-        "windows": "windows-gfx110X-gpu-rocm-test",
-    },
-}
-
-os.environ["ROCM_THEROCK_TEST_RUNNERS"] = json.dumps(therock_test_runner_dict)
-
 
 class ConfigureCITest(unittest.TestCase):
     def assert_target_output_is_valid(self, target_output, allow_xfail):
@@ -765,12 +756,6 @@ def test_multi_arch_production_sanity_check_configuration(self):
             f"Experimental family {experimental_arch_name} should have sanity_check=True",
         )
 
-    def test_rocm_org_var_names(self):
-        os.environ["LOAD_TEST_RUNNERS_FROM_VAR"] = "false"
-        test_matrix = configure_ci.get_all_families_for_trigger_types(["presubmit"])
-        self.assertIn("linux-gfx110X-gpu-rocm-test", json.dumps(test_matrix))
-        self.assertIn("windows-gfx110X-gpu-rocm-test", json.dumps(test_matrix))
-
     # TODO(#3433): Remove sandbox logic once ASAN tests are passing and environment is no longer required
     def test_sandbox_test_runner_with_asan(self):
         base_args = {"build_variant": "asan"}