Skip to content

Commit 8ddce18

Browse files
fjwillemsenfjwillemsen
committed
Updated poetry configuration fields to project configuration fields, updated dependencies
1 parent bff6d7b commit 8ddce18

File tree

3 files changed

+98
-87
lines changed

3 files changed

+98
-87
lines changed

‎doc/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ nbclient==0.10.2 ; python_version >= "3.10" and python_version <= "3.11" or pyth
3636
nbconvert==7.16.6 ; python_version >= "3.10" and python_version <= "3.11" or python_version >= "3.12" and python_version < "3.15"
3737
nbformat==5.10.4 ; python_version >= "3.10" and python_version <= "3.11" or python_version >= "3.12" and python_version < "3.15"
3838
nbsphinx==0.9.7 ; python_version >= "3.10" and python_version <= "3.11" or python_version >= "3.12" and python_version < "3.15"
39-
numpy==1.26.4 ; python_version >= "3.10" and python_version <= "3.11" or python_version >= "3.12" and python_version < "3.15"
39+
numpy==2.2.4 ; python_version >= "3.10" and python_version <= "3.11" or python_version >= "3.12" and python_version < "3.15"
4040
packaging==24.2 ; python_version >= "3.10" and python_version <= "3.11" or python_version >= "3.12" and python_version < "3.15"
4141
pandas==2.2.3 ; python_version >= "3.10" and python_version <= "3.11" or python_version >= "3.12" and python_version < "3.15"
4242
pandocfilters==1.5.1 ; python_version >= "3.10" and python_version <= "3.11" or python_version >= "3.12" and python_version < "3.15"

‎doc/requirements_test.txt

Lines changed: 56 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -189,43 +189,62 @@ nox-poetry==1.2.0 ; python_version >= "3.10" and python_version <= "3.11" or pyt
189189
nox==2024.10.9 ; python_version >= "3.10" and python_version <= "3.11" or python_version >= "3.12" and python_version < "3.15" \
190190
--hash=sha256:1d36f309a0a2a853e9bccb76bbef6bb118ba92fa92674d15604ca99adeb29eab \
191191
--hash=sha256:7aa9dc8d1c27e9f45ab046ffd1c3b2c4f7c91755304769df231308849ebded95
192-
numpy==1.26.4 ; python_version >= "3.10" and python_version <= "3.11" or python_version >= "3.12" and python_version < "3.15" \
193-
--hash=sha256:03a8c78d01d9781b28a6989f6fa1bb2c4f2d51201cf99d3dd875df6fbd96b23b \
194-
--hash=sha256:08beddf13648eb95f8d867350f6a018a4be2e5ad54c8d8caed89ebca558b2818 \
195-
--hash=sha256:1af303d6b2210eb850fcf03064d364652b7120803a0b872f5211f5234b399f20 \
196-
--hash=sha256:1dda2e7b4ec9dd512f84935c5f126c8bd8b9f2fc001e9f54af255e8c5f16b0e0 \
197-
--hash=sha256:2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010 \
198-
--hash=sha256:2e4ee3380d6de9c9ec04745830fd9e2eccb3e6cf790d39d7b98ffd19b0dd754a \
199-
--hash=sha256:3373d5d70a5fe74a2c1bb6d2cfd9609ecf686d47a2d7b1d37a8f3b6bf6003aea \
200-
--hash=sha256:47711010ad8555514b434df65f7d7b076bb8261df1ca9bb78f53d3b2db02e95c \
201-
--hash=sha256:4c66707fabe114439db9068ee468c26bbdf909cac0fb58686a42a24de1760c71 \
202-
--hash=sha256:50193e430acfc1346175fcbdaa28ffec49947a06918b7b92130744e81e640110 \
203-
--hash=sha256:52b8b60467cd7dd1e9ed082188b4e6bb35aa5cdd01777621a1658910745b90be \
204-
--hash=sha256:60dedbb91afcbfdc9bc0b1f3f402804070deed7392c23eb7a7f07fa857868e8a \
205-
--hash=sha256:62b8e4b1e28009ef2846b4c7852046736bab361f7aeadeb6a5b89ebec3c7055a \
206-
--hash=sha256:666dbfb6ec68962c033a450943ded891bed2d54e6755e35e5835d63f4f6931d5 \
207-
--hash=sha256:675d61ffbfa78604709862923189bad94014bef562cc35cf61d3a07bba02a7ed \
208-
--hash=sha256:679b0076f67ecc0138fd2ede3a8fd196dddc2ad3254069bcb9faf9a79b1cebcd \
209-
--hash=sha256:7349ab0fa0c429c82442a27a9673fc802ffdb7c7775fad780226cb234965e53c \
210-
--hash=sha256:7ab55401287bfec946ced39700c053796e7cc0e3acbef09993a9ad2adba6ca6e \
211-
--hash=sha256:7e50d0a0cc3189f9cb0aeb3a6a6af18c16f59f004b866cd2be1c14b36134a4a0 \
212-
--hash=sha256:95a7476c59002f2f6c590b9b7b998306fba6a5aa646b1e22ddfeaf8f78c3a29c \
213-
--hash=sha256:96ff0b2ad353d8f990b63294c8986f1ec3cb19d749234014f4e7eb0112ceba5a \
214-
--hash=sha256:9fad7dcb1aac3c7f0584a5a8133e3a43eeb2fe127f47e3632d43d677c66c102b \
215-
--hash=sha256:9ff0f4f29c51e2803569d7a51c2304de5554655a60c5d776e35b4a41413830d0 \
216-
--hash=sha256:a354325ee03388678242a4d7ebcd08b5c727033fcff3b2f536aea978e15ee9e6 \
217-
--hash=sha256:a4abb4f9001ad2858e7ac189089c42178fcce737e4169dc61321660f1a96c7d2 \
218-
--hash=sha256:ab47dbe5cc8210f55aa58e4805fe224dac469cde56b9f731a4c098b91917159a \
219-
--hash=sha256:afedb719a9dcfc7eaf2287b839d8198e06dcd4cb5d276a3df279231138e83d30 \
220-
--hash=sha256:b3ce300f3644fb06443ee2222c2201dd3a89ea6040541412b8fa189341847218 \
221-
--hash=sha256:b97fe8060236edf3662adfc2c633f56a08ae30560c56310562cb4f95500022d5 \
222-
--hash=sha256:bfe25acf8b437eb2a8b2d49d443800a5f18508cd811fea3181723922a8a82b07 \
223-
--hash=sha256:cd25bcecc4974d09257ffcd1f098ee778f7834c3ad767fe5db785be9a4aa9cb2 \
224-
--hash=sha256:d209d8969599b27ad20994c8e41936ee0964e6da07478d6c35016bc386b66ad4 \
225-
--hash=sha256:d5241e0a80d808d70546c697135da2c613f30e28251ff8307eb72ba696945764 \
226-
--hash=sha256:edd8b5fe47dab091176d21bb6de568acdd906d1887a4584a15a9a96a1dca06ef \
227-
--hash=sha256:f870204a840a60da0b12273ef34f7051e98c3b5961b61b0c2c1be6dfd64fbcd3 \
228-
--hash=sha256:ffa75af20b44f8dba823498024771d5ac50620e6915abac414251bd971b4529f
192+
numpy==2.2.4 ; python_version >= "3.10" and python_version <= "3.11" or python_version >= "3.12" and python_version < "3.15" \
193+
--hash=sha256:05c076d531e9998e7e694c36e8b349969c56eadd2cdcd07242958489d79a7286 \
194+
--hash=sha256:0d54974f9cf14acf49c60f0f7f4084b6579d24d439453d5fc5805d46a165b542 \
195+
--hash=sha256:11c43995255eb4127115956495f43e9343736edb7fcdb0d973defd9de14cd84f \
196+
--hash=sha256:188dcbca89834cc2e14eb2f106c96d6d46f200fe0200310fc29089657379c58d \
197+
--hash=sha256:1974afec0b479e50438fc3648974268f972e2d908ddb6d7fb634598cdb8260a0 \
198+
--hash=sha256:1cf4e5c6a278d620dee9ddeb487dc6a860f9b199eadeecc567f777daace1e9e7 \
199+
--hash=sha256:207a2b8441cc8b6a2a78c9ddc64d00d20c303d79fba08c577752f080c4007ee3 \
200+
--hash=sha256:218f061d2faa73621fa23d6359442b0fc658d5b9a70801373625d958259eaca3 \
201+
--hash=sha256:2aad3c17ed2ff455b8eaafe06bcdae0062a1db77cb99f4b9cbb5f4ecb13c5146 \
202+
--hash=sha256:2fa8fa7697ad1646b5c93de1719965844e004fcad23c91228aca1cf0800044a1 \
203+
--hash=sha256:31504f970f563d99f71a3512d0c01a645b692b12a63630d6aafa0939e52361e6 \
204+
--hash=sha256:3387dd7232804b341165cedcb90694565a6015433ee076c6754775e85d86f1fc \
205+
--hash=sha256:4ba5054787e89c59c593a4169830ab362ac2bee8a969249dc56e5d7d20ff8df9 \
206+
--hash=sha256:4f92084defa704deadd4e0a5ab1dc52d8ac9e8a8ef617f3fbb853e79b0ea3592 \
207+
--hash=sha256:65ef3468b53269eb5fdb3a5c09508c032b793da03251d5f8722b1194f1790c00 \
208+
--hash=sha256:6f527d8fdb0286fd2fd97a2a96c6be17ba4232da346931d967a0630050dfd298 \
209+
--hash=sha256:7051ee569db5fbac144335e0f3b9c2337e0c8d5c9fee015f259a5bd70772b7e8 \
210+
--hash=sha256:7716e4a9b7af82c06a2543c53ca476fa0b57e4d760481273e09da04b74ee6ee2 \
211+
--hash=sha256:79bd5f0a02aa16808fcbc79a9a376a147cc1045f7dfe44c6e7d53fa8b8a79392 \
212+
--hash=sha256:7a4e84a6283b36632e2a5b56e121961f6542ab886bc9e12f8f9818b3c266bfbb \
213+
--hash=sha256:8120575cb4882318c791f839a4fd66161a6fa46f3f0a5e613071aae35b5dd8f8 \
214+
--hash=sha256:81413336ef121a6ba746892fad881a83351ee3e1e4011f52e97fba79233611fd \
215+
--hash=sha256:8146f3550d627252269ac42ae660281d673eb6f8b32f113538e0cc2a9aed42b9 \
216+
--hash=sha256:879cf3a9a2b53a4672a168c21375166171bc3932b7e21f622201811c43cdd3b0 \
217+
--hash=sha256:892c10d6a73e0f14935c31229e03325a7b3093fafd6ce0af704be7f894d95687 \
218+
--hash=sha256:92bda934a791c01d6d9d8e038363c50918ef7c40601552a58ac84c9613a665bc \
219+
--hash=sha256:9ba03692a45d3eef66559efe1d1096c4b9b75c0986b5dff5530c378fb8331d4f \
220+
--hash=sha256:9eeea959168ea555e556b8188da5fa7831e21d91ce031e95ce23747b7609f8a4 \
221+
--hash=sha256:a0258ad1f44f138b791327961caedffbf9612bfa504ab9597157806faa95194a \
222+
--hash=sha256:a761ba0fa886a7bb33c6c8f6f20213735cb19642c580a931c625ee377ee8bd39 \
223+
--hash=sha256:a7b9084668aa0f64e64bd00d27ba5146ef1c3a8835f3bd912e7a9e01326804c4 \
224+
--hash=sha256:a84eda42bd12edc36eb5b53bbcc9b406820d3353f1994b6cfe453a33ff101775 \
225+
--hash=sha256:ab2939cd5bec30a7430cbdb2287b63151b77cf9624de0532d629c9a1c59b1d5c \
226+
--hash=sha256:ac0280f1ba4a4bfff363a99a6aceed4f8e123f8a9b234c89140f5e894e452ecd \
227+
--hash=sha256:adf8c1d66f432ce577d0197dceaac2ac00c0759f573f28516246351c58a85020 \
228+
--hash=sha256:b4adfbbc64014976d2f91084915ca4e626fbf2057fb81af209c1a6d776d23e3d \
229+
--hash=sha256:bb649f8b207ab07caebba230d851b579a3c8711a851d29efe15008e31bb4de24 \
230+
--hash=sha256:bce43e386c16898b91e162e5baaad90c4b06f9dcbe36282490032cec98dc8ae7 \
231+
--hash=sha256:bd3ad3b0a40e713fc68f99ecfd07124195333f1e689387c180813f0e94309d6f \
232+
--hash=sha256:c3f7ac96b16955634e223b579a3e5798df59007ca43e8d451a0e6a50f6bfdfba \
233+
--hash=sha256:cf28633d64294969c019c6df4ff37f5698e8326db68cc2b66576a51fad634880 \
234+
--hash=sha256:d0f35b19894a9e08639fd60a1ec1978cb7f5f7f1eace62f38dd36be8aecdef4d \
235+
--hash=sha256:db1f1c22173ac1c58db249ae48aa7ead29f534b9a948bc56828337aa84a32ed6 \
236+
--hash=sha256:dbe512c511956b893d2dacd007d955a3f03d555ae05cfa3ff1c1ff6df8851854 \
237+
--hash=sha256:df2f57871a96bbc1b69733cd4c51dc33bea66146b8c63cacbfed73eec0883017 \
238+
--hash=sha256:e2f085ce2e813a50dfd0e01fbfc0c12bbe5d2063d99f8b29da30e544fb6483b8 \
239+
--hash=sha256:e642d86b8f956098b564a45e6f6ce68a22c2c97a04f5acd3f221f57b8cb850ae \
240+
--hash=sha256:e9e0a277bb2eb5d8a7407e14688b85fd8ad628ee4e0c7930415687b6564207a4 \
241+
--hash=sha256:ea2bb7e2ae9e37d96835b3576a4fa4b3a97592fbea8ef7c3587078b0068b8f09 \
242+
--hash=sha256:ee4d528022f4c5ff67332469e10efe06a267e32f4067dc76bb7e2cddf3cd25ff \
243+
--hash=sha256:f05d4198c1bacc9124018109c5fba2f3201dbe7ab6e92ff100494f236209c960 \
244+
--hash=sha256:f34dc300df798742b3d06515aa2a0aee20941c13579d7a2f2e10af01ae4901ee \
245+
--hash=sha256:f4162988a360a29af158aeb4a2f4f09ffed6a969c9776f8f3bdee9b06a8ab7e5 \
246+
--hash=sha256:f486038e44caa08dbd97275a9a35a283a8f1d2f0ee60ac260a1790e76660833c \
247+
--hash=sha256:f7de08cbe5551911886d1ab60de58448c6df0f67d9feb7d1fb21e9875ef95e91
229248
packaging==24.2 ; python_version >= "3.10" and python_version <= "3.11" or python_version >= "3.12" and python_version < "3.15" \
230249
--hash=sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759 \
231250
--hash=sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f

‎pyproject.toml

Lines changed: 41 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,22 @@
22
requires = ["poetry-core>=1.7.0", "setuptools>=67.7.2"]
33
build-backend = "poetry.core.masonry.api"
44

5-
[tool.poetry]
5+
[project]
66
name = "kernel_tuner"
7-
packages = [{ include = "kernel_tuner", from = "." }]
87
description = "An easy to use CUDA/OpenCL kernel tuner in Python"
98
version = "1.0" # adhere to PEP440 versioning: https://packaging.python.org/en/latest/guides/distributing-packages-using-setuptools/#id55
9+
readme = "README.md"
1010
license = "Apache-2.0"
1111
authors = [
12-
"Ben van Werkhoven <[email protected]>",
13-
"Alessio Sclocco <[email protected]>",
14-
"Stijn Heldens <[email protected]>",
15-
"Floris-Jan Willemsen <[email protected]>",
16-
"Willem-Jan Palenstijn <[email protected]>",
17-
"Bram Veenboer <[email protected]>",
18-
"Richard Schoonhoven <[email protected]>",
19-
"Leon Oostrum <[email protected]",
12+
{ name = "Ben van Werkhoven", email = "[email protected]"},
13+
{ name = "Alessio Sclocco", email = "[email protected]" },
14+
{ name = "Stijn Heldens", email = "[email protected]" },
15+
{ name = "Floris-Jan Willemsen", email = "[email protected]" },
16+
{ name = "Willem-Jan Palenstijn", email = "[email protected]" },
17+
{ name = "Bram Veenboer", email = "[email protected]" },
18+
{ name = "Richard Schoonhoven", email = "[email protected]" },
19+
{ name = "Leon Oostrum", email = "[email protected]" },
2020
]
21-
22-
readme = "README.md"
2321
keywords = [
2422
"auto-tuning",
2523
"gpu",
@@ -44,55 +42,49 @@ classifiers = [
4442
"Topic :: Software Development",
4543
"Topic :: System :: Distributed Computing",
4644
]
47-
include = [
48-
{ path = "test" },
49-
] # this ensures that people won't have to clone the whole repo to include notebooks, they can just do `pip install kernel_tuner[tutorial,cuda]`
45+
46+
# ATTENTION: if anything is changed here, run `poetry update`
47+
requires-python = ">=3.10,<3.15" # NOTE when changing the Python versions, also change the test versions in the Noxfile and GitHub Actions
48+
dependencies = [
49+
"numpy>=1.26.0", # Python 3.12 requires numpy at least 1.26
50+
"scipy>=1.14.1",
51+
"packaging", # required by file_utils
52+
"jsonschema",
53+
"python-constraint2>=2.1.0",
54+
"xmltodict",
55+
"pandas>=2.0.0",
56+
"scikit-learn>=1.0.2",
57+
]
58+
# NOTE Torch can be used with Kernel Tuner, but is not a dependency, should be up to the user to use it
59+
60+
[project.urls]
5061
homepage = "https://KernelTuner.github.io/kernel_tuner/"
5162
documentation = "https://KernelTuner.github.io/kernel_tuner/"
5263
repository = "https://github.com/KernelTuner/kernel_tuner"
53-
[tool.poetry.urls]
54-
"Tracker" = "https://github.com/KernelTuner/kernel_tuner/issues"
55-
[tool.poetry.build]
56-
generate-setup-file = false
57-
[tool.poetry.scripts]
64+
changelog = "https://github.com/KernelTuner/kernel_tuner/blob/master/CHANGELOG.md"
65+
issues = "https://github.com/KernelTuner/kernel_tuner/issues"
66+
67+
[project.scripts]
5868
kernel_tuner = "kernel_tuner.interface:entry_point"
5969

60-
# ATTENTION: if anything is changed here, run `poetry update`
61-
[tool.poetry.dependencies]
62-
python = ">=3.10,<3.15" # NOTE when changing the supported Python versions, also change the test versions in the noxfile
63-
numpy = "^1.26.0" # Python 3.12 requires numpy at least 1.26
64-
scipy = ">=1.14.1"
65-
packaging = "*" # required by file_utils
66-
jsonschema = "*"
67-
python-constraint2 = "^2.1.0"
68-
xmltodict = "*"
69-
pandas = ">=2.0.0"
70-
scikit-learn = ">=1.0.2"
71-
# Torch can be used with Kernel Tuner, but is not a dependency, should be up to the user to use it
70+
[tool.poetry]
71+
packages = [{ include = "kernel_tuner", from = "." }]
72+
include = [
73+
{ path = "test" },
74+
] # this ensures that people won't have to clone the whole repo to include notebooks, they can just do `pip install kernel_tuner[tutorial,cuda]`
7275

7376
# List of optional dependencies for user installation, e.g. `pip install kernel_tuner[cuda]`, used in the below `extras`.
7477
# Please note that this is different from the dependency groups below, e.g. `docs` and `test`, those are for development.
7578
# CUDA
76-
pycuda = { version = "^2024.1", optional = true } # Attention: if pycuda is changed here, also change `session.install("pycuda")` in the Noxfile
77-
nvidia-ml-py = { version = "^12.535.108", optional = true }
78-
pynvml = { version = "^11.4.1", optional = true }
79-
# cupy-cuda11x = { version = "*", optional = true } # Note: these are completely optional dependencies as described in CONTRIBUTING.rst
79+
# cupy-cuda11x = { version = "*", optional = true } # NOTE: these are completely optional dependencies as described in CONTRIBUTING.rst
8080
# cupy-cuda12x = { version = "*", optional = true }
8181
# cuda-python = { version = "*", optional = true }
82-
# OpenCL
83-
pyopencl = { version = "*", optional = true } # Attention: if pyopencl is changed here, also change `session.install("pyopencl")` in the Noxfile
84-
# HIP
85-
hip-python-fork = { version = "*", optional = true }
86-
# Tutorial (for the notebooks used in the examples)
87-
jupyter = { version = "^1.0.0", optional = true }
88-
matplotlib = { version = "^3.5.0", optional = true }
89-
90-
[tool.poetry.extras]
91-
cuda = ["pycuda", "nvidia-ml-py", "pynvml"]
92-
opencl = ["pyopencl"]
93-
cuda_opencl = ["pycuda", "pyopencl"]
82+
[project.optional-dependencies]
83+
cuda = ["pycuda>=2024.1", "nvidia-ml-py>=12.535.108", "pynvml>=11.4.1"] # Attention: if pycuda is changed here, also change `session.install("pycuda")` in the Noxfile
84+
opencl = ["pyopencl"] # Attention: if pyopencl is changed here, also change `session.install("pyopencl")` in the Noxfile
85+
cuda_opencl = ["pycuda>=2024.1", "pyopencl"] # Attention: if pycuda is changed here, also change `session.install("pycuda")` in the Noxfile
9486
hip = ["hip-python-fork"]
95-
tutorial = ["jupyter", "matplotlib", "nvidia-ml-py"]
87+
tutorial = ["jupyter>=1.0.0", "matplotlib>=3.5.0", "nvidia-ml-py>=12.535.108"]
9688

9789
# ATTENTION: if anything is changed here, run `poetry update` and `poetry export --with docs --without-hashes --format=requirements.txt --output doc/requirements.txt`
9890
# Please note that there is overlap with the `dev` group

0 commit comments

Comments
 (0)