Fix misc

Signed-off-by: zichguan-amd <zichuan.guan@amd.com>

Author: zichguan-amd

.github/build_tools/configure_ci.py

@@ -6,21 +6,20 @@
 # GPU target to TheRock family mapping
 GPU_CONFIG_MAP = {
     "gfx1100": "gfx110X-all",
-    "gfx90a": "gfx90X-dcgpu",
-    "gfx942": "gfx94X-dcgpu",
+    "gfx1151": "gfx1151",
+    # "gfx1201": "gfx120X-all",
+    # "gfx90a": "gfx90X-dcgpu",
+    # "gfx942": "gfx94X-dcgpu",
 }
 
 # Default configurations for automated runs (push/PR)
-ALLOWED_INSTALL_METHODS = ["wheel", "tarball"]
-
+INSTALL_METHODS = ["wheel", "tarball"]
 
 def main():
     # Read inputs from environment (set by workflow)
     gpu_input = os.getenv("GPU_CONFIG", "")
     install_input = os.getenv("INSTALL_METHOD", "")
 
-
-
     # Determine GPU configurations
     if gpu_input:
         if gpu_input not in GPU_CONFIG_MAP:
@@ -32,12 +31,12 @@ def main():
 
     # Determine install methods
     if install_input:
-        if install_input not in ALLOWED_INSTALL_METHODS:
-            raise ValueError(f"Invalid install method: {install_input}. Allowed: {ALLOWED_INSTALL_METHODS}")
+        if install_input not in INSTALL_METHODS:
+            raise ValueError(f"Invalid install method: {install_input}. Allowed: {INSTALL_METHODS}")
         install_methods = [install_input]
     else:
         # Automated run: use all allowed methods
-        install_methods = ALLOWED_INSTALL_METHODS
+        install_methods = INSTALL_METHODS
 
     # Build gpu_config array with both gpu_target and therock_family
     gpu_configs = []
@@ -54,12 +53,9 @@ def main():
         with open(github_output, "a") as f:
             f.write(f"gpu_configs={json.dumps(gpu_configs)}\n")
             f.write(f"install_methods={json.dumps(install_methods)}\n")
-        print(f"Wrote outputs to {github_output}")
-    else:
-        # Local testing
-        print(f"gpu_configs={json.dumps(gpu_configs)}")
-        print(f"install_methods={json.dumps(install_methods)}")
 
+    print(f"gpu_configs={json.dumps(gpu_configs)}")
+    print(f"install_methods={json.dumps(install_methods)}")
 
 if __name__ == "__main__":
     main()  

.github/workflows/build_docker.yml

@@ -1,16 +1,17 @@
 name: Build Docker
 
 on:
+  workflow_dispatch:
   push:
-    branches: [ amd-staging, amd-mainline, release/** ]
+    branches: [ amd-staging ]
     paths:
       - 'Dockerfiles/**'
-      - '.github/workflows/**'
+      - '.github/workflows/build_docker.yml'
   pull_request:
     branches: [ amd-staging, amd-mainline, release/** ]
     paths:
       - 'Dockerfiles/**'
-      - '.github/workflows/**'
+      - '.github/workflows/build_docker.yml'
 
 permissions:
   contents: read
@@ -25,53 +26,49 @@ env:
   IMAGE_PREFIX: ${{ github.repository }}
 
 jobs:  
-    find-dockerfiles:  
+    find-dockerfiles:
       name: Find Dockerfiles
       runs-on: ubuntu-latest
-      outputs:  
+      outputs:
         files: ${{ steps.find-files.outputs.files }}  
-      steps:  
-        - name: Checkout repository  
-          uses: actions/checkout@v4  
-        - name: Find Dockerfiles  
-          id: find-files  
-          run: |  
-            echo "## Finding all Dockerfiles in the 'Dockerfiles/' directory"  
-            FILES=$(find Dockerfiles/ -type f -printf "%f\n" | grep .*Dockerfile)  
-            echo "Found Dockerfiles:"  
-            echo "$FILES"  
-            # Convert the array to JSON array  
-            JSON_ARRAY=$(printf '%s\n' "${FILES[@]}" | jq -R . | jq -s . | jq -c .)  
+      steps:
+        - name: Checkout repository
+          uses: actions/checkout@v4
+        - name: Find Dockerfiles
+          id: find-files
+          run: |
+            echo "## Finding all Dockerfiles in the 'Dockerfiles/' directory"
+            FILES=$(find Dockerfiles/ -type f -printf "%f\n" | grep .*Dockerfile)
+            echo "Found Dockerfiles:"
+            echo "${FILES}"
+            # Convert the array to JSON array
+            JSON_ARRAY=$(printf '%s\n' "${FILES[@]}" | jq -R . | jq -s . | jq -c .)
             echo "JSON_ARRAY is"
-            echo $JSON_ARRAY
-            echo "files=$JSON_ARRAY"  >> $GITHUB_OUTPUT 
-
-        # Clean the workspace here since other jobs may not have the permissions to do so later
-        # (needed for self-hosted runners)
-        - name: Clean the workspace
-          run: find $GITHUB_WORKSPACE -mindepth 1 -delete
+            echo "${JSON_ARRAY}"
+            echo "files=${JSON_ARRAY}"  >> $GITHUB_OUTPUT
 
     build:  
       name: Build Docker Images
-      runs-on: self-hosted  
+      runs-on: ubuntu-latest
       needs: find-dockerfiles
       strategy:
+        fail-fast: false
         matrix: 
           file: ${{fromJson(needs.find-dockerfiles.outputs.files)}}
       steps:
-        - name: Checkout repository  
-          uses: actions/checkout@v4  
+        - name: Checkout repository
+          uses: actions/checkout@v4
 
-        - name: Set up Docker Buildx  
-          uses: docker/setup-buildx-action@v3  
+        - name: Set up Docker Buildx
+          uses: docker/setup-buildx-action@v3
 
         - name: Generate image tag
           id: image-tag
           run: |
-            # Extract image name from Dockerfile name (e.g., "ubuntu-22.04-rocm.Dockerfile" -> "ubuntu-22.04-rocm")
+            # Extract image name from Dockerfile name (e.g., "ubuntu-22.04.Dockerfile" -> "ubuntu-22.04")
             IMAGE_NAME=$(echo "${{ matrix.file }}" | sed 's/\.Dockerfile$//' | tr '[:upper:]' '[:lower:]')
-            echo "name=$IMAGE_NAME" >> $GITHUB_OUTPUT
-            echo "Image name: $IMAGE_NAME"
+            echo "name=${IMAGE_NAME}" >> $GITHUB_OUTPUT
+            echo "Image name: ${IMAGE_NAME}"
 
         - name: Log in to GHCR
           if: github.event_name == 'push'
@@ -81,18 +78,19 @@ jobs:
             username: ${{ github.actor }}
             password: ${{ secrets.GITHUB_TOKEN }}
 
+        - name: Extract metadata (tags, labels) for Docker
+          id: meta
+          uses: docker/metadata-action@v5
+          with:
+            images: ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}-${{ steps.image-tag.outputs.name }}
+            tags: |
+              type=raw,value=latest,enable={{is_default_branch}}
+
         - name: Build and push Docker image for ${{ matrix.file }}
           uses: docker/build-push-action@v5
-          with:  
+          with:
             context: Dockerfiles/ 
             file: Dockerfiles/${{ matrix.file }}
             push: ${{ github.event_name == 'push' }}
-            tags: |
-              ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}:${{ steps.image-tag.outputs.name }}
-              ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}:${{ steps.image-tag.outputs.name }}-${{ github.sha }}
-
-        # Clean the workspace here since other jobs may not have the permissions to do so later
-        # (needed for self-hosted runners)
-        - name: Clean the workspace
-          if: always()
-          run: find "$GITHUB_WORKSPACE" -mindepth 1 -delete  
+            tags: ${{ steps.meta.outputs.tags }}
+            labels: ${{ steps.meta.outputs.labels }}

.github/workflows/ci_nightly.yml

@@ -17,6 +17,10 @@ on:
         type: choice
         options: 
         - gfx1100
+        - gfx1151
+        - gfx1201
+        - gfx90a
+        - gfx942
       install_method:
         description: "Installation method"
         required: true

.github/workflows/ci_therock.yml

@@ -38,6 +38,10 @@ on:
         type: choice
         options: 
         - gfx1100
+        - gfx1151
+        - gfx1201
+        - gfx90a
+        - gfx942
       install_method:
         description: "Installation method"
         required: true

Common/FilterHIPArchitectures.cmake

@@ -60,7 +60,7 @@ function(filter_hip_architectures EXAMPLE_NAME SUPPORTED_ARCHS SHOULD_SKIP_VAR)
     endif()
 
     if(NOT FILTERED_HIP_ARCHITECTURES)
-        message(STATUS "${EXAMPLE_NAME}: No supported architectures found. Not building ${EXAMPLE_NAME}")
+        message(WARNING "${EXAMPLE_NAME}: No supported architectures found. Not building ${EXAMPLE_NAME}")
         set(${SHOULD_SKIP_VAR} TRUE PARENT_SCOPE)
     else()
         # Override CMAKE_HIP_ARCHITECTURES for this directory scope

Dockerfiles/README.md

@@ -28,3 +28,12 @@ Dockerfile: [hip-libraries-cuda-ubuntu.Dockerfile](hip-libraries-cuda-ubuntu.Doc
 This is environment is based on Ubuntu targeting the CUDA platform. It has the
 HIP runtime and the ROCm libraries installed. CMake is also installed in the image.
 It can be used with the samples that support the CUDA target.
+
+### CI base images
+
+Lightweight base images for CI workflows based on various supported Linux distributions. The images include a Python virtual environment and complete system dependencies to build rocm-examples from source, but they **do not include  any ROCm installation**.
+
+Dockerfiles:
+
+- [ubuntu-22.04.Dockerfile](ubuntu-22.04.Dockerfile)
+- [sles-15.7.Dockerfile](sles-15.7.Dockerfile)

Dockerfiles/sles-15.7-rocm.Dockerfile Dockerfiles/sles-15.7.DockerfileDockerfiles/sles-15.7-rocm.Dockerfile renamed to Dockerfiles/sles-15.7.Dockerfile

@@ -61,7 +61,7 @@ ENV HIP_PLATFORM=amd
 # Create virtual environment with base packages
 RUN python3.13 -m venv /opt/venv && \
     /opt/venv/bin/pip install --upgrade pip && \
-    /opt/venv/bin/pip install pyyaml cmake
+    /opt/venv/bin/pip install pyyaml
 
 # Set up virtual environment in PATH
 ENV PATH="/opt/venv/bin:${PATH}"