Skip to content

Commit 0d9b90b

Browse files
committed
Completed merge with master
2 parents e2924e0 + 74a4e34 commit 0d9b90b

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

doc/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# import data from pyproject.toml using https://github.com/sphinx-toolbox/sphinx-pyproject
3030
# additional data can be added with `[tool.sphinx-pyproject]` and retrieved with `config['']`.
3131
config = SphinxConfig(
32-
"../../pyproject.toml", style="poetry"
32+
"../../pyproject.toml",
3333
) # add `, globalns=globals()` to directly insert in namespace
3434
year = time.strftime("%Y")
3535
startyear = "2016"

kernel_tuner/interface.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ def __deepcopy__(self, _):
131131
(
132132
"""Specifies the language used for GPU kernels. The kernel_tuner
133133
automatically detects the language, but if it fails, you may specify
134-
the language using this argument, currently supported: "CUDA", "Cupy",
135-
"OpenCL", "HIP", or "C".""",
134+
the language using this argument, currently supported: "CUDA", "CuPy",
135+
"nvcuda", "OpenCL", "HIP", or "C".""",
136136
"string",
137137
),
138138
),
@@ -535,7 +535,7 @@ def _get_docstring(opts):
535535

536536

537537
_tune_kernel_docstring = (
538-
""" Tune a CUDA kernel given a set of tunable parameters
538+
""" Tune a GPU kernel given a set of tunable parameters
539539
540540
%s
541541

kernel_tuner/util.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,9 +1190,7 @@ def process_cache(cache, kernel_options, tuning_options, runner):
11901190

11911191
# if file exists
11921192
else:
1193-
cached_data = read_cache(
1194-
cache, not tuning_options.simulation_mode
1195-
) # don't open the cache in (parallel) simulation mode to avoid race conditions
1193+
cached_data = read_cache(cache, open_cache=not tuning_options.simulation_mode)
11961194

11971195
# if in simulation mode, use the device name from the cache file as the runner device name
11981196
if runner.simulation_mode:

0 commit comments

Comments
 (0)