Merge with recent commits to master

Author: fjwillemsen

kernel_tuner/strategies/bayes_opt.py

@@ -238,7 +238,7 @@ def get_hyperparam(name: str, default, supported_values=list()):
         self.invalid_value = 1e20
         self.opt_direction = opt_direction
         if opt_direction == "min":
-            self.worst_value = np.PINF
+            self.worst_value = np.inf
             self.argopt = np.argmin
         elif opt_direction == "max":
             self.worst_value = np.NINF
@@ -265,7 +265,7 @@ def get_hyperparam(name: str, default, supported_values=list()):
         self.__visited_num = 0
         self.__visited_valid_num = 0
         self.__visited_searchspace_indices = [False] * self.searchspace_size
-        self.__observations = [np.NaN] * self.searchspace_size
+        self.__observations = [np.nan] * self.searchspace_size
         self.__valid_observation_indices = [False] * self.searchspace_size
         self.__valid_params = list()
         self.__valid_observations = list()
@@ -314,7 +314,7 @@ def is_not_visited(self, index: int) -> bool:
 
     def is_valid(self, observation: float) -> bool:
         """Returns whether an observation is valid."""
-        return not (observation is None or observation == self.invalid_value or observation == np.NaN)
+        return not (observation is None or observation == self.invalid_value or observation == np.nan)
 
     def get_af_by_name(self, name: str):
         """Get the basic acquisition functions by their name."""

pyproject.toml

@@ -50,8 +50,8 @@ classifiers = [
 # ATTENTION: if anything is changed here, run `poetry update`
 requires-python = ">=3.10,<4" # <4 is because of hip-python  # NOTE when changing the Python versions, also change the test versions in the Noxfile and GitHub Actions
 dependencies = [
-    "numpy (>=1.26.0,<2.0.0)",    # Python 3.12 requires numpy at least 1.26, CuPy does not support 2.0
-    "scipy>=1.14.1",
+    "numpy>=2.0.0",
+    "scipy>=1.14.1",    # Python >=3.13 needs scipy >=1.14
     "packaging",        # required by file_utils
     "jsonschema",
     "python-constraint2>=2.2.2",
@@ -153,4 +153,4 @@ select = [
     "D", # pydocstyle,
 ]
 [tool.ruff.pydocstyle]
-convention = "google"
+convention = "google"

test/context.py

@@ -55,8 +55,9 @@
 
 try:
     from hip import hip
+    hip.hipDriverGetVersion()
     hip_present = True
-except ImportError:
+except (ImportError, RuntimeError):
     hip_present = False
 
 try:
@@ -84,7 +85,7 @@
 )
 skip_if_no_openmp = pytest.mark.skipif(not openmp_present, reason="No OpenMP found")
 skip_if_no_openacc = pytest.mark.skipif(not openacc_present, reason="No nvc++ on PATH")
-skip_if_no_pyhip = pytest.mark.skipif(not hip_present, reason="No HIP Python found")
+skip_if_no_hip = pytest.mark.skipif(not hip_present, reason="No HIP Python found or no HIP device detected")
 skip_if_no_methodology = pytest.mark.skipif(not methodology_present, reason="Autotuning Methodology not found")
 
 

test/strategies/test_bayesian_optimization.py

@@ -74,7 +74,7 @@ def test_bo_initialization():
     assert BO.searchspace == pruned_parameter_space
     assert BO.unvisited_cache == pruned_parameter_space
     assert len(BO.observations) == len(pruned_parameter_space)
-    assert BO.current_optimum == np.PINF
+    assert BO.current_optimum == np.inf
 
 def test_bo_initial_sample_lhs():
     sample = BO.draw_latin_hypercube_samples(num_samples=1)

test/test_file_utils.py

@@ -13,7 +13,7 @@
 
 from kernel_tuner.file_utils import get_input_file, output_file_schema, store_metadata_file, store_output_file
 from kernel_tuner.util import delete_temp_file, check_argument_list
-from .context import skip_if_no_pyhip
+from .context import skip_if_no_hip
 
 from .test_runners import cache_filename, env, tune_kernel  # noqa: F401
 
@@ -80,7 +80,7 @@ def hip_check(call_result):
         raise RuntimeError(str(err))
     return result
 
-@skip_if_no_pyhip
+@skip_if_no_hip
 def test_check_argument_list_device_array():
     """Test check_argument_list with DeviceArray"""
     float_kernel = """

test/test_hip_functions.py

@@ -6,7 +6,7 @@
 from kernel_tuner.backends import hip as kt_hip
 from kernel_tuner.core import KernelInstance, KernelSource
 
-from .context import skip_if_no_pyhip
+from .context import skip_if_no_hip
 
 try:
     from hip import hip, hiprtc
@@ -48,7 +48,7 @@ def env():
 
     return ["vector_add", kernel_string, size, args, tune_params]
 
-@skip_if_no_pyhip
+@skip_if_no_hip
 def test_ready_argument_list():
     size = 1000
     a = np.int32(75)
@@ -67,7 +67,7 @@ def test_ready_argument_list():
     assert gpu_args[1].value == a
     assert gpu_args[3].value == c
 
-@skip_if_no_pyhip
+@skip_if_no_hip
 def test_compile():
     kernel_string = """
     __global__ void vector_add(float *c, float *a, float *b, int n) {
@@ -87,7 +87,7 @@ def test_compile():
     except Exception as e:
         pytest.fail("Did not expect any exception:" + str(e))
 
-@skip_if_no_pyhip
+@skip_if_no_hip
 def test_memset_and_memcpy_dtoh():
     a = [1, 2, 3, 4]
     x = np.array(a).astype(np.int8)
@@ -101,7 +101,7 @@ def test_memset_and_memcpy_dtoh():
 
     assert all(output == np.full(4, 4))
 
-@skip_if_no_pyhip
+@skip_if_no_hip
 def test_memcpy_htod():
     a = [1, 2, 3, 4]
     x = np.array(a).astype(np.float32)
@@ -114,7 +114,7 @@ def test_memcpy_htod():
 
     assert all(output == x)
 
-@skip_if_no_pyhip
+@skip_if_no_hip
 def test_copy_constant_memory_args():
     kernel_string = """
     __constant__ float my_constant_data[100];
@@ -147,7 +147,7 @@ def test_copy_constant_memory_args():
 
     assert (my_constant_data == output).all()
 
-@skip_if_no_pyhip
+@skip_if_no_hip
 def test_smem_args(env):
     result, _ = tune_kernel(*env,
                           smem_args=dict(size="block_size_x*4"),

test/test_observers.py

@@ -10,7 +10,7 @@
     skip_if_no_cupy,
     skip_if_no_opencl,
     skip_if_no_pycuda,
-    skip_if_no_pyhip,
+    skip_if_no_hip,
     skip_if_no_pynvml,
 )
 from .test_hip_functions import env as env_hip  # noqa: F401
@@ -68,7 +68,7 @@ def test_register_observer_opencl(env_opencl):
     assert err.errisinstance(NotImplementedError)
     assert "OpenCL" in str(err.value)
 
-@skip_if_no_pyhip
+@skip_if_no_hip
 def test_register_observer_hip(env_hip):
     with raises(NotImplementedError) as err:
         kernel_tuner.tune_kernel(*env_hip, observers=[RegisterObserver()], lang='HIP')