Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cooperative groups #3478

Open
wants to merge 5 commits into
base: docs/develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ build:
- if [ -d ../clr ]; then rm -rf ../clr; fi
- if [ -d ../ROCR-Runtime ]; then rm -rf ../ROCR-Runtime; fi
- git clone --depth=1 --single-branch --branch rocdoc-195 https://github.com/StreamHPC/llvm-project.git ../llvm-project
- git clone --depth=1 --single-branch --branch develop https://github.com/ROCm/clr.git ../clr
- git clone --depth=1 --single-branch --branch cooperative_groups_documentation https://github.com/ROCm/clr.git ../clr
- git clone --depth=1 --single-branch --branch master https://github.com/ROCm/ROCR-Runtime.git ../ROCR-Runtime
post_build:
- rm -rf ../clr
Expand Down
1 change: 1 addition & 0 deletions .wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ structs
SYCL
syntaxes
tradeoffs
templated
typedefs
UMM
WinGDB
Expand Down
8 changes: 7 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,10 @@
cpp_id_attributes = ["__global__", "__device__", "__host__", "__forceinline__", "static"]
cpp_paren_attributes = ["__declspec"]

suppress_warnings = ["etoc.toctree"]
suppress_warnings = ["etoc.toctree"]

exclude_patterns = [
"doxygen/mainpage.md",
"understand/glossary.md",
"understand/thread_hierarchy_coop_figure.rst"
]
10 changes: 8 additions & 2 deletions docs/doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,7 @@ WARN_LOGFILE =
INPUT = mainpage.md \
../../include/hip \
../../../clr/hipamd/include/hip/amd_detail/amd_hip_gl_interop.h \
../../../clr/hipamd/include/hip/amd_detail/amd_hip_cooperative_groups.h \
../../../llvm-project/clang/lib/Headers/__clang_hip_math.h \
../../../ROCR-Runtime/src/inc/hsa_ext_amd.h

Expand Down Expand Up @@ -2195,8 +2196,13 @@ INCLUDE_FILE_PATTERNS =
# recursively expanded use the := operator instead of the = operator.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

PREDEFINED = __HIP_PLATFORM_AMD__ \
__dparm(x)=
PREDEFINED = "__HIP_PLATFORM_AMD__" \
"DOXYGEN_SHOULD_SKIP_THIS=1" \
"__dparm(x)=" \
"__cplusplus=201103L" \
"__CG_QUALIFIER__=" \
"__CG_STATIC_QUALIFIER__=static" \
"_CG_STATIC_CONST_DECL_=static constexpr"

# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
# tag can be used to specify a list of macro names that should be expanded. The
Expand Down
Loading
Loading