From 7d854fd895e50f32cfaf59e1f7fc44ddf10a8492 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Thu, 16 Oct 2025 10:45:12 -0700 Subject: [PATCH 1/3] find rocm version --- aten/src/ATen/CMakeLists.txt | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/aten/src/ATen/CMakeLists.txt b/aten/src/ATen/CMakeLists.txt index 6c095680733f..694c8e37c841 100644 --- a/aten/src/ATen/CMakeLists.txt +++ b/aten/src/ATen/CMakeLists.txt @@ -1,6 +1,22 @@ cmake_minimum_required(VERSION 3.27 FATAL_ERROR) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) +set(_rocm_ver "") +if(DEFINED ROCM_VERSION AND ROCM_VERSION) + set(_rocm_ver "${ROCM_VERSION}") +elseif(DEFINED HIP_VERSION AND HIP_VERSION) + set(_rocm_ver "${HIP_VERSION}") +else() + # Fall back to hipconfig --version + find_program(HIPCONFIG_EXECUTABLE hipconfig HINTS ENV ROCM_PATH /opt/rocm/bin) + if(HIPCONFIG_EXECUTABLE) + execute_process( + COMMAND ${HIPCONFIG_EXECUTABLE} --version + OUTPUT_VARIABLE _rocm_ver + OUTPUT_STRIP_TRAILING_WHITESPACE) + endif() +endif() + if(NOT MSVC) string(APPEND CMAKE_CXX_FLAGS " -Wno-ignored-qualifiers") string(APPEND CMAKE_C_FLAGS " -Wno-ignored-qualifiers") @@ -301,13 +317,16 @@ IF(USE_FBGEMM_GENAI) # Add additional HIPCC compiler flags for performance set(FBGEMM_GENAI_EXTRA_HIPCC_FLAGS - -mllvm - -amdgpu-coerce-illegal-types=1 -mllvm -enable-post-misched=0 -mllvm -greedy-reverse-local-assignment=1 -fhip-new-launch-api) + if(_rocm_ver AND _rocm_ver VERSION_LESS "7.2.0") + list(PREPEND FBGEMM_GENAI_EXTRA_HIPCC_FLAGS + -mllvm + -amdgpu-coerce-illegal-types=1) + endif() hip_add_library( fbgemm_genai STATIC From c48a2408088fb96d9f97813f458c8a9141320fb6 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Thu, 16 Oct 2025 11:40:06 -0700 Subject: [PATCH 2/3] Update CMakeLists.txt --- aten/src/ATen/CMakeLists.txt | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/aten/src/ATen/CMakeLists.txt b/aten/src/ATen/CMakeLists.txt index 694c8e37c841..6c095680733f 100644 --- a/aten/src/ATen/CMakeLists.txt +++ b/aten/src/ATen/CMakeLists.txt @@ -1,22 +1,6 @@ cmake_minimum_required(VERSION 3.27 FATAL_ERROR) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) -set(_rocm_ver "") -if(DEFINED ROCM_VERSION AND ROCM_VERSION) - set(_rocm_ver "${ROCM_VERSION}") -elseif(DEFINED HIP_VERSION AND HIP_VERSION) - set(_rocm_ver "${HIP_VERSION}") -else() - # Fall back to hipconfig --version - find_program(HIPCONFIG_EXECUTABLE hipconfig HINTS ENV ROCM_PATH /opt/rocm/bin) - if(HIPCONFIG_EXECUTABLE) - execute_process( - COMMAND ${HIPCONFIG_EXECUTABLE} --version - OUTPUT_VARIABLE _rocm_ver - OUTPUT_STRIP_TRAILING_WHITESPACE) - endif() -endif() - if(NOT MSVC) string(APPEND CMAKE_CXX_FLAGS " -Wno-ignored-qualifiers") string(APPEND CMAKE_C_FLAGS " -Wno-ignored-qualifiers") @@ -317,16 +301,13 @@ IF(USE_FBGEMM_GENAI) # Add additional HIPCC compiler flags for performance set(FBGEMM_GENAI_EXTRA_HIPCC_FLAGS + -mllvm + -amdgpu-coerce-illegal-types=1 -mllvm -enable-post-misched=0 -mllvm -greedy-reverse-local-assignment=1 -fhip-new-launch-api) - if(_rocm_ver AND _rocm_ver VERSION_LESS "7.2.0") - list(PREPEND FBGEMM_GENAI_EXTRA_HIPCC_FLAGS - -mllvm - -amdgpu-coerce-illegal-types=1) - endif() hip_add_library( fbgemm_genai STATIC From c20dcdf4ef96ee638d8cd7a7a6ebac9102263a7f Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Thu, 16 Oct 2025 11:43:37 -0700 Subject: [PATCH 3/3] Update CMakeLists.txt --- aten/src/ATen/CMakeLists.txt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/aten/src/ATen/CMakeLists.txt b/aten/src/ATen/CMakeLists.txt index 6c095680733f..38b383c2bb31 100644 --- a/aten/src/ATen/CMakeLists.txt +++ b/aten/src/ATen/CMakeLists.txt @@ -1,5 +1,15 @@ cmake_minimum_required(VERSION 3.27 FATAL_ERROR) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/public") +if(USE_ROCM) + include(LoadHIP OPTIONAL RESULT_VARIABLE _had_loadhip) + if(_had_loadhip) + # Exposed by LoadHIP.cmake, e.g. "7.1.2" or "7.2.0" + message(STATUS "LoadHIP loaded: ROCM_VERSION_DEV='${ROCM_VERSION_DEV}'") + else() + message(WARNING "LoadHIP.cmake not found; ROCM_VERSION_DEV unavailable") + endif() +endif() if(NOT MSVC) string(APPEND CMAKE_CXX_FLAGS " -Wno-ignored-qualifiers") @@ -301,13 +311,14 @@ IF(USE_FBGEMM_GENAI) # Add additional HIPCC compiler flags for performance set(FBGEMM_GENAI_EXTRA_HIPCC_FLAGS - -mllvm - -amdgpu-coerce-illegal-types=1 -mllvm -enable-post-misched=0 -mllvm -greedy-reverse-local-assignment=1 -fhip-new-launch-api) + if(DEFINED ROCM_VERSION_DEV AND ROCM_VERSION_DEV VERSION_LESS "7.2.0") + list(PREPEND FBGEMM_GENAI_EXTRA_HIPCC_FLAGS -mllvm -amdgpu-coerce-illegal-types=1) + endif() hip_add_library( fbgemm_genai STATIC