Skip to content

Commit

Permalink
Use _ENABLE_EXTENDED_ALIGNED_STORAGE for windows build in rmake.py
Browse files Browse the repository at this point in the history
  • Loading branch information
Naraenda committed Nov 2, 2023
1 parent 8c66863 commit 8c9c64c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Full documentation for rocPRIM is available at [https://rocprim.readthedocs.io/e
- `host_warp_size()` was moved into `rocprim/device/config_types.hpp`, and now uses either a `device_id` or a `stream` parameter to query the proper device and a `device_id` out parameter. The return type is `hipError_t`.
- Added support for __int128_t in `device_radix_sort` and `block_radix_sort`.
### Fixed
- Fixed build issues with `rmake.py` on Windows when using VS 2017 15.8 or later due to a breaking fix with extended aligned storage.

## [Unreleased rocPRIM-2.13.1 for ROCm 5.7.0]
### Added
Expand Down
6 changes: 6 additions & 0 deletions rmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ def config_cmd():
#set CPACK_PACKAGING_INSTALL_PREFIX= defined as blank as it is appended to end of path for archive creation
cmake_platform_opts.append( f"-DWIN32=ON -DCPACK_PACKAGING_INSTALL_PREFIX=") #" -DCPACK_PACKAGING_INSTALL_PREFIX={rocm_path}"
cmake_platform_opts.append( f"-DCMAKE_INSTALL_PREFIX=\"C:/hipSDK\"" )

# MSVC requires acknowledgement of using extended aligned storage.
# Before VS 2017 15.8, has non-conforming alignment. VS 2017 15.8 fixes this, but inherently changes layouts of
# aligned storage with extended alignment, and thus binary compatibility with such types.
cmake_platform_opts.append( "-DCMAKE_CXX_FLAGS=\"-D_ENABLE_EXTENDED_ALIGNED_STORAGE\"")

rocm_cmake_path = '"' + cmake_path(os.getenv("ROCM_CMAKE_PATH", "C:/hipSDK")) + '"'
generator = f"-G Ninja"
# "-G \"Visual Studio 16 2019\" -A x64" # -G NMake ") #
Expand Down

0 comments on commit 8c9c64c

Please sign in to comment.