Merge branch 'main' into gh/jeanschmidt/9/head

Author: jeanschmidt

tools/scripts/generate_binary_build_matrix.py

@@ -55,6 +55,8 @@
     "release": ["7.1", "7.2"],
 }
 
+GETTING_STARTED_ROCM_ARCH = "7.2"
+
 CUDA_CUDNN_VERSIONS = {
     "12.6": {"cuda": "12.6.3", "cudnn": "9"},
     "12.8": {"cuda": "12.8.0", "cudnn": "9"},
@@ -198,7 +200,11 @@ def initialize_globals(
         ]
     ROCM_ARCHES = ROCM_ARCHES_DICT[channel]
     if getting_started and channel == NIGHTLY:
-        ROCM_ARCHES = [max(ROCM_ARCHES, key=parse_version)]
+        ROCM_ARCHES = [
+            GETTING_STARTED_ROCM_ARCH
+            if GETTING_STARTED_ROCM_ARCH in ROCM_ARCHES
+            else max(ROCM_ARCHES, key=parse_version)
+        ]
     if build_python_only:
         # Only select the oldest version of python if building a python only package
         PYTHON_ARCHES = [PYTHON_ARCHES_DICT[channel][0]]

tools/tests/test_generate_binary_build_matrix.py

@@ -3,9 +3,11 @@
 import os
 import sys
 from unittest import main, TestCase
+from unittest.mock import patch
 
 from tools.scripts.generate_binary_build_matrix import (
     generate_build_matrix,
+    GETTING_STARTED_ROCM_ARCH,
     parse_version,
     ROCM_ARCHES_DICT,
 )
@@ -235,9 +237,13 @@ def test_parse_version_orders_double_digit_minors(self):
     def test_getting_started_nightly_ships_one_rocm(self):
         versions = self._rocm_versions("nightly", "true")
         self.assertEqual(len(versions), 1)
-        self.assertEqual(
-            versions, {max(ROCM_ARCHES_DICT["nightly"], key=parse_version)}
-        )
+        self.assertEqual(versions, {GETTING_STARTED_ROCM_ARCH})
+        self.assertIn(GETTING_STARTED_ROCM_ARCH, ROCM_ARCHES_DICT["nightly"])
+
+    def test_getting_started_falls_back_to_newest_rocm(self):
+        with patch.dict(ROCM_ARCHES_DICT, {"nightly": ["7.14", "8.0"]}, clear=False):
+            versions = self._rocm_versions("nightly", "true")
+        self.assertEqual(versions, {"8.0"})
 
     def test_nightly_builds_keep_every_rocm(self):
         versions = self._rocm_versions("nightly", "false")