Merge branch 'master' of github.com:KernelTuner/kernel_tuner into fix-pycuda-cc

Author: benvanwerkhoven

CHANGELOG.md

@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+- changed HIP python bindings from pyhip-interface to the official hip-python
 
 ## [1.0.0] - 2024-04-04
 - HIP backend to support tuning HIP kernels on AMD GPUs

INSTALL.rst

@@ -124,31 +124,26 @@ Or you could install Kernel Tuner and PyOpenCL together if you haven't done so a
 
 If this fails, please see the PyOpenCL installation guide (https://wiki.tiker.net/PyOpenCL/Installation)
 
-HIP and PyHIP
--------------
+HIP and HIP Python
+------------------
 
-Before we can install PyHIP, you'll need to have the HIP runtime and compiler installed on your system.
+Before we can install HIP Python, you'll need to have the HIP runtime and compiler installed on your system.
 The HIP compiler is included as part of the ROCm software stack. Here is AMD's installation guide:
 
 * `ROCm Documentation: HIP Installation Guide <https://docs.amd.com/bundle/HIP-Installation-Guide-v5.3/page/Introduction_to_HIP_Installation_Guide.html>`__
 
-After you've installed HIP, you will need to install PyHIP. Run the following command in your terminal to install:
+After you've installed HIP, you will need to install HIP Python. Run the following command in your terminal to install:
 
-.. code-block:: bash
-
-    pip install pyhip-interface
+First identify the first three digits of the version number of your ROCm™ installation.
+Then install the HIP Python package(s) as follows:
 
-Alternatively, you can install PyHIP from the source code. First, clone the repository from GitHub:
-
-.. code-block:: bash
+.. code-block:: shell
 
-    git clone https://github.com/jatinx/PyHIP
-
-Then, navigate to the repository directory and run the following command to install:
-
-.. code-block:: bash
+    python3 -m pip install -i https://test.pypi.org/simple hip-python~=$rocm_version
+    # if you want to install the CUDA Python interoperability package too, run:
+    python3 -m pip install -i https://test.pypi.org/simple hip-python-as-cuda~=$rocm_version
 
-    python setup.py install
+For other installation options check `hip-python on GitHub <https://github.com/ROCm/hip-python>`_
 
 Installing the git version
 --------------------------
@@ -171,7 +166,7 @@ The runtime dependencies are:
 
 - `cuda`: install pycuda along with kernel_tuner
 - `opencl`: install pycuda along with kernel_tuner
-- `hip`: install pyhip along with kernel_tuner
+- `hip`: install HIP Python along with kernel_tuner
 - `tutorial`: install packages required to run the guides
 
 These can be installed by appending e.g. ``-E cuda -E opencl -E hip``.

README.md

@@ -32,7 +32,7 @@ What Kernel Tuner does:
 
 ## Installation
 
-- First, make sure you have your [CUDA](https://kerneltuner.github.io/kernel_tuner/stable/install.html#cuda-and-pycuda), [OpenCL](https://kerneltuner.github.io/kernel_tuner/stable/install.html#opencl-and-pyopencl), or [HIP](https://kerneltuner.github.io/kernel_tuner/stable/install.html#hip-and-pyhipl) compiler installed
+- First, make sure you have your [CUDA](https://kerneltuner.github.io/kernel_tuner/stable/install.html#cuda-and-pycuda), [OpenCL](https://kerneltuner.github.io/kernel_tuner/stable/install.html#opencl-and-pyopencl), or [HIP](https://kerneltuner.github.io/kernel_tuner/stable/install.html#hip-and-hip-python) compiler installed
 - Then type: `pip install kernel_tuner[cuda]`, `pip install kernel_tuner[opencl]`, or `pip install kernel_tuner[hip]`
 - or why not all of them: `pip install kernel_tuner[cuda,opencl,hip]`
 

doc/requirements.txt

@@ -1,89 +1,89 @@
-alabaster==0.7.16 ; python_version >= "3.9" and python_version < "3.13"
-asttokens==2.4.1 ; python_version >= "3.9" and python_version < "3.13"
-attrs==23.2.0 ; python_version >= "3.9" and python_version < "3.13"
-babel==2.15.0 ; python_version >= "3.9" and python_version < "3.13"
-beautifulsoup4==4.12.3 ; python_version >= "3.9" and python_version < "3.13"
-bleach==6.1.0 ; python_version >= "3.9" and python_version < "3.13"
-certifi==2024.2.2 ; python_version >= "3.9" and python_version < "3.13"
-cffi==1.16.0 ; python_version >= "3.9" and python_version < "3.13" and implementation_name == "pypy"
-charset-normalizer==3.3.2 ; python_version >= "3.9" and python_version < "3.13"
-colorama==0.4.6 ; python_version >= "3.9" and python_version < "3.13" and sys_platform == "win32"
-decorator==5.1.1 ; python_version >= "3.9" and python_version < "3.13"
-defusedxml==0.7.1 ; python_version >= "3.9" and python_version < "3.13"
-docutils==0.20.1 ; python_version >= "3.9" and python_version < "3.13"
-dom-toml==2.0.0 ; python_version >= "3.9" and python_version < "3.13"
-domdf-python-tools==3.8.1 ; python_version >= "3.9" and python_version < "3.13"
-exceptiongroup==1.2.1 ; python_version >= "3.9" and python_version < "3.11"
-executing==2.0.1 ; python_version >= "3.9" and python_version < "3.13"
-fastjsonschema==2.19.1 ; python_version >= "3.9" and python_version < "3.13"
-idna==3.7 ; python_version >= "3.9" and python_version < "3.13"
-imagesize==1.4.1 ; python_version >= "3.9" and python_version < "3.13"
-importlib-metadata==7.1.0 ; python_version >= "3.9" and python_version < "3.10"
-iniconfig==2.0.0 ; python_version >= "3.9" and python_version < "3.13"
-ipython==8.18.1 ; python_version >= "3.9" and python_version < "3.13"
-jedi==0.19.1 ; python_version >= "3.9" and python_version < "3.13"
-jinja2==3.1.4 ; python_version >= "3.9" and python_version < "3.13"
-joblib==1.4.2 ; python_version >= "3.9" and python_version < "3.13"
-jsonschema-specifications==2023.12.1 ; python_version >= "3.9" and python_version < "3.13"
-jsonschema==4.22.0 ; python_version >= "3.9" and python_version < "3.13"
-jupyter-client==8.6.2 ; python_version >= "3.9" and python_version < "3.13"
-jupyter-core==5.7.2 ; python_version >= "3.9" and python_version < "3.13"
-jupyterlab-pygments==0.3.0 ; python_version >= "3.9" and python_version < "3.13"
-markupsafe==2.1.5 ; python_version >= "3.9" and python_version < "3.13"
-matplotlib-inline==0.1.7 ; python_version >= "3.9" and python_version < "3.13"
-mistune==3.0.2 ; python_version >= "3.9" and python_version < "3.13"
-natsort==8.4.0 ; python_version >= "3.9" and python_version < "3.13"
-nbclient==0.10.0 ; python_version >= "3.9" and python_version < "3.13"
-nbconvert==7.16.4 ; python_version >= "3.9" and python_version < "3.13"
-nbformat==5.10.4 ; python_version >= "3.9" and python_version < "3.13"
-nbsphinx==0.9.4 ; python_version >= "3.9" and python_version < "3.13"
-numpy==1.26.4 ; python_version >= "3.9" and python_version < "3.13"
-packaging==24.0 ; python_version >= "3.9" and python_version < "3.13"
-pandas==2.2.2 ; python_version >= "3.9" and python_version < "3.13"
-pandocfilters==1.5.1 ; python_version >= "3.9" and python_version < "3.13"
-parso==0.8.4 ; python_version >= "3.9" and python_version < "3.13"
-pexpect==4.9.0 ; python_version >= "3.9" and python_version < "3.13" and sys_platform != "win32"
-platformdirs==4.2.2 ; python_version >= "3.9" and python_version < "3.13"
-pluggy==1.5.0 ; python_version >= "3.9" and python_version < "3.13"
-prompt-toolkit==3.0.43 ; python_version >= "3.9" and python_version < "3.13"
-ptyprocess==0.7.0 ; python_version >= "3.9" and python_version < "3.13" and sys_platform != "win32"
-pure-eval==0.2.2 ; python_version >= "3.9" and python_version < "3.13"
-pycparser==2.22 ; python_version >= "3.9" and python_version < "3.13" and implementation_name == "pypy"
-pygments==2.18.0 ; python_version >= "3.9" and python_version < "3.13"
-pytest==8.2.1 ; python_version >= "3.9" and python_version < "3.13"
-python-constraint2==2.0.0b5 ; python_version >= "3.9" and python_version < "3.13"
-python-dateutil==2.9.0.post0 ; python_version >= "3.9" and python_version < "3.13"
-pytz==2024.1 ; python_version >= "3.9" and python_version < "3.13"
-pywin32==306 ; sys_platform == "win32" and platform_python_implementation != "PyPy" and python_version >= "3.9" and python_version < "3.13"
-pyzmq==26.0.3 ; python_version >= "3.9" and python_version < "3.13"
-referencing==0.35.1 ; python_version >= "3.9" and python_version < "3.13"
-requests==2.32.2 ; python_version >= "3.9" and python_version < "3.13"
-rpds-py==0.18.1 ; python_version >= "3.9" and python_version < "3.13"
-scikit-learn==1.5.0 ; python_version >= "3.9" and python_version < "3.13"
-scipy==1.13.1 ; python_version >= "3.9" and python_version < "3.13"
-six==1.16.0 ; python_version >= "3.9" and python_version < "3.13"
-snowballstemmer==2.2.0 ; python_version >= "3.9" and python_version < "3.13"
-soupsieve==2.5 ; python_version >= "3.9" and python_version < "3.13"
-sphinx-pyproject==0.3.0 ; python_version >= "3.9" and python_version < "3.13"
-sphinx-rtd-theme==2.0.0 ; python_version >= "3.9" and python_version < "3.13"
-sphinx==7.3.7 ; python_version >= "3.9" and python_version < "3.13"
-sphinxcontrib-applehelp==1.0.8 ; python_version >= "3.9" and python_version < "3.13"
-sphinxcontrib-devhelp==1.0.6 ; python_version >= "3.9" and python_version < "3.13"
-sphinxcontrib-htmlhelp==2.0.5 ; python_version >= "3.9" and python_version < "3.13"
-sphinxcontrib-jquery==4.1 ; python_version >= "3.9" and python_version < "3.13"
-sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.9" and python_version < "3.13"
-sphinxcontrib-qthelp==1.0.7 ; python_version >= "3.9" and python_version < "3.13"
-sphinxcontrib-serializinghtml==1.1.10 ; python_version >= "3.9" and python_version < "3.13"
-stack-data==0.6.3 ; python_version >= "3.9" and python_version < "3.13"
-threadpoolctl==3.5.0 ; python_version >= "3.9" and python_version < "3.13"
-tinycss2==1.3.0 ; python_version >= "3.9" and python_version < "3.13"
-tomli==2.0.1 ; python_version >= "3.9" and python_version < "3.13"
-tornado==6.4 ; python_version >= "3.9" and python_version < "3.13"
-traitlets==5.14.3 ; python_version >= "3.9" and python_version < "3.13"
-typing-extensions==4.12.0 ; python_version >= "3.9" and python_version < "3.13"
-tzdata==2024.1 ; python_version >= "3.9" and python_version < "3.13"
-urllib3==2.2.1 ; python_version >= "3.9" and python_version < "3.13"
-wcwidth==0.2.13 ; python_version >= "3.9" and python_version < "3.13"
-webencodings==0.5.1 ; python_version >= "3.9" and python_version < "3.13"
-xmltodict==0.13.0 ; python_version >= "3.9" and python_version < "3.13"
-zipp==3.18.2 ; python_version >= "3.9" and python_version < "3.10"
+alabaster==0.7.16 ; python_version >= "3.9" and python_version < "3.15"
+asttokens==3.0.0 ; python_version >= "3.9" and python_version < "3.15"
+attrs==25.1.0 ; python_version >= "3.9" and python_version < "3.15"
+babel==2.17.0 ; python_version >= "3.9" and python_version < "3.15"
+beautifulsoup4==4.13.3 ; python_version >= "3.9" and python_version < "3.15"
+bleach[css]==6.2.0 ; python_version >= "3.9" and python_version < "3.15"
+certifi==2025.1.31 ; python_version >= "3.9" and python_version < "3.15"
+cffi==1.17.1 ; python_version >= "3.9" and python_version < "3.15" and implementation_name == "pypy"
+charset-normalizer==3.4.1 ; python_version >= "3.9" and python_version < "3.15"
+colorama==0.4.6 ; python_version >= "3.9" and python_version < "3.15" and sys_platform == "win32"
+decorator==5.2.1 ; python_version >= "3.9" and python_version < "3.15"
+defusedxml==0.7.1 ; python_version >= "3.9" and python_version < "3.15"
+docutils==0.20.1 ; python_version >= "3.9" and python_version < "3.15"
+dom-toml==2.0.1 ; python_version >= "3.9" and python_version < "3.15"
+domdf-python-tools==3.10.0 ; python_version >= "3.9" and python_version < "3.15"
+exceptiongroup==1.2.2 ; python_version >= "3.9" and python_version < "3.11"
+executing==2.2.0 ; python_version >= "3.9" and python_version < "3.15"
+fastjsonschema==2.21.1 ; python_version >= "3.9" and python_version < "3.15"
+idna==3.10 ; python_version >= "3.9" and python_version < "3.15"
+imagesize==1.4.1 ; python_version >= "3.9" and python_version < "3.15"
+importlib-metadata==8.6.1 ; python_version >= "3.9" and python_version < "3.10"
+iniconfig==2.0.0 ; python_version >= "3.9" and python_version < "3.15"
+ipython==8.18.1 ; python_version >= "3.9" and python_version < "3.15"
+jedi==0.19.2 ; python_version >= "3.9" and python_version < "3.15"
+jinja2==3.1.6 ; python_version >= "3.9" and python_version < "3.15"
+joblib==1.4.2 ; python_version >= "3.9" and python_version < "3.15"
+jsonschema-specifications==2024.10.1 ; python_version >= "3.9" and python_version < "3.15"
+jsonschema==4.23.0 ; python_version >= "3.9" and python_version < "3.15"
+jupyter-client==8.6.3 ; python_version >= "3.9" and python_version < "3.15"
+jupyter-core==5.7.2 ; python_version >= "3.9" and python_version < "3.15"
+jupyterlab-pygments==0.3.0 ; python_version >= "3.9" and python_version < "3.15"
+markupsafe==2.1.5 ; python_version >= "3.9" and python_version < "3.15"
+matplotlib-inline==0.1.7 ; python_version >= "3.9" and python_version < "3.15"
+mistune==3.1.2 ; python_version >= "3.9" and python_version < "3.15"
+natsort==8.4.0 ; python_version >= "3.9" and python_version < "3.15"
+nbclient==0.10.2 ; python_version >= "3.9" and python_version < "3.15"
+nbconvert==7.16.6 ; python_version >= "3.9" and python_version < "3.15"
+nbformat==5.10.4 ; python_version >= "3.9" and python_version < "3.15"
+nbsphinx==0.9.7 ; python_version >= "3.9" and python_version < "3.15"
+numpy==1.26.4 ; python_version >= "3.9" and python_version < "3.15"
+packaging==24.2 ; python_version >= "3.9" and python_version < "3.15"
+pandas==2.2.3 ; python_version >= "3.9" and python_version < "3.15"
+pandocfilters==1.5.1 ; python_version >= "3.9" and python_version < "3.15"
+parso==0.8.4 ; python_version >= "3.9" and python_version < "3.15"
+pexpect==4.9.0 ; python_version >= "3.9" and python_version < "3.15" and sys_platform != "win32"
+platformdirs==4.3.6 ; python_version >= "3.9" and python_version < "3.15"
+pluggy==1.5.0 ; python_version >= "3.9" and python_version < "3.15"
+prompt-toolkit==3.0.50 ; python_version >= "3.9" and python_version < "3.15"
+ptyprocess==0.7.0 ; python_version >= "3.9" and python_version < "3.15" and sys_platform != "win32"
+pure-eval==0.2.3 ; python_version >= "3.9" and python_version < "3.15"
+pycparser==2.22 ; python_version >= "3.9" and python_version < "3.15" and implementation_name == "pypy"
+pygments==2.19.1 ; python_version >= "3.9" and python_version < "3.15"
+pytest==8.3.5 ; python_version >= "3.9" and python_version < "3.15"
+python-constraint2==2.1.0 ; python_version >= "3.9" and python_version < "3.15"
+python-dateutil==2.9.0.post0 ; python_version >= "3.9" and python_version < "3.15"
+pytz==2025.1 ; python_version >= "3.9" and python_version < "3.15"
+pywin32==308 ; sys_platform == "win32" and platform_python_implementation != "PyPy" and python_version >= "3.9" and python_version < "3.15"
+pyzmq==26.2.1 ; python_version >= "3.9" and python_version < "3.15"
+referencing==0.36.2 ; python_version >= "3.9" and python_version < "3.15"
+requests==2.32.3 ; python_version >= "3.9" and python_version < "3.15"
+rpds-py==0.23.1 ; python_version >= "3.9" and python_version < "3.15"
+scikit-learn==1.6.1 ; python_version >= "3.9" and python_version < "3.15"
+scipy==1.13.1 ; python_version >= "3.9" and python_version < "3.15"
+six==1.17.0 ; python_version >= "3.9" and python_version < "3.15"
+snowballstemmer==2.2.0 ; python_version >= "3.9" and python_version < "3.15"
+soupsieve==2.6 ; python_version >= "3.9" and python_version < "3.15"
+sphinx-pyproject==0.3.0 ; python_version >= "3.9" and python_version < "3.15"
+sphinx-rtd-theme==2.0.0 ; python_version >= "3.9" and python_version < "3.15"
+sphinx==7.4.7 ; python_version >= "3.9" and python_version < "3.15"
+sphinxcontrib-applehelp==2.0.0 ; python_version >= "3.9" and python_version < "3.15"
+sphinxcontrib-devhelp==2.0.0 ; python_version >= "3.9" and python_version < "3.15"
+sphinxcontrib-htmlhelp==2.1.0 ; python_version >= "3.9" and python_version < "3.15"
+sphinxcontrib-jquery==4.1 ; python_version >= "3.9" and python_version < "3.15"
+sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.9" and python_version < "3.15"
+sphinxcontrib-qthelp==2.0.0 ; python_version >= "3.9" and python_version < "3.15"
+sphinxcontrib-serializinghtml==2.0.0 ; python_version >= "3.9" and python_version < "3.15"
+stack-data==0.6.3 ; python_version >= "3.9" and python_version < "3.15"
+threadpoolctl==3.5.0 ; python_version >= "3.9" and python_version < "3.15"
+tinycss2==1.4.0 ; python_version >= "3.9" and python_version < "3.15"
+tomli==2.2.1 ; python_version >= "3.9" and python_version < "3.15"
+tornado==6.4.2 ; python_version >= "3.9" and python_version < "3.15"
+traitlets==5.14.3 ; python_version >= "3.9" and python_version < "3.15"
+typing-extensions==4.12.2 ; python_version >= "3.9" and python_version < "3.15"
+tzdata==2025.1 ; python_version >= "3.9" and python_version < "3.15"
+urllib3==2.3.0 ; python_version >= "3.9" and python_version < "3.15"
+wcwidth==0.2.13 ; python_version >= "3.9" and python_version < "3.15"
+webencodings==0.5.1 ; python_version >= "3.9" and python_version < "3.15"
+xmltodict==0.14.2 ; python_version >= "3.9" and python_version < "3.15"
+zipp==3.21.0 ; python_version >= "3.9" and python_version < "3.10"