From e706c74ffec6563abeefd8e9dbad9e8792b29887 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Thu, 22 May 2025 21:20:44 -0700 Subject: [PATCH 1/2] Fix accident discovered in passing. --- cuda_bindings/cuda/bindings/_path_finder/supported_libs.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cuda_bindings/cuda/bindings/_path_finder/supported_libs.py b/cuda_bindings/cuda/bindings/_path_finder/supported_libs.py index 14dc98a9687..63bde282f5b 100644 --- a/cuda_bindings/cuda/bindings/_path_finder/supported_libs.py +++ b/cuda_bindings/cuda/bindings/_path_finder/supported_libs.py @@ -256,8 +256,6 @@ "cufft": ( "cufft64_10.dll", "cufft64_11.dll", - "cufftw64_10.dll", - "cufftw64_11.dll", ), "cufftw": ( "cufftw64_10.dll", From e4de5f9ff014f7f20c9ece07a4cf69a51cfa0aa4 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Mon, 26 May 2025 21:32:57 -0700 Subject: [PATCH 2/2] Add test_libname_dict_values_are_unique() --- cuda_bindings/tests/test_path_finder_load.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cuda_bindings/tests/test_path_finder_load.py b/cuda_bindings/tests/test_path_finder_load.py index 66defe2bacd..c63c3d668f5 100644 --- a/cuda_bindings/tests/test_path_finder_load.py +++ b/cuda_bindings/tests/test_path_finder_load.py @@ -30,6 +30,18 @@ def test_all_libnames_windows_dlls_consistency(): assert tuple(sorted(ALL_LIBNAMES_WINDOWS)) == tuple(sorted(supported_libs.SUPPORTED_WINDOWS_DLLS.keys())) +@pytest.mark.parametrize("dict_name", ["SUPPORTED_LINUX_SONAMES", "SUPPORTED_WINDOWS_DLLS"]) +def test_libname_dict_values_are_unique(dict_name): + libname_dict = getattr(supported_libs, dict_name) + libname_for_value = {} + for libname, values in libname_dict.items(): + for value in values: + prev_libname = libname_for_value.get(value) + if prev_libname is not None: + raise RuntimeError(f"Multiple libnames for {value!r}: {prev_libname}, {libname}") + libname_for_value[value] = libname + + def test_all_libnames_libnames_requiring_os_add_dll_directory_consistency(): assert not (set(supported_libs.LIBNAMES_REQUIRING_OS_ADD_DLL_DIRECTORY) - set(ALL_LIBNAMES_WINDOWS))