diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d41702c9002b4d649501134dc7a47d8f4a26a90d..e7520a8c116bc17839194160c97b4bafd44126a4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,6 +55,7 @@ jobs:
run: |
CONDA_ENVIRONMENT=.test-conda-env-py3.yml
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
+ ./configure.py --cl-use-shipped-ext
. ./build-and-test-py-project-within-miniconda.sh
pytest_mac:
@@ -84,6 +85,7 @@ jobs:
CONDA_ENVIRONMENT=.test-conda-env-py3.yml
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh
. ci-support.sh
+ ./configure.py --cl-use-shipped-ext
build_py_project_in_conda_env
build_docs
diff --git a/doc/make_constants.py b/doc/make_constants.py
index 2e20383bab957c2d26e84f066804cd4ea925be4c..5056335390e31697c0188ead269781194e7b60d8 100644
--- a/doc/make_constants.py
+++ b/doc/make_constants.py
@@ -58,6 +58,7 @@ def get_extra_lines(tup):
yield " .. versionadded:: %s" % pyopencl_ver
yield ""
+
const_ext_lookup = {
cl.status_code: {
"PLATFORM_NOT_FOUND_KHR": ("cl_khr_icd", "2011.1"),
@@ -186,6 +187,10 @@ const_ext_lookup = {
"SUB_GROUP_INDEPENDENT_FORWARD_PROGRESS": cl_21,
},
+ cl.device_topology_type_amd: {
+ "PCIE": amd_devattr,
+ },
+
cl.mem_object_type: {
"IMAGE2D_ARRAY": cl_12,
"IMAGE1D": cl_12,
diff --git a/pyopencl/__init__.py b/pyopencl/__init__.py
index ef56ad0fd8782286e6d5f35b331e99b3df1b82f5..4a5ee953f5dd170dca1e64eec0e68eb29eb3a787 100644
--- a/pyopencl/__init__.py
+++ b/pyopencl/__init__.py
@@ -51,13 +51,14 @@ import sys
_PYPY = "__pypy__" in sys.builtin_module_names
-from pyopencl._cl import ( # noqa
+from pyopencl._cl import ( # noqa: F401
get_cl_header_version,
program_kind,
status_code,
platform_info,
device_type,
device_info,
+ device_topology_type_amd,
device_fp_config,
device_mem_cache_type,
device_local_mem_type,
@@ -148,9 +149,13 @@ from pyopencl._cl import ( # noqa
Image,
Sampler,
- DeviceTopologyAmd,
)
+try:
+ from pyopencl._cl import DeviceTopologyAmd # noqa: F401
+except ImportError:
+ pass
+
if not _PYPY:
# FIXME: Add back to default set when pypy support catches up
from pyopencl._cl import ( # noqa
diff --git a/src/clinfo_ext.h b/src/clinfo_ext.h
index 43b7b6082fda28ad433f26c5d9a5e2e743e24940..dc4d6a8e6b9dd42b58b1fdf5dafeadd5fb2a4671 100644
--- a/src/clinfo_ext.h
+++ b/src/clinfo_ext.h
@@ -71,6 +71,10 @@
#define CL_DEVICE_GFXIP_MAJOR_AMD 0x404A
#define CL_DEVICE_GFXIP_MINOR_AMD 0x404B
#define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD 0x404C
+#define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD 0x4030
+#define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD 0x4031
+#define CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD 0x4033
+#define CL_DEVICE_PCIE_ID_AMD 0x4034
#ifndef CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD
#define CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD 1
diff --git a/src/wrap_cl.hpp b/src/wrap_cl.hpp
index 1c7482d78b1bc68b3dedc2add7367bf277e5111b..42ee4c11cdea48dfc11043eeb09a68f631d20ada 100644
--- a/src/wrap_cl.hpp
+++ b/src/wrap_cl.hpp
@@ -364,7 +364,7 @@
-#define PYOPENCL_GET_INTEGRAL_INFO(WHAT, FIRST_ARG, SECOND_ARG, TYPE) \
+#define PYOPENCL_GET_TYPED_INFO(WHAT, FIRST_ARG, SECOND_ARG, TYPE) \
{ \
TYPE param_value; \
PYOPENCL_CALL_GUARDED(clGet##WHAT##Info, \
@@ -669,7 +669,7 @@ namespace pyopencl
py::object get_info(cl_device_info param_name) const
{
#define DEV_GET_INT_INF(TYPE) \
- PYOPENCL_GET_INTEGRAL_INFO(Device, m_device, param_name, TYPE);
+ PYOPENCL_GET_TYPED_INFO(Device, m_device, param_name, TYPE);
switch (param_name)
{
@@ -836,15 +836,15 @@ namespace pyopencl
// {{{ AMD dev attrs cl_amd_device_attribute_query
//
// types of AMD dev attrs divined from
-// https://www.khronos.org/registry/cl/api/1.2/cl.hpp
+// https://github.com/KhronosGroup/OpenCL-CLHPP/blob/3b03738fef487378b188d21cc5f2bae276aa8721/include/CL/opencl.hpp#L1471-L1500
#ifdef CL_DEVICE_PROFILING_TIMER_OFFSET_AMD
case CL_DEVICE_PROFILING_TIMER_OFFSET_AMD: DEV_GET_INT_INF(cl_ulong);
#endif
-/* FIXME
#ifdef CL_DEVICE_TOPOLOGY_AMD
case CL_DEVICE_TOPOLOGY_AMD:
+ PYOPENCL_GET_TYPED_INFO(
+ Device, m_device, param_name, cl_device_topology_amd);
#endif
-*/
#ifdef CL_DEVICE_BOARD_NAME_AMD
case CL_DEVICE_BOARD_NAME_AMD: ;
PYOPENCL_GET_STR_INFO(Device, m_device, param_name);
@@ -875,6 +875,17 @@ namespace pyopencl
#ifdef CL_DEVICE_LOCAL_MEM_BANKS_AMD
case CL_DEVICE_LOCAL_MEM_BANKS_AMD: DEV_GET_INT_INF(cl_uint);
#endif
+// FIXME: MISSING:
+//
+// CL_DEVICE_THREAD_TRACE_SUPPORTED_AMD
+// CL_DEVICE_GFXIP_MAJOR_AMD
+// CL_DEVICE_GFXIP_MINOR_AMD
+// CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD
+// CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD
+// CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD
+// CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD
+// CL_DEVICE_PCIE_ID_AMD
+
// }}}
#ifdef CL_DEVICE_MAX_ATOMIC_COUNTERS_EXT
@@ -1037,7 +1048,7 @@ namespace pyopencl
switch (param_name)
{
case CL_CONTEXT_REFERENCE_COUNT:
- PYOPENCL_GET_INTEGRAL_INFO(
+ PYOPENCL_GET_TYPED_INFO(
Context, m_context, param_name, cl_uint);
case CL_CONTEXT_DEVICES:
@@ -1101,7 +1112,7 @@ namespace pyopencl
#if PYOPENCL_CL_VERSION >= 0x1010
case CL_CONTEXT_NUM_DEVICES:
- PYOPENCL_GET_INTEGRAL_INFO(
+ PYOPENCL_GET_TYPED_INFO(
Context, m_context, param_name, cl_uint);
#endif
@@ -1438,10 +1449,10 @@ namespace pyopencl
PYOPENCL_GET_OPAQUE_INFO(CommandQueue, m_queue, param_name,
cl_device_id, device);
case CL_QUEUE_REFERENCE_COUNT:
- PYOPENCL_GET_INTEGRAL_INFO(CommandQueue, m_queue, param_name,
+ PYOPENCL_GET_TYPED_INFO(CommandQueue, m_queue, param_name,
cl_uint);
case CL_QUEUE_PROPERTIES:
- PYOPENCL_GET_INTEGRAL_INFO(CommandQueue, m_queue, param_name,
+ PYOPENCL_GET_TYPED_INFO(CommandQueue, m_queue, param_name,
cl_command_queue_properties);
default:
@@ -1517,13 +1528,13 @@ namespace pyopencl
PYOPENCL_GET_OPAQUE_INFO(Event, m_event, param_name,
cl_command_queue, command_queue);
case CL_EVENT_COMMAND_TYPE:
- PYOPENCL_GET_INTEGRAL_INFO(Event, m_event, param_name,
+ PYOPENCL_GET_TYPED_INFO(Event, m_event, param_name,
cl_command_type);
case CL_EVENT_COMMAND_EXECUTION_STATUS:
- PYOPENCL_GET_INTEGRAL_INFO(Event, m_event, param_name,
+ PYOPENCL_GET_TYPED_INFO(Event, m_event, param_name,
cl_int);
case CL_EVENT_REFERENCE_COUNT:
- PYOPENCL_GET_INTEGRAL_INFO(Event, m_event, param_name,
+ PYOPENCL_GET_TYPED_INFO(Event, m_event, param_name,
cl_uint);
#if PYOPENCL_CL_VERSION >= 0x1010
case CL_EVENT_CONTEXT:
@@ -1547,7 +1558,7 @@ namespace pyopencl
#if PYOPENCL_CL_VERSION >= 0x2000
case CL_PROFILING_COMMAND_COMPLETE:
#endif
- PYOPENCL_GET_INTEGRAL_INFO(EventProfiling, m_event, param_name,
+ PYOPENCL_GET_TYPED_INFO(EventProfiling, m_event, param_name,
cl_ulong);
default:
throw error("Event.get_profiling_info", CL_INVALID_VALUE);
@@ -2462,7 +2473,7 @@ namespace pyopencl
switch (param_name)
{
case CL_IMAGE_FORMAT:
- PYOPENCL_GET_INTEGRAL_INFO(Image, data(), param_name,
+ PYOPENCL_GET_TYPED_INFO(Image, data(), param_name,
cl_image_format);
case CL_IMAGE_ELEMENT_SIZE:
case CL_IMAGE_ROW_PITCH:
@@ -2473,7 +2484,7 @@ namespace pyopencl
#if PYOPENCL_CL_VERSION >= 0x1020
case CL_IMAGE_ARRAY_SIZE:
#endif
- PYOPENCL_GET_INTEGRAL_INFO(Image, data(), param_name, size_t);
+ PYOPENCL_GET_TYPED_INFO(Image, data(), param_name, size_t);
#if PYOPENCL_CL_VERSION >= 0x1020
case CL_IMAGE_BUFFER:
@@ -2492,7 +2503,7 @@ namespace pyopencl
case CL_IMAGE_NUM_MIP_LEVELS:
case CL_IMAGE_NUM_SAMPLES:
- PYOPENCL_GET_INTEGRAL_INFO(Image, data(), param_name, cl_uint);
+ PYOPENCL_GET_TYPED_INFO(Image, data(), param_name, cl_uint);
#endif
default:
@@ -3566,19 +3577,19 @@ namespace pyopencl
switch (param_name)
{
case CL_SAMPLER_REFERENCE_COUNT:
- PYOPENCL_GET_INTEGRAL_INFO(Sampler, m_sampler, param_name,
+ PYOPENCL_GET_TYPED_INFO(Sampler, m_sampler, param_name,
cl_uint);
case CL_SAMPLER_CONTEXT:
PYOPENCL_GET_OPAQUE_INFO(Sampler, m_sampler, param_name,
cl_context, context);
case CL_SAMPLER_ADDRESSING_MODE:
- PYOPENCL_GET_INTEGRAL_INFO(Sampler, m_sampler, param_name,
+ PYOPENCL_GET_TYPED_INFO(Sampler, m_sampler, param_name,
cl_addressing_mode);
case CL_SAMPLER_FILTER_MODE:
- PYOPENCL_GET_INTEGRAL_INFO(Sampler, m_sampler, param_name,
+ PYOPENCL_GET_TYPED_INFO(Sampler, m_sampler, param_name,
cl_filter_mode);
case CL_SAMPLER_NORMALIZED_COORDS:
- PYOPENCL_GET_INTEGRAL_INFO(Sampler, m_sampler, param_name,
+ PYOPENCL_GET_TYPED_INFO(Sampler, m_sampler, param_name,
cl_bool);
default:
@@ -3631,13 +3642,13 @@ namespace pyopencl
switch (param_name)
{
case CL_PROGRAM_REFERENCE_COUNT:
- PYOPENCL_GET_INTEGRAL_INFO(Program, m_program, param_name,
+ PYOPENCL_GET_TYPED_INFO(Program, m_program, param_name,
cl_uint);
case CL_PROGRAM_CONTEXT:
PYOPENCL_GET_OPAQUE_INFO(Program, m_program, param_name,
cl_context, context);
case CL_PROGRAM_NUM_DEVICES:
- PYOPENCL_GET_INTEGRAL_INFO(Program, m_program, param_name,
+ PYOPENCL_GET_TYPED_INFO(Program, m_program, param_name,
cl_uint);
case CL_PROGRAM_DEVICES:
{
@@ -3703,7 +3714,7 @@ namespace pyopencl
// }}}
#if PYOPENCL_CL_VERSION >= 0x1020
case CL_PROGRAM_NUM_KERNELS:
- PYOPENCL_GET_INTEGRAL_INFO(Program, m_program, param_name,
+ PYOPENCL_GET_TYPED_INFO(Program, m_program, param_name,
size_t);
case CL_PROGRAM_KERNEL_NAMES:
PYOPENCL_GET_STR_INFO(Program, m_program, param_name);
@@ -3722,7 +3733,7 @@ namespace pyopencl
{
#define PYOPENCL_FIRST_ARG m_program, dev.data() // hackety hack
case CL_PROGRAM_BUILD_STATUS:
- PYOPENCL_GET_INTEGRAL_INFO(ProgramBuild,
+ PYOPENCL_GET_TYPED_INFO(ProgramBuild,
PYOPENCL_FIRST_ARG, param_name,
cl_build_status);
case CL_PROGRAM_BUILD_OPTIONS:
@@ -3731,13 +3742,13 @@ namespace pyopencl
PYOPENCL_FIRST_ARG, param_name);
#if PYOPENCL_CL_VERSION >= 0x1020
case CL_PROGRAM_BINARY_TYPE:
- PYOPENCL_GET_INTEGRAL_INFO(ProgramBuild,
+ PYOPENCL_GET_TYPED_INFO(ProgramBuild,
PYOPENCL_FIRST_ARG, param_name,
cl_program_binary_type);
#endif
#if PYOPENCL_CL_VERSION >= 0x2000
case CL_PROGRAM_BUILD_GLOBAL_VARIABLE_TOTAL_SIZE:
- PYOPENCL_GET_INTEGRAL_INFO(ProgramBuild,
+ PYOPENCL_GET_TYPED_INFO(ProgramBuild,
PYOPENCL_FIRST_ARG, param_name,
size_t);
#endif
@@ -4189,7 +4200,7 @@ namespace pyopencl
PYOPENCL_GET_STR_INFO(Kernel, m_kernel, param_name);
case CL_KERNEL_NUM_ARGS:
case CL_KERNEL_REFERENCE_COUNT:
- PYOPENCL_GET_INTEGRAL_INFO(Kernel, m_kernel, param_name,
+ PYOPENCL_GET_TYPED_INFO(Kernel, m_kernel, param_name,
cl_uint);
case CL_KERNEL_CONTEXT:
PYOPENCL_GET_OPAQUE_INFO(Kernel, m_kernel, param_name,
@@ -4215,7 +4226,7 @@ namespace pyopencl
{
#define PYOPENCL_FIRST_ARG m_kernel, dev.data() // hackety hack
case CL_KERNEL_WORK_GROUP_SIZE:
- PYOPENCL_GET_INTEGRAL_INFO(KernelWorkGroup,
+ PYOPENCL_GET_TYPED_INFO(KernelWorkGroup,
PYOPENCL_FIRST_ARG, param_name,
size_t);
case CL_KERNEL_COMPILE_WORK_GROUP_SIZE:
@@ -4230,13 +4241,13 @@ namespace pyopencl
#if PYOPENCL_CL_VERSION >= 0x1010
case CL_KERNEL_PRIVATE_MEM_SIZE:
#endif
- PYOPENCL_GET_INTEGRAL_INFO(KernelWorkGroup,
+ PYOPENCL_GET_TYPED_INFO(KernelWorkGroup,
PYOPENCL_FIRST_ARG, param_name,
cl_ulong);
#if PYOPENCL_CL_VERSION >= 0x1010
case CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE:
- PYOPENCL_GET_INTEGRAL_INFO(KernelWorkGroup,
+ PYOPENCL_GET_TYPED_INFO(KernelWorkGroup,
PYOPENCL_FIRST_ARG, param_name,
size_t);
#endif
@@ -4256,12 +4267,12 @@ namespace pyopencl
{
#define PYOPENCL_FIRST_ARG m_kernel, arg_index // hackety hack
case CL_KERNEL_ARG_ADDRESS_QUALIFIER:
- PYOPENCL_GET_INTEGRAL_INFO(KernelArg,
+ PYOPENCL_GET_TYPED_INFO(KernelArg,
PYOPENCL_FIRST_ARG, param_name,
cl_kernel_arg_address_qualifier);
case CL_KERNEL_ARG_ACCESS_QUALIFIER:
- PYOPENCL_GET_INTEGRAL_INFO(KernelArg,
+ PYOPENCL_GET_TYPED_INFO(KernelArg,
PYOPENCL_FIRST_ARG, param_name,
cl_kernel_arg_access_qualifier);
@@ -4270,7 +4281,7 @@ namespace pyopencl
PYOPENCL_GET_STR_INFO(KernelArg, PYOPENCL_FIRST_ARG, param_name);
case CL_KERNEL_ARG_TYPE_QUALIFIER:
- PYOPENCL_GET_INTEGRAL_INFO(KernelArg,
+ PYOPENCL_GET_TYPED_INFO(KernelArg,
PYOPENCL_FIRST_ARG, param_name,
cl_kernel_arg_type_qualifier);
#undef PYOPENCL_FIRST_ARG
@@ -4476,9 +4487,9 @@ namespace pyopencl
switch (param_name)
{
case CL_GL_TEXTURE_TARGET:
- PYOPENCL_GET_INTEGRAL_INFO(GLTexture, data(), param_name, GLenum);
+ PYOPENCL_GET_TYPED_INFO(GLTexture, data(), param_name, GLenum);
case CL_GL_MIPMAP_LEVEL:
- PYOPENCL_GET_INTEGRAL_INFO(GLTexture, data(), param_name, GLint);
+ PYOPENCL_GET_TYPED_INFO(GLTexture, data(), param_name, GLint);
default:
throw error("MemoryObject.get_gl_texture_info", CL_INVALID_VALUE);
@@ -4729,22 +4740,22 @@ namespace pyopencl
switch (param_name)
{
case CL_MEM_TYPE:
- PYOPENCL_GET_INTEGRAL_INFO(MemObject, data(), param_name,
+ PYOPENCL_GET_TYPED_INFO(MemObject, data(), param_name,
cl_mem_object_type);
case CL_MEM_FLAGS:
- PYOPENCL_GET_INTEGRAL_INFO(MemObject, data(), param_name,
+ PYOPENCL_GET_TYPED_INFO(MemObject, data(), param_name,
cl_mem_flags);
case CL_MEM_SIZE:
- PYOPENCL_GET_INTEGRAL_INFO(MemObject, data(), param_name,
+ PYOPENCL_GET_TYPED_INFO(MemObject, data(), param_name,
size_t);
case CL_MEM_HOST_PTR:
throw pyopencl::error("MemoryObject.get_info", CL_INVALID_VALUE,
"Use MemoryObject.get_host_array to get host pointer.");
case CL_MEM_MAP_COUNT:
- PYOPENCL_GET_INTEGRAL_INFO(MemObject, data(), param_name,
+ PYOPENCL_GET_TYPED_INFO(MemObject, data(), param_name,
cl_uint);
case CL_MEM_REFERENCE_COUNT:
- PYOPENCL_GET_INTEGRAL_INFO(MemObject, data(), param_name,
+ PYOPENCL_GET_TYPED_INFO(MemObject, data(), param_name,
cl_uint);
case CL_MEM_CONTEXT:
PYOPENCL_GET_OPAQUE_INFO(MemObject, data(), param_name,
@@ -4765,7 +4776,7 @@ namespace pyopencl
return create_mem_object_wrapper(param_value);
}
case CL_MEM_OFFSET:
- PYOPENCL_GET_INTEGRAL_INFO(MemObject, data(), param_name,
+ PYOPENCL_GET_TYPED_INFO(MemObject, data(), param_name,
size_t);
#endif
diff --git a/src/wrap_cl_part_2.cpp b/src/wrap_cl_part_2.cpp
index cbd1f9a40f85ee0c71be5adfe38bc8cd1cd20e50..175b5aa5932a16ac0528bb7656778f179b490f6f 100644
--- a/src/wrap_cl_part_2.cpp
+++ b/src/wrap_cl_part_2.cpp
@@ -552,41 +552,6 @@ void pyopencl_expose_part_2(py::module &m)
#endif
// }}}
- // {{{ CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD
-
- {
- typedef cl_device_topology_amd cls;
- py::class_<cls>(m, "DeviceTopologyAmd")
- .def(py::init(
- [](cl_char bus, cl_char device, cl_char function)
- {
- cl_device_topology_amd result;
- result.pcie.bus = bus;
- result.pcie.device = device;
- result.pcie.function = function;
- return result;
- }),
- py::arg("bus")=0,
- py::arg("device")=0,
- py::arg("function")=0)
-
- .def_property("type",
- [](cls &t) { return t.pcie.type; },
- [](cls &t, cl_uint val) { t.pcie.type = val; })
-
- .def_property("bus",
- [](cls &t) { return t.pcie.bus; },
- [](cls &t, cl_char val) { t.pcie.bus = val; })
- .def_property("device",
- [](cls &t) { return t.pcie.device; },
- [](cls &t, cl_char val) { t.pcie.device = val; })
- .def_property("function",
- [](cls &t) { return t.pcie.function; },
- [](cls &t, cl_char val) { t.pcie.function = val; })
- ;
- }
-
- // }}}
}
diff --git a/src/wrap_constants.cpp b/src/wrap_constants.cpp
index 2420be38b9849a32a46c135735b163aa4daec974..4b40e85b922883a0699e4d0ca4ff57baf3784596 100644
--- a/src/wrap_constants.cpp
+++ b/src/wrap_constants.cpp
@@ -40,6 +40,7 @@ namespace
class platform_info { };
class device_type { };
class device_info { };
+ class device_topology_type_amd { };
class device_fp_config { };
class device_mem_cache_type { };
class device_local_mem_type { };
@@ -358,6 +359,7 @@ void pyopencl_expose_constants(py::module &m)
ADD_ATTR(DEVICE_, PCI_SLOT_ID_NV);
#endif
#endif
+
// {{{ cl_amd_device_attribute_query
#ifdef CL_DEVICE_PROFILING_TIMER_OFFSET_AMD
ADD_ATTR(DEVICE_, PROFILING_TIMER_OFFSET_AMD);
@@ -398,7 +400,6 @@ void pyopencl_expose_constants(py::module &m)
#ifdef CL_DEVICE_LOCAL_MEM_BANKS_AMD
ADD_ATTR(DEVICE_, LOCAL_MEM_BANKS_AMD);
#endif
-// }}}
#ifdef CL_DEVICE_THREAD_TRACE_SUPPORTED_AMD
ADD_ATTR(DEVICE_, THREAD_TRACE_SUPPORTED_AMD);
#endif
@@ -411,6 +412,19 @@ void pyopencl_expose_constants(py::module &m)
#ifdef CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD
ADD_ATTR(DEVICE_, AVAILABLE_ASYNC_QUEUES_AMD);
#endif
+#ifdef CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD
+ ADD_ATTR(DEVICE_, PREFERRED_WORK_GROUP_SIZE_AMD);
+#endif
+#ifdef CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD
+ ADD_ATTR(DEVICE_, MAX_WORK_GROUP_SIZE_AMD);
+#endif
+#ifdef CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD
+ ADD_ATTR(DEVICE_, PREFERRED_CONSTANT_BUFFER_SIZE_AMD);
+#endif
+#ifdef CL_DEVICE_PCIE_ID_AMD
+ ADD_ATTR(DEVICE_, PCIE_ID_AMD);
+#endif
+// }}}
#ifdef CL_DEVICE_MAX_ATOMIC_COUNTERS_EXT
ADD_ATTR(DEVICE_, MAX_ATOMIC_COUNTERS_EXT);
@@ -487,6 +501,13 @@ void pyopencl_expose_constants(py::module &m)
#endif
}
+ {
+ py::class_<device_topology_type_amd> cls(m, "device_topology_type_amd");
+#ifdef CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD
+ cls.attr("PCIE") = CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD;
+#endif
+ }
+
{
py::class_<device_fp_config> cls(m, "device_fp_config");
ADD_ATTR(FP_, DENORM);
@@ -1018,6 +1039,45 @@ void pyopencl_expose_constants(py::module &m)
#endif
// }}}
+
+ // {{{ CL_DEVICE_TOPOLOGY_AMD
+
+#ifdef CL_DEVICE_TOPOLOGY_AMD
+ {
+ typedef cl_device_topology_amd cls;
+ py::class_<cls>(m, "DeviceTopologyAmd")
+ .def(py::init(
+ [](cl_char bus, cl_char device, cl_char function)
+ {
+ cl_device_topology_amd result;
+ result.pcie.bus = bus;
+ result.pcie.device = device;
+ result.pcie.function = function;
+ return result;
+ }),
+ py::arg("bus")=0,
+ py::arg("device")=0,
+ py::arg("function")=0)
+
+ .def_property("type",
+ [](cls &t) { return t.pcie.type; },
+ [](cls &t, cl_uint val) { t.pcie.type = val; })
+
+ .def_property("bus",
+ [](cls &t) { return t.pcie.bus; },
+ [](cls &t, cl_char val) { t.pcie.bus = val; })
+ .def_property("device",
+ [](cls &t) { return t.pcie.device; },
+ [](cls &t, cl_char val) { t.pcie.device = val; })
+ .def_property("function",
+ [](cls &t) { return t.pcie.function; },
+ [](cls &t, cl_char val) { t.pcie.function = val; })
+ ;
+ }
+#endif
+
+ // }}}
+
}