From c5d6147f209ec845017078f7859ee80ec827bb6a Mon Sep 17 00:00:00 2001 From: Lauren Wrubleski Date: Thu, 24 Oct 2024 15:06:46 -0600 Subject: [PATCH 1/4] Add deprecation message to ROCMConfig --- share/rocm/cmake/ROCMConfig.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/rocm/cmake/ROCMConfig.cmake b/share/rocm/cmake/ROCMConfig.cmake index a0d12947..8f09d5c9 100644 --- a/share/rocm/cmake/ROCMConfig.cmake +++ b/share/rocm/cmake/ROCMConfig.cmake @@ -9,6 +9,9 @@ get_filename_component(_new_rocmcmakebuildtools_path_linux "${_new_rocmcmakebuil include(CMakeFindDependencyMacro) +message(DEPRECATION + "Use of find_package(ROCM) is deprecated as of ROCm 6.4. Please use find_package(ROCmCMakeBuildTools)") + find_dependency( ROCmCMakeBuildTools HINTS From ba7fbae7f3823a9b65cc78bc347cddfb80154172 Mon Sep 17 00:00:00 2001 From: Lauren Wrubleski Date: Thu, 21 Nov 2024 13:06:58 -0700 Subject: [PATCH 2/4] Remove trailing whitespace --- share/rocm/cmake/ROCMConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/rocm/cmake/ROCMConfig.cmake b/share/rocm/cmake/ROCMConfig.cmake index 8f09d5c9..99898c7a 100644 --- a/share/rocm/cmake/ROCMConfig.cmake +++ b/share/rocm/cmake/ROCMConfig.cmake @@ -9,7 +9,7 @@ get_filename_component(_new_rocmcmakebuildtools_path_linux "${_new_rocmcmakebuil include(CMakeFindDependencyMacro) -message(DEPRECATION +message(DEPRECATION "Use of find_package(ROCM) is deprecated as of ROCm 6.4. Please use find_package(ROCmCMakeBuildTools)") find_dependency( From 87c9dc96ce4ae1ca00b5ca430a69e5bdafacdc14 Mon Sep 17 00:00:00 2001 From: Lauren Wrubleski Date: Thu, 21 Nov 2024 13:21:54 -0700 Subject: [PATCH 3/4] Fix tests to ensure find_package(ROCM) emits a deprecation warning --- test/fail/rename-compatibility.cmake | 9 +++++++++ test/pass/rename-compatibility.cmake | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 test/fail/rename-compatibility.cmake diff --git a/test/fail/rename-compatibility.cmake b/test/fail/rename-compatibility.cmake new file mode 100644 index 00000000..57cea2ef --- /dev/null +++ b/test/fail/rename-compatibility.cmake @@ -0,0 +1,9 @@ +# ###################################################################################################################### +# Copyright (C) 2023 Advanced Micro Devices, Inc. +# ###################################################################################################################### + +install_dir(${TEST_DIR}/libsimplecompat TARGETS package) +test_check_package( + NAME simple + HEADER simple.h + TARGET simple) diff --git a/test/pass/rename-compatibility.cmake b/test/pass/rename-compatibility.cmake index 57cea2ef..75239915 100644 --- a/test/pass/rename-compatibility.cmake +++ b/test/pass/rename-compatibility.cmake @@ -2,7 +2,7 @@ # Copyright (C) 2023 Advanced Micro Devices, Inc. # ###################################################################################################################### -install_dir(${TEST_DIR}/libsimplecompat TARGETS package) +install_dir(${TEST_DIR}/libsimplecompat TARGETS package CMAKE_ARGS -Wno-deprecated) test_check_package( NAME simple HEADER simple.h From 948a41a79d704cdbe73a64dfb9eebf481e200347 Mon Sep 17 00:00:00 2001 From: Lauren Wrubleski Date: Thu, 21 Nov 2024 15:23:40 -0700 Subject: [PATCH 4/4] Update copyright dates --- share/rocm/cmake/ROCMConfig.cmake | 2 +- test/fail/rename-compatibility.cmake | 2 +- test/pass/rename-compatibility.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/rocm/cmake/ROCMConfig.cmake b/share/rocm/cmake/ROCMConfig.cmake index 99898c7a..3ccd5018 100644 --- a/share/rocm/cmake/ROCMConfig.cmake +++ b/share/rocm/cmake/ROCMConfig.cmake @@ -1,5 +1,5 @@ # ###################################################################################################################### -# Copyright (C) 2023 Advanced Micro Devices, Inc. +# Copyright (C) 2024 Advanced Micro Devices, Inc. # ###################################################################################################################### get_filename_component(_new_rocmcmakebuildtools_path "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) diff --git a/test/fail/rename-compatibility.cmake b/test/fail/rename-compatibility.cmake index 57cea2ef..4aaedb20 100644 --- a/test/fail/rename-compatibility.cmake +++ b/test/fail/rename-compatibility.cmake @@ -1,5 +1,5 @@ # ###################################################################################################################### -# Copyright (C) 2023 Advanced Micro Devices, Inc. +# Copyright (C) 2024 Advanced Micro Devices, Inc. # ###################################################################################################################### install_dir(${TEST_DIR}/libsimplecompat TARGETS package) diff --git a/test/pass/rename-compatibility.cmake b/test/pass/rename-compatibility.cmake index 75239915..eedf96ee 100644 --- a/test/pass/rename-compatibility.cmake +++ b/test/pass/rename-compatibility.cmake @@ -1,5 +1,5 @@ # ###################################################################################################################### -# Copyright (C) 2023 Advanced Micro Devices, Inc. +# Copyright (C) 2024 Advanced Micro Devices, Inc. # ###################################################################################################################### install_dir(${TEST_DIR}/libsimplecompat TARGETS package CMAKE_ARGS -Wno-deprecated)