From f59066d999df4311635a0b49f542a67c2e5609eb Mon Sep 17 00:00:00 2001 From: Istvan Kiss Date: Thu, 5 Dec 2024 13:19:39 +0100 Subject: [PATCH] Resolve merge conflict --- docs/how-to/debugging.rst | 8 -------- docs/how-to/debugging_env.rst | 17 ++++++++++++++++- docs/sphinx/_toc.yml.in | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/docs/how-to/debugging.rst b/docs/how-to/debugging.rst index 06413f6ae3..433d31de10 100644 --- a/docs/how-to/debugging.rst +++ b/docs/how-to/debugging.rst @@ -275,14 +275,6 @@ Here are some of the more commonly used environment variables: .. include:: ../how-to/debugging_env.rst - * - DEBUG_HIP_7_PREVIEW - |break| Enable preview of upcoming runtime changes that break backward compatibility. - These changes might require updating existing application code to support the new behavior. - The new behavior will become default in a future major release and this environment - variable will no longer be needed. - - 0 - - 0x1: Match the behavior of hipGetLastError with its corresponding CUDA API - General debugging tips ====================================================== diff --git a/docs/how-to/debugging_env.rst b/docs/how-to/debugging_env.rst index a9b9f9ec06..10b86a8adb 100644 --- a/docs/how-to/debugging_env.rst +++ b/docs/how-to/debugging_env.rst @@ -92,4 +92,19 @@ per device. If an application allocates more HIP streams than this number, then HIP runtime reuses the same hardware queues for the new streams in a round-robin manner. Note that this maximum number does not apply to hardware queues that are created for CU-masked HIP streams, or - cooperative queues for HIP Cooperative Groups (single queue per device). \ No newline at end of file + cooperative queues for HIP Cooperative Groups (single queue per device). + + * - | ``DEBUG_HIP_7_PREVIEW`` + | Enable preview of upcoming + | runtime changes that break + | backward compatibility. + | These changes might require + | updating existing application + | code to support the new + | behavior. The new behavior + | will become default in a + | future major release and this + | environment variable will + | no longer be needed. + - 0 + - 0x1: Match the behavior of hipGetLastError with its corresponding CUDA API \ No newline at end of file diff --git a/docs/sphinx/_toc.yml.in b/docs/sphinx/_toc.yml.in index 703b65969c..5d69918b99 100644 --- a/docs/sphinx/_toc.yml.in +++ b/docs/sphinx/_toc.yml.in @@ -15,9 +15,9 @@ subtrees: title: Installing HIP - file: install/build title: Building HIP from source - - url: https://rocm.docs.amd.com/projects/install-on-linux/en/${branch}/reference/system-requirements.html#supported-gpus + - url: https://rocm.docs.amd.com/projects/install-on-linux/en/${branch}/reference/system-requirements.html title: Linux supported AMD GPUs - - url: https://rocm.docs.amd.com/projects/install-on-windows/en/${branch}/reference/system-requirements.html#windows-supported-gpus + - url: https://rocm.docs.amd.com/projects/install-on-windows/en/${branch}/reference/system-requirements.html title: Windows supported AMD GPUs - url: https://developer.nvidia.com/cuda-gpus title: NVIDIA supported GPUs