Skip to content

Commit d22bdc9

Browse files
committed
Minor updates to dependencies and documentation
1 parent 42d8bfe commit d22bdc9

File tree

6 files changed

+703
-286
lines changed

6 files changed

+703
-286
lines changed

CONTRIBUTING.rst

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,18 @@ Steps without :bash:`sudo` access (e.g. on a cluster):
6262

6363
#. Clone the git repository to the desired location: :bash:`git clone https://github.com/KernelTuner/kernel_tuner.git`.
6464
#. Install Conda with `Mamba <https://mamba.readthedocs.io/en/latest/mamba-installation.html>`__ (for better performance) or `Miniconda <https://docs.conda.io/projects/conda/en/latest/user-guide/install>`__ (for traditional minimal Conda).
65-
* [Optional] both Mamba and Miniconda can be automatically activated via :bash:`~/.bashrc`. Do not forget to add these (usually mentioned at the end of the installation).
66-
* Exit the shell and re-enter to make sure Conda is available, :bash:`cd` to the kernel tuner directory.
65+
* [Optional] if you are under quotas or are otherwise restricted by disk space, you can instruct Conda to use a different directory for saving environments by adding the following to your :bash:`.condarc` file:
66+
.. code-block:: bash
67+
68+
envs_dirs:
69+
- /path/to/directory
70+
* [Optional] both Mamba and Miniconda can be automatically activated via :bash:`~/.bashrc`. Do not forget to add these (usually provided at the end of the installation).
71+
* Exit the shell and re-enter to make sure Conda is available. :bash:`cd` to the kernel tuner directory.
6772
* [Optional] update Conda if available before continuing: :bash:`conda update -n base -c conda-forge conda`.
6873
#. Setup a virtual environment: :bash:`conda create --name kerneltuner python=3.11` (or whatever Python version and environment name you prefer).
6974
#. Activate the virtual environment: :bash:`conda activate kerneltuner`.
7075
* [Optional] to use the correct environment by default, execute :bash:`conda config --set auto_activate_base false`, and add `conda activate kerneltuner` to your :bash:`.bash_profile` or :bash:`.bashrc`.
71-
* Make sure that non-Python dependencies are loaded if applicable, such as CUDA, OpenCL or HIP. On most clusters it is possible to load (or unload) modules (e.g. CUDA, OpenCL / ROCM). For more information, see :ref:`Installation <installation>`.
76+
#. Make sure that non-Python dependencies are loaded if applicable, such as CUDA, OpenCL or HIP. On most clusters it is possible to load (or unload) modules (e.g. CUDA, OpenCL / ROCM). For more information, see :ref:`Installation <installation>`.
7277
* Do not forget to make sure the paths are set correctly. If you're using CUDA, the desired CUDA version should be in :bash:`$PATH`, :bash:`$LD_LIBARY_PATH` and :bash:`$CPATH`.
7378
* [Optional] the loading of modules and setting of paths is likely convenient to put in your :bash:`.bash_profile` or :bash:`.bashrc`.
7479
#. `Install Poetry <https://python-poetry.org/docs/#installing-with-the-official-installer>`__: :bash:`curl -sSL https://install.python-poetry.org | python3 -`.
@@ -82,13 +87,15 @@ Steps without :bash:`sudo` access (e.g. on a cluster):
8287
* If you alternatively set up with Venv: :bash:`echo "venv" > noxenv.txt`.
8388
* If you set up with Virtualenv, do not create this file, as this is already the default.
8489
* Be sure to adjust or remove this file when changing backends.
90+
#. [Optional] Run the tests on Nox as described below.
8591

8692

8793
Running tests
8894
-------------
8995
To run the tests you can use :bash:`nox` (to run against all supported Python versions in isolated environments) and :bash:`pytest` (to run against the local Python version) in the top-level directory.
96+
For full coverage, make Nox install and use the additional tests (such as cupy and cuda-python) with :bash:`nox -- additional-tests`.
9097
It's also possible to invoke PyTest from the 'Testing' tab in Visual Studio Code.
91-
The isolated environments can take up to 1 gigabyte in size, so users tight on diskspace can run :bash:`nox` with the :bash:`small-disk` option. This removes the other environment caches before each session is ran.
98+
The isolated environments can take up to 1 gigabyte in size, so users tight on diskspace can run :bash:`nox` with the :bash:`small-disk` option. This removes the other environment caches before each session is ran (note that this will take longer to run).
9299

93100
Note that tests that require PyCuda and/or a CUDA capable GPU will be skipped if these
94101
are not installed/present. The same holds for tests that require PyOpenCL, Cupy, Nvidia CUDA.

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ COBYLA, SLSQP, Random Search, Basinhopping, Differential Evolution, a Genetic Al
106106
Optimization, the Firefly Algorithm, Simulated Annealing, Dual Annealing, Iterative Local Search,
107107
Multi-start Local Search, and Bayesian Optimization.
108108

109-
.. image:: doc/gemm-amd-summary.png
109+
.. image:: https://github.com/KernelTuner/kernel_tuner/blob/master/doc/gemm-amd-summary.png?raw=true
110110
:width: 100%
111111
:align: center
112112

@@ -193,8 +193,8 @@ If you use Kernel Tuner in research or research software, please cite the most r
193193
}
194194

195195

196-
.. |Build Status| image:: https://github.com/KernelTuner/kernel_tuner/actions/workflows/python-app.yml/badge.svg
197-
:target: https://github.com/KernelTuner/kernel_tuner/actions/workflows/python-app.yml
196+
.. |Build Status| image:: https://github.com/KernelTuner/kernel_tuner/actions/workflows/build-test-python-package.yml/badge.svg
197+
:target: https://github.com/KernelTuner/kernel_tuner/actions/workflows/build-test-python-package.yml
198198
.. |CodeCov Badge| image:: https://codecov.io/gh/KernelTuner/kernel_tuner/branch/master/graph/badge.svg
199199
:target: https://codecov.io/gh/KernelTuner/kernel_tuner
200200
.. |PyPi Badge| image:: https://img.shields.io/pypi/v/kernel_tuner.svg?colorB=blue

doc/requirements.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ attrs==23.1.0 ; python_version >= "3.8" and python_version < "3.12"
55
babel==2.13.0 ; python_version >= "3.8" and python_version < "3.12"
66
backcall==0.2.0 ; python_version >= "3.8" and python_version < "3.12"
77
beautifulsoup4==4.12.2 ; python_version >= "3.8" and python_version < "3.12"
8-
bleach==6.0.0 ; python_version >= "3.8" and python_version < "3.12"
8+
bleach==6.1.0 ; python_version >= "3.8" and python_version < "3.12"
99
certifi==2023.7.22 ; python_version >= "3.8" and python_version < "3.12"
1010
cffi==1.16.0 ; python_version >= "3.8" and python_version < "3.12" and implementation_name == "pypy"
1111
charset-normalizer==3.3.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -29,20 +29,20 @@ jinja2==3.1.2 ; python_version >= "3.8" and python_version < "3.12"
2929
joblib==1.3.2 ; python_version >= "3.8" and python_version < "3.12"
3030
jsonschema-specifications==2023.7.1 ; python_version >= "3.8" and python_version < "3.12"
3131
jsonschema==4.19.1 ; python_version >= "3.8" and python_version < "3.12"
32-
jupyter-client==8.3.1 ; python_version >= "3.8" and python_version < "3.12"
33-
jupyter-core==5.3.2 ; python_version >= "3.8" and python_version < "3.12"
32+
jupyter-client==8.4.0 ; python_version >= "3.8" and python_version < "3.12"
33+
jupyter-core==5.4.0 ; python_version >= "3.8" and python_version < "3.12"
3434
jupyterlab-pygments==0.2.2 ; python_version >= "3.8" and python_version < "3.12"
3535
markupsafe==2.1.3 ; python_version >= "3.8" and python_version < "3.12"
3636
matplotlib-inline==0.1.6 ; python_version >= "3.8" and python_version < "3.12"
3737
mistune==3.0.2 ; python_version >= "3.8" and python_version < "3.12"
3838
natsort==8.4.0 ; python_version >= "3.8" and python_version < "3.12"
3939
nbclient==0.8.0 ; python_version >= "3.8" and python_version < "3.12"
40-
nbconvert==7.8.0 ; python_version >= "3.8" and python_version < "3.12"
40+
nbconvert==7.9.2 ; python_version >= "3.8" and python_version < "3.12"
4141
nbformat==5.9.2 ; python_version >= "3.8" and python_version < "3.12"
4242
nbsphinx==0.9.3 ; python_version >= "3.8" and python_version < "3.12"
4343
numpy==1.24.4 ; python_version >= "3.8" and python_version < "3.12"
4444
packaging==23.2 ; python_version >= "3.8" and python_version < "3.12"
45-
pandas==1.5.3 ; python_version >= "3.8" and python_version < "3.12"
45+
pandas==2.0.3 ; python_version >= "3.8" and python_version < "3.12"
4646
pandocfilters==1.5.0 ; python_version >= "3.8" and python_version < "3.12"
4747
parso==0.8.3 ; python_version >= "3.8" and python_version < "3.12"
4848
pexpect==4.8.0 ; python_version >= "3.8" and python_version < "3.12" and sys_platform != "win32"
@@ -63,7 +63,7 @@ pywin32==306 ; sys_platform == "win32" and platform_python_implementation != "Py
6363
pyzmq==25.1.1 ; python_version >= "3.8" and python_version < "3.12"
6464
referencing==0.30.2 ; python_version >= "3.8" and python_version < "3.12"
6565
requests==2.31.0 ; python_version >= "3.8" and python_version < "3.12"
66-
rpds-py==0.10.3 ; python_version >= "3.8" and python_version < "3.12"
66+
rpds-py==0.10.4 ; python_version >= "3.8" and python_version < "3.12"
6767
scikit-learn==1.3.1 ; python_version >= "3.8" and python_version < "3.12"
6868
scipy==1.10.1 ; python_version >= "3.8" and python_version < "3.12"
6969
six==1.16.0 ; python_version >= "3.8" and python_version < "3.12"
@@ -85,8 +85,9 @@ tinycss2==1.2.1 ; python_version >= "3.8" and python_version < "3.12"
8585
toml==0.10.2 ; python_version >= "3.8" and python_version < "3.12"
8686
tomli==2.0.1 ; python_version >= "3.8" and python_version < "3.11"
8787
tornado==6.3.3 ; python_version >= "3.8" and python_version < "3.12"
88-
traitlets==5.11.1 ; python_version >= "3.8" and python_version < "3.12"
88+
traitlets==5.11.2 ; python_version >= "3.8" and python_version < "3.12"
8989
typing-extensions==4.8.0 ; python_version >= "3.8" and python_version < "3.12"
90+
tzdata==2023.3 ; python_version >= "3.8" and python_version < "3.12"
9091
urllib3==2.0.6 ; python_version >= "3.8" and python_version < "3.12"
9192
wcwidth==0.2.8 ; python_version >= "3.8" and python_version < "3.12"
9293
webencodings==0.5.1 ; python_version >= "3.8" and python_version < "3.12"

noxfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def tests(session: Session) -> None:
112112
except Exception as error:
113113
print(error)
114114
session.warn(install_warning)
115-
if install_opencl and (session.python == "3.7" or session.python == "3.8"):
115+
if install_opencl and session.python == "3.8":
116116
# if we need to install the OpenCL extras, first install pyopencl seperately.
117117
# it has `oldest-supported-numpy` as a build dependency which doesn't work with Poetry, but only for Python<3.9
118118
try:

0 commit comments

Comments
 (0)