[0.6.0-UT] Transferring Multi-GPU tests

build/rocm/multi_gpu_tests_config.py

@@ -0,0 +1,81 @@
+#!/usr/bin/env python3
+# Copyright 2025 The JAX Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""
+Configuration file containing the list of multi-GPU test files.
+This list is shared between run_single_gpu.py and run_multi_gpu.sh
+to ensure consistency and avoid duplication.
+"""
+
+# Multi-GPU test files that should be excluded from single GPU runs
+# but included in multi-GPU test runs
+MULTI_GPU_TESTS = {
+    "tests/multiprocess_gpu_test.py",
+    "tests/debug_info_test.py",
+    "tests/checkify_test.py",
+    "tests/mosaic/gpu_test.py",
+    "tests/random_test.py",
+    "tests/jax_jit_test.py",
+    "tests/mesh_utils_test.py",
+    "tests/pjit_test.py",
+    "tests/linalg_sharding_test.py",
+    "tests/multi_device_test.py",
+    "tests/distributed_test.py",
+    "tests/shard_alike_test.py",
+    "tests/api_test.py",
+    "tests/ragged_collective_test.py",
+    "tests/batching_test.py",
+    "tests/scaled_matmul_stablehlo_test.py",
+    "tests/export_harnesses_multi_platform_test.py",
+    "tests/pickle_test.py",
+    "tests/roofline_test.py",
+    "tests/profiler_test.py",
+    "tests/error_check_test.py",
+    "tests/debug_nans_test.py",
+    "tests/shard_map_test.py",
+    "tests/colocated_python_test.py",
+    "tests/cudnn_fusion_test.py",
+    "tests/compilation_cache_test.py",
+    "tests/export_back_compat_test.py",
+    "tests/pgle_test.py",
+    "tests/ffi_test.py",
+    "tests/lax_control_flow_test.py",
+    "tests/fused_attention_stablehlo_test.py",
+    "tests/layout_test.py",
+    "tests/pmap_test.py",
+    "tests/aot_test.py",
+    "tests/mock_gpu_topology_test.py",
+    "tests/ann_test.py",
+    "tests/debugging_primitives_test.py",
+    "tests/array_test.py",
+    "tests/export_test.py",
+    "tests/memories_test.py",
+    "tests/debugger_test.py",
+    "tests/python_callback_test.py",
+}
+
+if __name__ == "__main__":
+    import sys
+
+    if len(sys.argv) > 1 and sys.argv[1] == "--list":
+        # Print all multi-GPU tests, one per line (for bash scripts)
+        for test in MULTI_GPU_TESTS:
+            print(test)
+    else:
+        print("Multi-GPU tests configuration")
+        print(f"Total tests: {len(MULTI_GPU_TESTS)}")
+        print("\nTo get the list for bash scripts, run:")
+        print("python3 multi_gpu_tests_config.py --list")
+

build/rocm/run_multi_gpu.sh

@@ -28,9 +28,9 @@ detect_amd_gpus() {
         echo "Error: lspci command not found. Aborting."
         exit 1
     fi
-    # Count AMD/ATI GPU controllers.
+    # Count AMD GPUs.
     local count
-    count=$(lspci | grep -c 'controller.*AMD/ATI')
+    count=$(rocm-smi | grep -E '^Device' -A 1000 | awk '$1 ~ /^[0-9]+$/ {count++} END {print count}')
     echo "$count"
 }
 
@@ -52,19 +52,39 @@ run_tests() {
     # Create the log directory if it doesn't exist.
     mkdir -p "$LOG_DIR"
 
-    python3 -m pytest \
-        --html="${LOG_DIR}/multi_gpu_pmap_test_log.html" \
-        --json-report \
-        --json-report-file="${LOG_DIR}/multi_gpu_pmap_test_log.json" \
-        --reruns 3 \
-        tests/pmap_test.py
-
-    python3 -m pytest \
-        --html="${LOG_DIR}/multi_gpu_multi_device_test_log.html" \
-        --json-report \
-        --json-report-file="${LOG_DIR}/multi_gpu_multi_device_test_log.json" \
-        --reruns 3 \
-        tests/multi_device_test.py
+    # Multi-GPU test files - load from shared configuration
+    echo "Loading multi-GPU tests from configuration..."
+
+    # Set the path to the configuration file
+    CONFIG_PATH="build/rocm/multi_gpu_tests_config.py"
+
+    # Check if python3 and the config file are available
+    if ! python3 -c "import sys; sys.path.insert(0, 'build/rocm'); import multi_gpu_tests_config" 2>/dev/null; then
+        echo "Error: multi_gpu_tests_config.py not found in build/rocm/ or not importable. Aborting."
+        exit 1
+    fi
+
+    # Load the multi-GPU tests from the configuration file
+    mapfile -t MULTI_GPU_TESTS < <(python3 "$CONFIG_PATH" --list)
+
+    # Run each multi-GPU test
+    for test_file in "${MULTI_GPU_TESTS[@]}"; do
+        test_name=$(basename "$test_file" .py)
+        echo "Running multi-GPU test: $test_file"
+
+        # Define file paths for abort detection (files created by conftest.py)
+        json_log_file="${LOG_DIR}/multi_gpu_${test_name}_log.json"
+        html_log_file="${LOG_DIR}/multi_gpu_${test_name}_log.html"
+
+        # Run the test
+        python3 -m pytest \
+            --html="$html_log_file" \
+            --json-report \
+            --json-report-file="$json_log_file" \
+            --reruns 3 \
+            "$test_file"
+
+    done
 
     # Merge individual HTML reports into one.
     python3 -m pytest_html_merger \