Fix #789: Remove cyclical import between driver and _lib.utils

.gitignore

@@ -16,6 +16,7 @@ __pycache__/
 cache_driver
 cache_runtime
 cache_nvrtc
+cuda_bindings/cuda/bindings/_lib/utils.pxi
 
 # CUDA Python specific (auto-generated)
 cuda_bindings/cuda/bindings/_bindings/cydriver.pxd

cuda_bindings/cuda/bindings/_lib/param_packer.h

@@ -1,12 +1,152 @@
 // SPDX-FileCopyrightText: Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 // SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
-//
+
 // Please refer to the NVIDIA end user license agreement (EULA) associated
 // with this source code for terms and conditions that govern your use of
 // this software. Any use, reproduction, disclosure, or distribution of
 // this software and related documentation outside the terms of the EULA
 // is strictly prohibited.
-#pragma once
+
 #include <Python.h>
 
-int feed(void* ptr,  PyObject* value, PyObject* type);
+#include <map>
+#include <functional>
+#include <stdexcept>
+#include <string>
+
+static PyObject* ctypes_module = nullptr;
+
+static PyTypeObject* ctypes_c_char = nullptr;
+static PyTypeObject* ctypes_c_bool = nullptr;
+static PyTypeObject* ctypes_c_wchar = nullptr;
+static PyTypeObject* ctypes_c_byte = nullptr;
+static PyTypeObject* ctypes_c_ubyte = nullptr;
+static PyTypeObject* ctypes_c_short = nullptr;
+static PyTypeObject* ctypes_c_ushort = nullptr;
+static PyTypeObject* ctypes_c_int = nullptr;
+static PyTypeObject* ctypes_c_uint = nullptr;
+static PyTypeObject* ctypes_c_long = nullptr;
+static PyTypeObject* ctypes_c_ulong = nullptr;
+static PyTypeObject* ctypes_c_longlong = nullptr;
+static PyTypeObject* ctypes_c_ulonglong = nullptr;
+static PyTypeObject* ctypes_c_size_t = nullptr;
+static PyTypeObject* ctypes_c_float = nullptr;
+static PyTypeObject* ctypes_c_double = nullptr;
+static PyTypeObject* ctypes_c_void_p = nullptr;
+
+static void fetch_ctypes()
+{
+    ctypes_module = PyImport_ImportModule("ctypes");
+    if (ctypes_module == nullptr)
+        throw std::runtime_error("Cannot import ctypes module");
+    // get method addressof
+    PyObject* ctypes_dict = PyModule_GetDict(ctypes_module);
+    if (ctypes_dict == nullptr)
+        throw std::runtime_error(std::string("FAILURE @ ") + std::string(__FILE__) + " : " + std::to_string(__LINE__));
+    // supportedtypes
+    ctypes_c_char = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_char");
+    ctypes_c_bool = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_bool");
+    ctypes_c_wchar = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_wchar");
+    ctypes_c_byte = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_byte");
+    ctypes_c_ubyte = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_ubyte");
+    ctypes_c_short = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_short");
+    ctypes_c_ushort = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_ushort");
+    ctypes_c_int = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_int");
+    ctypes_c_uint = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_uint");
+    ctypes_c_long = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_long");
+    ctypes_c_ulong = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_ulong");
+    ctypes_c_longlong = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_longlong");
+    ctypes_c_ulonglong = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_ulonglong");
+    ctypes_c_size_t = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_size_t");
+    ctypes_c_float = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_float");
+    ctypes_c_double = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_double");
+    ctypes_c_void_p = (PyTypeObject*) PyDict_GetItemString(ctypes_dict, "c_void_p"); // == c_voidp
+}
+
+
+// (target type, source type)
+static std::map<std::pair<PyTypeObject*,PyTypeObject*>, std::function<int(void*, PyObject*)>> m_feeders;
+
+static void populate_feeders(PyTypeObject* target_t, PyTypeObject* source_t)
+{
+    if (target_t == ctypes_c_int)
+    {
+        if (source_t == &PyLong_Type)
+        {
+            m_feeders[{target_t,source_t}] = [](void* ptr, PyObject* value) -> int
+            {
+                *((int*)ptr) = (int)PyLong_AsLong(value);
+                return sizeof(int);
+            };
+            return;
+        }
+    } else if (target_t == ctypes_c_bool) {
+        if (source_t == &PyBool_Type)
+        {
+            m_feeders[{target_t,source_t}] = [](void* ptr, PyObject* value) -> int
+            {
+                *((bool*)ptr) = (value == Py_True);
+                return sizeof(bool);
+            };
+            return;
+        }
+    } else if (target_t == ctypes_c_byte) {
+        if (source_t == &PyLong_Type)
+        {
+            m_feeders[{target_t,source_t}] = [](void* ptr, PyObject* value) -> int
+            {
+                *((int8_t*)ptr) = (int8_t)PyLong_AsLong(value);
+                return sizeof(int8_t);
+            };
+            return;
+        }
+    } else if (target_t == ctypes_c_double) {
+        if (source_t == &PyFloat_Type)
+        {
+            m_feeders[{target_t,source_t}] = [](void* ptr, PyObject* value) -> int
+            {
+                *((double*)ptr) = (double)PyFloat_AsDouble(value);
+                return sizeof(double);
+            };
+            return;
+        }
+    } else if (target_t == ctypes_c_float) {
+        if (source_t == &PyFloat_Type)
+        {
+            m_feeders[{target_t,source_t}] = [](void* ptr, PyObject* value) -> int
+            {
+                *((float*)ptr) = (float)PyFloat_AsDouble(value);
+                return sizeof(float);
+            };
+            return;
+        }
+    } else if (target_t == ctypes_c_longlong) {
+        if (source_t == &PyLong_Type)
+        {
+            m_feeders[{target_t,source_t}] = [](void* ptr, PyObject* value) -> int
+            {
+                *((long long*)ptr) = (long long)PyLong_AsLongLong(value);
+                return sizeof(long long);
+            };
+            return;
+        }
+    }
+}
+
+static int feed(void* ptr, PyObject* value, PyObject* type)
+{
+    PyTypeObject* pto = (PyTypeObject*)type;
+    if (ctypes_c_int == nullptr)
+        fetch_ctypes();
+    auto found = m_feeders.find({pto,value->ob_type});
+    if (found == m_feeders.end())
+    {
+        populate_feeders(pto, value->ob_type);
+        found = m_feeders.find({pto,value->ob_type});
+    }
+    if (found != m_feeders.end())
+    {
+        return found->second(ptr, value);
+    }
+    return 0;
+}

cuda_bindings/cuda/bindings/_lib/param_packer.pxd

@@ -1,5 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
+# Include "param_packer.h" so its contents get compiled into every
+# Cython extension module that depends on param_packer.pxd.
 cdef extern from "param_packer.h":
     int feed(void* ptr, object o, object ct)