Skip to content

Commit

Permalink
Merge back 6.3 hotfixes (#195)
Browse files Browse the repository at this point in the history
* Remove website URL from comments (#168)

Referencing or using code from some websites is prohibited in this repository.
This change removes an informational reference in the comments.

* Add gfx1151 build target (#170) (#171)

* Add gfx1151 target

* Add precheckin.groovy

* Add rocRAND dep

* Get dep from gfx1151 branch instead of develop

* Updated with public develop and set targets to gfx1101 and 1151

* Remove unneeded file for public github

* Restore all gpu targets

---------

Co-authored-by: Stanley Tsang <[email protected]>
Co-authored-by: Sam Wu <[email protected]>

* Update link to rocRAND data type support (#175)

* added gfx12 and gfx1151 to default gpu list

* updated changelog

* Update CHANGELOG.md

Co-authored-by: Jeffrey Novotny <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Jeffrey Novotny <[email protected]>

* Remove gfx940,gfx941 targets (#191)

---------

Co-authored-by: Wayne Franz <[email protected]>
Co-authored-by: amd-garydeng <[email protected]>
Co-authored-by: Sam Wu <[email protected]>
Co-authored-by: Jeffrey Novotny <[email protected]>
Co-authored-by: NguyenNhuDi <[email protected]>
Co-authored-by: Val Movsik <[email protected]>
  • Loading branch information
7 people authored Nov 20, 2024
1 parent a62bb1a commit 8006231
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Documentation for hipRAND 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`.
* For internal testing with HMM the environment variable `ROCRAND_USE_HMM` was used in previous
versions, it is now changed to `HIPRAND_USE_HMM`.
* The device API documentation is improved in this version.
Expand All @@ -28,6 +29,7 @@ Documentation for hipRAND is available at

### Resolved issues

* Fixed an issue in `rmake.py` where the list storing cmake options would contain individual characters instead of a full string of options.
* Build error when using Clang++ directly due to unsupported references to `amdgpu-target`

## hipRAND-2.10.17 for ROCm 5.6.0
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ if (NOT BUILD_WITH_LIB STREQUAL "CUDA")

if(GPU_TARGETS STREQUAL "all")
rocm_check_target_ids(DEFAULT_AMDGPU_TARGETS
TARGETS "gfx803;gfx900:xnack-;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack-;gfx90a:xnack+;gfx940;gfx941;gfx942;gfx1030;gfx1100;gfx1101;gfx1102;gfx1151;gfx1200;gfx1201"
TARGETS "gfx803;gfx900:xnack-;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack-;gfx90a:xnack+;gfx942;gfx1030;gfx1100;gfx1101;gfx1102;gfx1151;gfx1200;gfx1201"
)
set(GPU_TARGETS "${DEFAULT_AMDGPU_TARGETS}" CACHE STRING "GPU architectures to compile for" FORCE)
endif()
Expand Down
7 changes: 5 additions & 2 deletions rmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -35,7 +38,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)')
Expand Down Expand Up @@ -103,7 +106,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 )
Expand Down
1 change: 0 additions & 1 deletion scripts/copyright-date/check-copyright.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ if $forkdiff; then
source_commit="remotes/$remote/HEAD"

# don't use fork-point for finding fork point (lol)
# see: https://stackoverflow.com/a/53981615
diff_hash="$(git merge-base "$source_commit" "$branch")"
fi

Expand Down

0 comments on commit 8006231

Please sign in to comment.