Merge with master

Author: fjwillemsen

doc/requirements.txt

@@ -1,87 +1,89 @@
-alabaster==0.7.16 ; python_version >= "3.10" and python_version < "4"
-asttokens==3.0.0 ; python_version >= "3.10" and python_version < "4"
-attrs==25.3.0 ; python_version >= "3.10" and python_version < "4"
-babel==2.17.0 ; python_version >= "3.10" and python_version < "4"
-beautifulsoup4==4.13.4 ; python_version >= "3.10" and python_version < "4"
-bleach[css]==6.2.0 ; python_version >= "3.10" and python_version < "4"
-certifi==2025.6.15 ; python_version >= "3.10" and python_version < "4"
-cffi==1.17.1 ; python_version >= "3.10" and python_version < "4" and implementation_name == "pypy"
-charset-normalizer==3.4.2 ; python_version >= "3.10" and python_version < "4"
-colorama==0.4.6 ; python_version >= "3.10" and python_version < "4" and sys_platform == "win32"
-decorator==5.2.1 ; python_version >= "3.10" and python_version < "4"
-defusedxml==0.7.1 ; python_version >= "3.10" and python_version < "4"
-docutils==0.20.1 ; python_version >= "3.10" and python_version < "4"
-dom-toml==2.0.1 ; python_version >= "3.10" and python_version < "4"
-domdf-python-tools==3.10.0 ; python_version >= "3.10" and python_version < "4"
-exceptiongroup==1.3.0 ; python_version == "3.10"
-executing==2.2.0 ; python_version >= "3.10" and python_version < "4"
-fastjsonschema==2.21.1 ; python_version >= "3.10" and python_version < "4"
-idna==3.10 ; python_version >= "3.10" and python_version < "4"
-imagesize==1.4.1 ; python_version >= "3.10" and python_version < "4"
-iniconfig==2.1.0 ; python_version >= "3.10" and python_version < "4"
-ipython==8.37.0 ; python_version >= "3.10" and python_version < "4"
-jedi==0.19.2 ; python_version >= "3.10" and python_version < "4"
-jinja2==3.1.6 ; python_version >= "3.10" and python_version < "4"
-joblib==1.5.1 ; python_version >= "3.10" and python_version < "4"
-jsonschema-specifications==2025.4.1 ; python_version >= "3.10" and python_version < "4"
-jsonschema==4.24.0 ; python_version >= "3.10" and python_version < "4"
-jupyter-client==8.6.3 ; python_version >= "3.10" and python_version < "4"
-jupyter-core==5.8.1 ; python_version >= "3.10" and python_version < "4"
-jupyterlab-pygments==0.3.0 ; python_version >= "3.10" and python_version < "4"
-markupsafe==2.1.5 ; python_version >= "3.10" and python_version < "4"
-matplotlib-inline==0.1.7 ; python_version >= "3.10" and python_version < "4"
-mistune==3.1.3 ; python_version >= "3.10" and python_version < "4"
-natsort==8.4.0 ; python_version >= "3.10" and python_version < "4"
-nbclient==0.10.2 ; python_version >= "3.10" and python_version < "4"
-nbconvert==7.16.6 ; python_version >= "3.10" and python_version < "4"
-nbformat==5.10.4 ; python_version >= "3.10" and python_version < "4"
-nbsphinx==0.9.7 ; python_version >= "3.10" and python_version < "4"
-numpy==2.2.6 ; python_version >= "3.10" and python_version < "4"
-packaging==25.0 ; python_version >= "3.10" and python_version < "4"
-pandas==2.3.0 ; python_version >= "3.10" and python_version < "4"
-pandocfilters==1.5.1 ; python_version >= "3.10" and python_version < "4"
-parso==0.8.4 ; python_version >= "3.10" and python_version < "4"
-pexpect==4.9.0 ; python_version >= "3.10" and python_version < "4" and sys_platform != "win32" and sys_platform != "emscripten"
-platformdirs==4.3.8 ; python_version >= "3.10" and python_version < "4"
-pluggy==1.6.0 ; python_version >= "3.10" and python_version < "4"
-prompt-toolkit==3.0.51 ; python_version >= "3.10" and python_version < "4"
-ptyprocess==0.7.0 ; python_version >= "3.10" and python_version < "4" and sys_platform != "win32" and sys_platform != "emscripten"
-pure-eval==0.2.3 ; python_version >= "3.10" and python_version < "4"
-pycparser==2.22 ; python_version >= "3.10" and python_version < "4" and implementation_name == "pypy"
-pygments==2.19.1 ; python_version >= "3.10" and python_version < "4"
-pytest==8.4.0 ; python_version >= "3.10" and python_version < "4"
-python-constraint2==2.2.3 ; python_version >= "3.10" and python_version < "4"
-python-dateutil==2.9.0.post0 ; python_version >= "3.10" and python_version < "4"
-pytz==2025.2 ; python_version >= "3.10" and python_version < "4"
-pywin32==310 ; sys_platform == "win32" and platform_python_implementation != "PyPy" and python_version >= "3.10" and python_version < "4"
-pyzmq==27.0.0 ; python_version >= "3.10" and python_version < "4"
-referencing==0.36.2 ; python_version >= "3.10" and python_version < "4"
-requests==2.32.4 ; python_version >= "3.10" and python_version < "4"
-rpds-py==0.25.1 ; python_version >= "3.10" and python_version < "4"
-scikit-learn==1.7.0 ; python_version >= "3.10" and python_version < "4"
-scipy==1.15.3 ; python_version >= "3.10" and python_version < "4"
-six==1.17.0 ; python_version >= "3.10" and python_version < "4"
-snowballstemmer==3.0.1 ; python_version >= "3.10" and python_version < "4"
-soupsieve==2.7 ; python_version >= "3.10" and python_version < "4"
-sphinx-pyproject==0.3.0 ; python_version >= "3.10" and python_version < "4"
-sphinx-rtd-theme==2.0.0 ; python_version >= "3.10" and python_version < "4"
-sphinx==7.4.7 ; python_version >= "3.10" and python_version < "4"
-sphinxcontrib-applehelp==2.0.0 ; python_version >= "3.10" and python_version < "4"
-sphinxcontrib-devhelp==2.0.0 ; python_version >= "3.10" and python_version < "4"
-sphinxcontrib-htmlhelp==2.1.0 ; python_version >= "3.10" and python_version < "4"
-sphinxcontrib-jquery==4.1 ; python_version >= "3.10" and python_version < "4"
-sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.10" and python_version < "4"
-sphinxcontrib-qthelp==2.0.0 ; python_version >= "3.10" and python_version < "4"
-sphinxcontrib-serializinghtml==2.0.0 ; python_version >= "3.10" and python_version < "4"
-stack-data==0.6.3 ; python_version >= "3.10" and python_version < "4"
-threadpoolctl==3.6.0 ; python_version >= "3.10" and python_version < "4"
-tinycss2==1.4.0 ; python_version >= "3.10" and python_version < "4"
-tomli==2.2.1 ; python_version >= "3.10" and python_version < "4"
-tornado==6.5.1 ; python_version >= "3.10" and python_version < "4"
-traitlets==5.14.3 ; python_version >= "3.10" and python_version < "4"
-typing-extensions==4.14.0 ; python_version >= "3.10" and python_version < "4"
-tzdata==2025.2 ; python_version >= "3.10" and python_version < "4"
-urllib3==2.4.0 ; python_version >= "3.10" and python_version < "4"
-wcwidth==0.2.13 ; python_version >= "3.10" and python_version < "4"
-webencodings==0.5.1 ; python_version >= "3.10" and python_version < "4"
-xmltodict==0.14.2 ; python_version >= "3.10" and python_version < "4"
+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.4 ; 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.5.1 ; 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.5.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"

kernel_tuner/strategies/common.py

@@ -3,6 +3,7 @@
 from time import perf_counter
 
 import numpy as np
+import numbers
 
 from kernel_tuner import util
 from kernel_tuner.searchspace import Searchspace
@@ -111,8 +112,15 @@ def __call__(self, x, check_restrictions=True):
             self.runner.last_strategy_start_time = perf_counter()
 
         # get numerical return value, taking optimization direction into account
-        return_value = result[self.tuning_options.objective] or sys.float_info.max
-        return_value = return_value if not self.tuning_options.objective_higher_is_better else -return_value
+        return_value = result[self.tuning_options.objective]
+
+        if isinstance(return_value, numbers.Number):
+            if self.tuning_options.objective_higher_is_better:
+                # flip the sign if higher means better
+                return_value = -return_value
+        else:
+            # this is not a valid configuration, just return max
+            return_value = sys.float_info.max
 
         return return_value
 

kernel_tuner/strategies/firefly_algorithm.py

@@ -94,7 +94,7 @@ def __init__(self, bounds):
         """Create Firefly at random position within bounds."""
         super().__init__(bounds)
         self.bounds = bounds
-        self.intensity = 1 / self.score
+        self.intensity = -self.score
 
     def distance_to(self, other):
         """Return Euclidian distance between self and other Firefly."""
@@ -103,10 +103,7 @@ def distance_to(self, other):
     def compute_intensity(self, fun):
         """Evaluate cost function and compute intensity at this position."""
         self.evaluate(fun)
-        if self.score == sys.float_info.max:
-            self.intensity = -sys.float_info.max
-        else:
-            self.intensity = 1 / self.score
+        self.intensity = -self.score
 
     def move_towards(self, other, beta, alpha):
         """Move firefly towards another given beta and alpha values."""

kernel_tuner/strategies/simulated_annealing.py

@@ -90,20 +90,24 @@ def tune(searchspace: Searchspace, runner, tuning_options):
 
 def acceptance_prob(old_cost, new_cost, T, tuning_options):
     """Annealing equation, with modifications to work towards a lower value."""
-    error_val = sys.float_info.max if not tuning_options.objective_higher_is_better else -sys.float_info.max
+    error_val = sys.float_info.max
+    res = 0.0
     # if start pos is not valid, always move
     if old_cost == error_val:
-        return 1.0
+        res = 1.0
     # if we have found a valid ps before, never move to nonvalid pos
-    if new_cost == error_val:
-        return 0.0
+    elif new_cost == error_val:
+        res = 0.0
     # always move if new cost is better
-    if new_cost < old_cost:
-        return 1.0
+    elif new_cost < old_cost:
+        res = 1.0
     # maybe move if old cost is better than new cost depending on T and random value
-    if tuning_options.objective_higher_is_better:
-        return np.exp(((new_cost-old_cost)/new_cost)/T)
-    return np.exp(((old_cost-new_cost)/old_cost)/T)
+    else:
+        if tuning_options.objective_higher_is_better:
+            res = np.exp(((new_cost-old_cost)/new_cost)/T)
+        else:
+            res = np.exp(((old_cost-new_cost)/old_cost)/T)
+    return res
 
 
 def neighbor(pos, searchspace: Searchspace):