From 92b761acf235c0232984a68c12e853c5ba865fbd Mon Sep 17 00:00:00 2001 From: Stanley Tsang Date: Wed, 20 Nov 2024 16:43:44 -0700 Subject: [PATCH 1/2] Merge back 6.3 hotfixes (#588) * Remove website URL from comments (#542) Referencing or using code from some websites is prohibited in this repository. This change removes an informational reference in the comments. * Add gfx1151 target (#543) (#546) Co-authored-by: Stanley Tsang Co-authored-by: Eiden Yoshida * Move data type support file along with index and ToC changes (#548) (#549) * Convert change log to new format (#564) * Fixed memory leaks in rocrand_tests (#557) * added hipFree to test_rocrand_cpp_basic * fixed memory leak for test_rocrand_config_dispatch * fixed a memory leak in test_utils * changed createGraph to createAndLaunchGraph, as well as fixed stream capture order * changed default boolean (kaunchGraph, sync) to be true in createAndLaunchGraph * added back missing end stream capture * reformated curlys for consistency * removed createAndLaunchGraph inside resetGraphHelper * Update changelog release headers (#568) (#575) * Update changelog release headers * Small correction (cherry picked from commit c7da2022d82ae552f61cb4405af5389a0b50033c) * Add readme and metadata info and clarify CUDA references (#567) (#576) (cherry picked from commit 81d9e5877add1479648282e2f3bb478e86b80f7a) * added gfx12 and gfx1151 to default gpu list * updated changelog * Update CHANGELOG.md Co-authored-by: Jeffrey Novotny * Update CHANGELOG.md Co-authored-by: Jeffrey Novotny * Remove gfx940,gfx941 targets (#580) * Remove unreleased --------- Co-authored-by: Wayne Franz Co-authored-by: amd-garydeng Co-authored-by: Eiden Yoshida Co-authored-by: Jeffrey Novotny Co-authored-by: Di Nguyen Co-authored-by: Val Movsik <160653499+vamovsik@users.noreply.github.com> --- CHANGELOG.md | 9 +++++---- CMakeLists.txt | 2 +- rmake.py | 7 +++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94ead2369..3b08796f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ Documentation for rocRAND is available at [https://rocm.docs.amd.com/projects/rocRAND/en/latest/](https://rocm.docs.amd.com/projects/rocRAND/en/latest/) -## (Unreleased) rocRAND 3.3.0 for ROCm 6.4 +## rocRAND 3.3.0 for ROCm 6.4 ### Added @@ -29,14 +29,15 @@ Documentation for rocRAND is available at ### Changed +* Updated the default value for the `-a` argument from `rmake.py` to `gfx906:xnack-,gfx1030,gfx1100,gfx1101,gfx1102,gfx1151,gfx1200,gfx1201`. * `rocrand_discrete` for MTGP32, LFSR113 and ThreeFry generators now uses the alias method, which is faster than binary search in CDF. ## rocRAND 3.1.1 for ROCm 6.2.4 ## Fixes -* Fixed " unknown extension ?>" issue in scripts/config-tuning/select_best_config.py - when using python version thats older than 3.11 +* Fixed an issue in `rmake.py` where the list storing cmake options would contain individual characters instead of a full string of options. +* Fixed " unknown extension ?>" issue in scripts/config-tuning/select_best_config.py when using python version thats older than 3.11 * Fixed low random sequence quality of `ROCRAND_RNG_PSEUDO_THREEFRY2_64_20` and `ROCRAND_RNG_PSEUDO_THREEFRY4_64_20`. ## rocRAND 3.1.0 for ROCm 6.2.0 @@ -113,7 +114,7 @@ Documentation for rocRAND is available at ### Known issues - SOBOL64 and SCRAMBLED_SOBOL64 generate poisson-distributed `unsigned long long int` numbers instead of `unsigned int`. This will be fixed in the next major release. -## (Unreleased) rocRAND-3.0.0 for ROCm 6.0.0 +## rocRAND-3.0.0 for ROCm 6.0.0 ### Additions diff --git a/CMakeLists.txt b/CMakeLists.txt index b667a43ba..ef8102fd1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,7 @@ if(GPU_TARGETS STREQUAL "all") if(BUILD_ADDRESS_SANITIZER) # ASAN builds require xnack rocm_check_target_ids(DEFAULT_AMDGPU_TARGETS - TARGETS "gfx908:xnack+;gfx90a:xnack+;gfx940:xnack+;gfx941:xnack+;gfx942:xnack+" + TARGETS "gfx908:xnack+;gfx90a:xnack+;gfx942:xnack+" ) else() rocm_check_target_ids(DEFAULT_AMDGPU_TARGETS diff --git a/rmake.py b/rmake.py index 6b7dccae9..99d74ec34 100644 --- a/rmake.py +++ b/rmake.py @@ -20,6 +20,9 @@ def parse_args(): parser = argparse.ArgumentParser(description=""" Checks build arguments """) + + default_gpus = 'gfx906:xnack-,gfx1030,gfx1100,gfx1101,gfx1102,gfx1151,gfx1200,gfx1201' + parser.add_argument('-g', '--debug', required=False, default=False, action='store_true', help='Generate Debug build (default: False)') parser.add_argument( '--build_dir', type=str, required=False, default="build", @@ -37,7 +40,7 @@ def parse_args(): help='Install after build (default: False)') parser.add_argument( '--cmake-darg', required=False, dest='cmake_dargs', action='append', default=[], help='List of additional cmake defines for builds (e.g. CMAKE_CXX_COMPILER_LAUNCHER=ccache)') - parser.add_argument('-a', '--architecture', dest='gpu_architecture', required=False, default="gfx906;gfx1030;gfx1100;gfx1101;gfx1102", #:sramecc+:xnack-" ) #gfx1030" ) #gfx906" ) # gfx1030" ) + parser.add_argument('-a', '--architecture', dest='gpu_architecture', required=False, default=default_gpus, #:sramecc+:xnack-" ) #gfx1030" ) #gfx906" ) # gfx1030" ) help='Set GPU architectures, e.g. all, gfx000, gfx803, gfx906:xnack-;gfx1030;gfx1100 (optional, default: all)') parser.add_argument('-v', '--verbose', required=False, default=False, action='store_true', help='Verbose build (default: False)') @@ -111,7 +114,7 @@ def config_cmd(): else: cmake_executable = "cmake" toolchain = "toolchain-linux.cmake" - cmake_platform_opts = f"-DROCM_DIR:PATH={rocm_path} -DCPACK_PACKAGING_INSTALL_PREFIX={rocm_path}" + cmake_platform_opts = [f"-DROCM_DIR:PATH={rocm_path}", f"-DCPACK_PACKAGING_INSTALL_PREFIX={rocm_path}"] tools = f"-DCMAKE_TOOLCHAIN_FILE={toolchain}" cmake_options.append( tools ) From 6b8917f1f13c3a8e5b8bc08148ceb8efcb12ad74 Mon Sep 17 00:00:00 2001 From: Nguyen Date: Thu, 21 Nov 2024 14:14:22 -0700 Subject: [PATCH 2/2] removed part of code where the CXX_COMPILER was forced changed to g++ or cl if it was not gnu --- cmake/Dependencies.cmake | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 09b7286ad..23aa41088 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -94,14 +94,6 @@ if(BUILD_BENCHMARK) message(FATAL_ERROR "DownloadProject.cmake doesn't support multi-configuration generators.") endif() set(GOOGLEBENCHMARK_ROOT ${CMAKE_CURRENT_BINARY_DIR}/deps/googlebenchmark CACHE PATH "") - if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")) - # hip-clang cannot compile googlebenchmark for some reason - if(WIN32) - set(COMPILER_OVERRIDE "-DCMAKE_CXX_COMPILER=cl") - else() - set(COMPILER_OVERRIDE "-DCMAKE_CXX_COMPILER=g++") - endif() - endif() download_project( PROJ googlebenchmark