Skip to content

Commit 6a6cf6e

Browse files
authored
Merge pull request #579 from NguyenNhuDi/zenguyen/rmake-support-6.3
[cherry pick 6.3] Include gfx12 and gfx1151 in default architecture list for rmake.py
2 parents 82a1c49 + 7823c44 commit 6a6cf6e

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ Documentation for rocRAND is available at
1515

1616
### Changed
1717

18+
* Updated the default value for the `-a` argument from `rmake.py` to `gfx906:xnack-,gfx1030,gfx1100,gfx1101,gfx1102,gfx1151,gfx1200,gfx1201`.
1819
* `rocrand_discrete` for MTGP32, LFSR113 and ThreeFry generators now uses the alias method, which is faster than binary search in CDF.
1920

2021
## rocRAND 3.1.1 for ROCm 6.2.4
2122

2223
## Fixes
23-
24+
* Fixed an issue in `rmake.py` where the list storing cmake options would contain individual characters instead of a full string of options.
2425
* Fixed " unknown extension ?>" issue in scripts/config-tuning/select_best_config.py
2526
when using python version thats older than 3.11
2627
* Fixed low random sequence quality of `ROCRAND_RNG_PSEUDO_THREEFRY2_64_20` and `ROCRAND_RNG_PSEUDO_THREEFRY4_64_20`.

rmake.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ def parse_args():
2020
parser = argparse.ArgumentParser(description="""
2121
Checks build arguments
2222
""")
23+
24+
default_gpus = 'gfx906:xnack-,gfx1030,gfx1100,gfx1101,gfx1102,gfx1151,gfx1200,gfx1201'
25+
2326
parser.add_argument('-g', '--debug', required=False, default=False, action='store_true',
2427
help='Generate Debug build (default: False)')
2528
parser.add_argument( '--build_dir', type=str, required=False, default="build",
@@ -37,7 +40,7 @@ def parse_args():
3740
help='Install after build (default: False)')
3841
parser.add_argument( '--cmake-darg', required=False, dest='cmake_dargs', action='append', default=[],
3942
help='List of additional cmake defines for builds (e.g. CMAKE_CXX_COMPILER_LAUNCHER=ccache)')
40-
parser.add_argument('-a', '--architecture', dest='gpu_architecture', required=False, default="gfx906;gfx1030;gfx1100;gfx1101;gfx1102", #:sramecc+:xnack-" ) #gfx1030" ) #gfx906" ) # gfx1030" )
43+
parser.add_argument('-a', '--architecture', dest='gpu_architecture', required=False, default=default_gpus, #:sramecc+:xnack-" ) #gfx1030" ) #gfx906" ) # gfx1030" )
4144
help='Set GPU architectures, e.g. all, gfx000, gfx803, gfx906:xnack-;gfx1030;gfx1100 (optional, default: all)')
4245
parser.add_argument('-v', '--verbose', required=False, default=False, action='store_true',
4346
help='Verbose build (default: False)')
@@ -111,7 +114,7 @@ def config_cmd():
111114
else:
112115
cmake_executable = "cmake"
113116
toolchain = "toolchain-linux.cmake"
114-
cmake_platform_opts = f"-DROCM_DIR:PATH={rocm_path} -DCPACK_PACKAGING_INSTALL_PREFIX={rocm_path}"
117+
cmake_platform_opts = [f"-DROCM_DIR:PATH={rocm_path}", f"-DCPACK_PACKAGING_INSTALL_PREFIX={rocm_path}"]
115118

116119
tools = f"-DCMAKE_TOOLCHAIN_FILE={toolchain}"
117120
cmake_options.append( tools )

0 commit comments

Comments
 (0)