AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-299127 - Merge 'develop' into 'amd-staging'

Browse Source 
Change-Id: If894c952261ecf4254ce686b40579c274d3407df


[ROCm/hip commit: 04fc963b72]
This commit is contained in:
Jenkins
2023-05-21 11:10:21 +00:00
parent bbf0f09f6a 90aeea4edc
commit 853c8565f9
3 changed files with 52 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/hip/docs/.sphinx/requirements.in
+1 -1
View File
@@ -1 +1 @@
rocm-docs-core[api_reference]
rocm-docs-core[api_reference]==0.11.0
projects/hip/docs/.sphinx/requirements.txt
+21 -141
View File
@@ -8,18 +8,10 @@ accessible-pygments==0.0.3
# via pydata-sphinx-theme
alabaster==0.7.12
# via sphinx
asttokens==2.2.0
# via stack-data
attrs==22.1.0
# via
# jsonschema
# jupyter-cache
babel==2.10.3
# via
# pydata-sphinx-theme
# sphinx
backcall==0.2.0
# via ipython
beautifulsoup4==4.11.1
# via pydata-sphinx-theme
breathe==4.34.0
@@ -27,21 +19,20 @@ breathe==4.34.0
certifi==2022.6.15
# via requests
cffi==1.15.1
# via pynacl
# via
# cryptography
# pynacl
charset-normalizer==2.1.0
# via requests
click==8.1.3
# via
# click-log
# doxysphinx
# jupyter-cache
# sphinx-external-toc
click-log==0.4.0
# via doxysphinx
debugpy==1.6.4
# via ipykernel
decorator==5.1.1
# via ipython
cryptography==40.0.2
# via pyjwt
deprecated==1.2.13
# via pygithub
docutils==0.16
@@ -49,60 +40,29 @@ docutils==0.16
# breathe
# myst-parser
# pydata-sphinx-theme
# rocm-docs-core
# sphinx
doxysphinx==3.2.1
# via rocm-docs-core
entrypoints==0.4
# via jupyter-client
executing==1.2.0
# via stack-data
fastjsonschema==2.16.2
# via nbformat
# via rocm-docs-core
gitdb==4.0.10
# via gitpython
gitpython==3.1.31
# via rocm-docs-core
greenlet==2.0.1
# via sqlalchemy
idna==3.3
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==5.1.0
# via
# jupyter-cache
# myst-nb
# via sphinx
importlib-resources==5.10.4
# via
# jsonschema
# rocm-docs-core
ipykernel==6.17.1
# via myst-nb
ipython==8.7.0
# via
# ipykernel
# myst-nb
jedi==0.18.2
# via ipython
# via rocm-docs-core
jinja2==3.1.2
# via
# myst-parser
# sphinx
json5==0.9.11
# via doxysphinx
jsonschema==4.17.3
# via nbformat
jupyter-cache==0.5.0
# via myst-nb
jupyter-client==7.4.7
# via
# ipykernel
# nbclient
jupyter-core==5.1.0
# via
# jupyter-client
# nbformat
linkify-it-py==1.0.3
# via myst-parser
lxml==4.9.2
@@ -113,70 +73,30 @@ markdown-it-py==2.1.0
# myst-parser
markupsafe==2.1.1
# via jinja2
matplotlib-inline==0.1.6
# via
# ipykernel
# ipython
mdit-py-plugins==0.3.1
mdit-py-plugins==0.3.5
# via myst-parser
mdurl==0.1.2
# via markdown-it-py
myst-nb==0.17.1
myst-parser[linkify]==1.0.0
# via rocm-docs-core
myst-parser[linkify]==0.18.1
# via
# myst-nb
# rocm-docs-core
nbclient==0.5.13
# via
# jupyter-cache
# myst-nb
nbformat==5.7.0
# via
# jupyter-cache
# myst-nb
# nbclient
nest-asyncio==1.5.6
# via
# ipykernel
# jupyter-client
# nbclient
packaging==21.3
# via
# ipykernel
# pydata-sphinx-theme
# sphinx
parso==0.8.3
# via jedi
pexpect==4.8.0
# via ipython
pickleshare==0.7.5
# via ipython
pkgutil-resolve-name==1.3.10
# via jsonschema
platformdirs==2.5.4
# via jupyter-core
prompt-toolkit==3.0.33
# via ipython
psutil==5.9.4
# via ipykernel
ptyprocess==0.7.0
# via pexpect
pure-eval==0.2.2
# via stack-data
pycparser==2.21
# via cffi
pydata-sphinx-theme==0.13.1
# via sphinx-book-theme
pygithub==1.57
pydata-sphinx-theme==0.13.3
# via
# rocm-docs-core
# sphinx-book-theme
pygithub==1.58.2
# via rocm-docs-core
pygments==2.12.0
# via
# accessible-pygments
# ipython
# pydata-sphinx-theme
# sphinx
pyjwt==2.6.0
pyjwt[crypto]==2.6.0
# via pygithub
pynacl==1.5.0
# via pygithub
@@ -184,42 +104,28 @@ pyparsing==3.0.9
# via
# doxysphinx
# packaging
pyrsistent==0.19.2
# via jsonschema
python-dateutil==2.8.2
# via jupyter-client
pytz==2022.1
# via babel
pyyaml==6.0
# via
# jupyter-cache
# myst-nb
# myst-parser
# rocm-docs-core
# sphinx-external-toc
pyzmq==24.0.1
# via
# ipykernel
# jupyter-client
requests==2.28.1
# via
# pygithub
# sphinx
rocm-docs-core[api_reference]==0.2.0
rocm-docs-core[api_reference]==0.11.0
# via -r requirements.in
six==1.16.0
# via
# asttokens
# python-dateutil
smmap==5.0.0
# via gitdb
snowballstemmer==2.2.0
# via sphinx
soupsieve==2.3.2.post1
# via beautifulsoup4
sphinx==4.3.1
sphinx==5.3.0
# via
# breathe
# myst-nb
# myst-parser
# pydata-sphinx-theme
# rocm-docs-core
@@ -228,7 +134,7 @@ sphinx==4.3.1
# sphinx-design
# sphinx-external-toc
# sphinx-notfound-page
sphinx-book-theme==1.0.0rc2
sphinx-book-theme==1.0.1
# via rocm-docs-core
sphinx-copybutton==0.5.1
# via rocm-docs-core
@@ -250,41 +156,15 @@ sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
sqlalchemy==1.4.44
# via jupyter-cache
stack-data==0.6.2
# via ipython
tabulate==0.9.0
# via jupyter-cache
tornado==6.2
# via
# ipykernel
# jupyter-client
traitlets==5.6.0
# via
# ipykernel
# ipython
# jupyter-client
# jupyter-core
# matplotlib-inline
# nbclient
# nbformat
typing-extensions==4.4.0
# via
# myst-nb
# myst-parser
# via pydata-sphinx-theme
uc-micro-py==1.0.1
# via linkify-it-py
urllib3==1.26.11
# via requests
wcwidth==0.2.5
# via prompt-toolkit
wrapt==1.15.0
# via deprecated
zipp==3.11.0
# via
# importlib-metadata
# importlib-resources
# The following packages are considered to be unsafe in a requirements file:
# setuptools
projects/hip/include/hip/hip_gl_interop.h
+30
View File
@@ -0,0 +1,30 @@
/*
Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#ifndef HIP_GL_INTEROP_H
#define HIP_GL_INTEROP_H
#include <hip/hip_common.h>
#if !(defined(__HIP_PLATFORM_HCC__) || defined(__HIP_PLATFORM_AMD__)) && (defined(__HIP_PLATFORM_NVCC__) || defined(__HIP_PLATFORM_NVIDIA__))
#include "hip/nvidia_detail/nvidia_hip_gl_interop.h"
#endif
#endif