opencl_ruby_ffi 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abb565a3d9a1e180eebf1e28ab06d330a4ae2477522ba2b22c0211bf7c720bc4
-  data.tar.gz: 2e47f057d7cf5a79a3972f8a3ab1ac7291827020c607c465d357b58824683ec5
+  metadata.gz: 409ed20eac2dc9aa0d410563053699e18528cd62471903fd862ee2f31bb60a81
+  data.tar.gz: 670b281a4ab283be7a8c429474008e9e280987e8d81bc5222a853c32a10a569b
 SHA512:
-  metadata.gz: d144d10d5744d13cf235a2f0ff4b9fa2bb1df7d47fc4c9b4799c233d1f9e2dc71f30f66c84cdf4a55db197cb6a4175b654845ac6be97c03ed57ea4b931508a10
-  data.tar.gz: 29561be75358ae7ae658a365f602930ff62a4bf5854ca1a0f0547ff5b7c4703ca01bd19fc036b15b3a503a0b3990eaa482d0c95c66b0be1b388316fa09e3348b
+  metadata.gz: 9301ea0a86feed2d72684a63366ad1b6862cd8238497854b768044814940c3f7ec39a7badfa11d56cead96d0c01fddb64092b56d1399d5a8395ce6d9305754f9
+  data.tar.gz: 8fa725c1e61931b3d9cdff0cf5d557055398ecf058d56289a72bca1ee3d2e54f80d279266e2185177ac59f9386f32422054e6437e19f23f452a65c060c45fe0c

data/lib/opencl_ruby_ffi/Buffer.rb

@@ -13,11 +13,17 @@ module OpenCL
   # 
   # * +:flags+ - a single or an Array of :cl_mem_flags specifying the flags to be used when creating the Buffer
   # * +:host_ptr+ - if provided, the Pointer (or convertible to Pointer using to_ptr) to the memory area to use
+  # * +:properties+ - if provided, an array of :cl_mem_properties (OpenCL 3.0)
   def self.create_buffer( context, size, options = {} )
     flags = get_flags( options )
     host_ptr = options[:host_ptr]
     error = MemoryPointer::new( :cl_int )
-    buff = clCreateBuffer(context, flags, size, host_ptr, error)
+    if context.platform.version_number < 3.0 then
+      buff = clCreateBuffer(context, flags, size, host_ptr, error)
+    else
+      properties = get_mem_properties( options )
+      buff = clCreateBufferWithProperties(context, properties, flags, size, host_ptr, error)
+    end
     error_check(error.read_cl_int)
     return Buffer::new( buff, false )
   end

data/lib/opencl_ruby_ffi/CommandQueue.rb

@@ -566,7 +566,7 @@ module OpenCL
     objs = nil
     if num_objs > 0 then
       objs = MemoryPointer::new(  Mem, num_objs )
-      [mem_objects].flatten.each_with_index { |o, i|
+      [mem_objects].flatten.each_with_index { |e, i|
         objs[i].write_pointer(e)
       }
     end
@@ -600,7 +600,7 @@ module OpenCL
     objs = nil
     if num_objs > 0 then
       objs = MemoryPointer::new( Mem, num_objs )
-      [mem_objects].flatten.each_with_index { |o, i|
+      [mem_objects].flatten.each_with_index { |e, i|
         objs[i].write_pointer(e)
       }
     end
@@ -1790,10 +1790,17 @@ module OpenCL
 
     end
 
+    module OpenCL30
+      extend InnerGenerator
+
+      get_info_array("CommandQueue", :cl_queue_properties, "properties_array")
+    end
+
     register_extension( :v11, OpenCL11, "device.platform.version_number >= 1.1" )
     register_extension( :v12, OpenCL12, "device.platform.version_number >= 1.2" )
     register_extension( :v20, OpenCL20, "device.platform.version_number >= 2.0" )
     register_extension( :v21, OpenCL21, "device.platform.version_number >= 2.1" )
+    register_extension( :v30, OpenCL30, "device.platform.version_number >= 3.0" )
 
   end
 

data/lib/opencl_ruby_ffi/Context.rb

@@ -25,7 +25,16 @@ module OpenCL
     error = MemoryPointer::new( :cl_int )
     ptr = clCreateContext(properties, devs.size, pointer, block, user_data, error)
     error_check(error.read_cl_int)
-    return Context::new(ptr, false)
+    context = Context::new(ptr, false)
+    if block && context.platform.version_number >= 3.0
+      callback_destructor_callback = lambda { |c, u|
+        @@callbacks.delete(block)
+        @@callbacks.delete(callback_destructor_callback)
+      }
+      @@callbacks[callback_destructor_callback] = nil
+      context.set_destructor_callback(&callback_destructor_callback)
+    end
+    return context
   end
 
   # Creates an Context using devices of the selected type
@@ -49,7 +58,16 @@ module OpenCL
     error = MemoryPointer::new( :cl_int )
     ptr = clCreateContextFromType(properties, type, block, user_data, error)
     error_check(error.read_cl_int)
-    return Context::new(ptr, false)
+    context = Context::new(ptr, false)
+    if block && context.platform.version_number >= 3.0
+      callback_destructor_callback = lambda { |c, u|
+        @@callbacks.delete(block)
+        @@callbacks.delete(callback_destructor_callback)
+      }
+      @@callbacks[callback_destructor_callback] = nil
+      context.set_destructor_callback(&callback_destructor_callback)
+    end
+    return context
   end
 
   def self.set_default_device_command_queue( context, device, command_queue )
@@ -59,6 +77,32 @@ module OpenCL
     return context
   end
 
+  # Attaches a callback to context that will be called on context destruction
+  #
+  # ==== Attributes
+  #
+  # * +context+ - the Program to attach the callback to
+  # * +options+ - a hash containing named options
+  # * +block+ - if provided, a callback invoked when program is released. Signature of the callback is { |Pointer to the context, Pointer to user_data| ... }
+  #
+  # ==== Options
+  #
+  # * +:user_data+ - a Pointer (or convertible to Pointer using to_ptr) to the memory area to pass to the callback
+  def self.set_context_destructor_callback( context, options = {}, &block )
+    if block
+      wrapper_block = lambda { |p, u|
+        block.call(p, u)
+        @@callbacks.delete(wrapper_block)
+      }
+      @@callbacks[wrapper_block] = options[:user_data]
+    else
+      wrapper_block = nil
+    end
+    error = clSetContextDestructorCallback( context, wrapper_block, options[:user_data] )
+    error_check(error)
+    return context
+  end
+
   #Maps the cl_context object of OpenCL
   class Context
     include InnerInterface
@@ -459,16 +503,36 @@ module OpenCL
         return OpenCL.create_program_with_il(self, il)
       end
 
+      # 
       def set_default_device_command_queue( device, command_queue )
         return OpenCL.set_default_device_command_queue( self, device, command_queue )
       end
 
     end
 
+    module OpenCL30
+      
+      # Attaches a callback to context that will be called on context destruction
+      #
+      # ==== Attributes
+      #
+      # * +options+ - a hash containing named options
+      # * +block+ - if provided, a callback invoked when program is released. Signature of the callback is { |Pointer to the context, Pointer to user_data| ... }
+      #
+      # ==== Options
+      #
+      # * +:user_data+ - a Pointer (or convertible to Pointer using to_ptr) to the memory area to pass to the callback
+      def set_destructor_callback( options = {}, &block )
+        OpenCL.set_context_destructor_callback( self, option, &block )
+        return self
+      end
+    end
+
     register_extension( :v11, OpenCL11, "platform.version_number >= 1.1" )
     register_extension( :v12, OpenCL12, "platform.version_number >= 1.2" )
     register_extension( :v20, OpenCL20, "platform.version_number >= 2.0" )
     register_extension( :v21, OpenCL21, "platform.version_number >= 2.1" )
+    register_extension( :v30, OpenCL30, "platform.version_number >= 3.0" )
 
   end
 

data/lib/opencl_ruby_ffi/Device.rb

@@ -366,10 +366,90 @@ module OpenCL
 
     end
 
-    register_extension( :v11,  OpenCL11, "platform.version_number >= 1.1" )
-    register_extension( :v12,  OpenCL12, "platform.version_number >= 1.2" )
-    register_extension( :v20,  OpenCL20, "platform.version_number >= 2.0" )
-    register_extension( :v21,  OpenCL21, "platform.version_number >= 2.1" )
+    module OpenCL30
+      extend InnerGenerator
+      get_info("Device", :cl_device_atomic_capabilities, "atomic_memory_capabilities")
+      get_info("Device", :cl_device_atomic_capabilities, "atomic_fence_capabilities")
+      get_info("Device", :cl_bool, "non_uniform_work_group_support")
+      get_info("Device", :size_t, "preferred_work_group_size_multiple")
+      get_info("Device", :cl_bool, "work_group_collective_functions_support")
+      get_info("Device", :cl_bool, "generic_address_space_support")
+      get_info("Device", :cl_bool, "device_enqueue_support")
+      get_info("Device", :cl_bool, "pipe_support")
+
+      def numeric_version
+        ptr = MemoryPointer::new( :cl_version )
+        error = OpenCL.clGetDeviceInfo( self, NUMERIC_VERSION, 4, ptr, nil)
+        error_check(error)
+        return Version::from_int(ptr.read_cl_version)
+      end
+
+      def extensions_with_version
+        sz = MemoryPointer::new( :size_t )
+        error = OpenCL.clGetDeviceInfo( self, EXTENSIONS_WITH_VERSION, 0, nil, sz)
+        error_check(error)
+        sz = sz.read_size_t
+        ptr = MemoryPointer::new( sz )
+        error = OpenCL.clGetDeviceInfo( self, EXTENSIONS_WITH_VERSION, sz, ptr, nil)
+        error_check(error)
+        nvsz = NameVersion.size
+        return (sz/nvsz).times.collect { |i| NameVersion::new(ptr + i*nvsz) }
+      end
+
+      def ils_with_version
+        sz = MemoryPointer::new( :size_t )
+        error = OpenCL.clGetDeviceInfo( self, ILS_WITH_VERSION, 0, nil, sz)
+        error_check(error)
+        sz = sz.read_size_t
+        ptr = MemoryPointer::new( sz )
+        error = OpenCL.clGetDeviceInfo( self, ILS_WITH_VERSION, sz, ptr, nil)
+        error_check(error)
+        nvsz = NameVersion.size
+        return (sz/nvsz).times.collect { |i| NameVersion::new(ptr + i*nvsz) }
+      end
+
+      def built_in_kernels_with_version
+        sz = MemoryPointer::new( :size_t )
+        error = OpenCL.clGetDeviceInfo( self, BUILT_IN_KERNELS_WITH_VERSION, 0, nil, sz)
+        error_check(error)
+        sz = sz.read_size_t
+        ptr = MemoryPointer::new( sz )
+        error = OpenCL.clGetDeviceInfo( self, BUILT_IN_KERNELS_WITH_VERSION, sz, ptr, nil)
+        error_check(error)
+        nvsz = NameVersion.size
+        return (sz/nvsz).times.collect { |i| NameVersion::new(ptr + i*nvsz) }
+      end
+
+      def opencl_c_all_versions
+        sz = MemoryPointer::new( :size_t )
+        error = OpenCL.clGetDeviceInfo( self, OPENCL_C_ALL_VERSIONS, 0, nil, sz)
+        error_check(error)
+        sz = sz.read_size_t
+        ptr = MemoryPointer::new( sz )
+        error = OpenCL.clGetDeviceInfo( self, OPENCL_C_ALL_VERSIONS, sz, ptr, nil)
+        error_check(error)
+        nvsz = NameVersion.size
+        return (sz/nvsz).times.collect { |i| NameVersion::new(ptr + i*nvsz) }
+      end
+
+      def opencl_c_features
+        sz = MemoryPointer::new( :size_t )
+        error = OpenCL.clGetDeviceInfo( self, OPENCL_C_FEATURES, 0, nil, sz)
+        error_check(error)
+        sz = sz.read_size_t
+        ptr = MemoryPointer::new( sz )
+        error = OpenCL.clGetDeviceInfo( self, OPENCL_C_FEATURES, sz, ptr, nil)
+        error_check(error)
+        nvsz = NameVersion.size
+        return (sz/nvsz).times.collect { |i| NameVersion::new(ptr + i*nvsz) }
+      end
+    end
+
+    register_extension( :v11, OpenCL11, "platform.version_number >= 1.1" )
+    register_extension( :v12, OpenCL12, "platform.version_number >= 1.2" )
+    register_extension( :v20, OpenCL20, "platform.version_number >= 2.0" )
+    register_extension( :v21, OpenCL21, "platform.version_number >= 2.1" )
+    register_extension( :v30, OpenCL30, "platform.version_number >= 3.0" )
 
   end
 

data/lib/opencl_ruby_ffi/Image.rb

@@ -13,11 +13,17 @@ module OpenCL
   # 
   # * +:flags+ - a single or an Array of :cl_mem_flags specifying the flags to be used when creating the Image
   # * +:host_ptr+ - if provided, the Pointer (or convertible to Pointer using to_ptr) to the memory area to use
+  # * +:properties+ - if provided, an array of :cl_mem_properties (OpenCL 3.0)
   def self.create_image( context, format, desc, options = {} )
     flags = get_flags( options )
     host_ptr = options[:host_ptr]
     error = MemoryPointer::new( :cl_int )
-    img_ptr = clCreateImage( context, flags, format, desc, host_ptr, error )
+    if context.platform.version_number < 3.0 then
+      img_ptr = clCreateImage( context, flags, format, desc, host_ptr, error )
+    else
+      properties = get_mem_properties( options )
+      img_ptr = clCreateImageWithProperties( context, properties, flags, format, desc, host_ptr, error )
+    end
     error_check(error.read_cl_int)
     return Image::new(img_ptr, false)
   end

data/lib/opencl_ruby_ffi/Mem.rb

@@ -130,11 +130,17 @@ module OpenCL
       extend InnerGenerator
 
       get_info("Mem", :cl_bool, "uses_svm_pointer", true)
+    end
+
+    module OpenCL30
+      extend InnerGenerator
 
+      get_info_array("Mem", :cl_mem_properties, "properties")
     end
 
     register_extension( :v11,  OpenCL11, "platform.version_number >= 1.1" )
     register_extension( :v20,  OpenCL20, "platform.version_number >= 2.0" )
+    register_extension( :v30,  OpenCL30, "platform.version_number >= 3.0" )
 
   end
 

data/lib/opencl_ruby_ffi/Pipe.rb

@@ -34,6 +34,14 @@ module OpenCL
     get_info("Pipe", :cl_uint, "packet_size")
     get_info("Pipe", :cl_uint, "max_packets")
 
+    module OpenCL30
+      extend InnerGenerator
+
+      get_info_array("Pipe", :cl_pipe_properties, "properties")
+    end
+
+    register_extension( :v30,  Pipe::OpenCL30, "platform.version_number >= 3.0" )
+
   end
 
 end

data/lib/opencl_ruby_ffi/Platform.rb

@@ -181,8 +181,33 @@ module OpenCL
 
     end
 
+    module OpenCL30
+      extend InnerGenerator
+
+      def numeric_version
+        ptr = MemoryPointer::new( :cl_version )
+        error = OpenCL.clGetPlatformInfo( self, NUMERIC_VERSION, 4, ptr, nil)
+        error_check(error)
+        return Version::from_int(ptr.read_cl_version)
+      end
+
+      def extensions_with_version
+        sz = MemoryPointer::new( :size_t )
+        error = OpenCL.clGetPlatformInfo( self, EXTENSIONS_WITH_VERSION, 0, nil, sz)
+        error_check(error)
+        sz = sz.read_size_t
+        ptr = MemoryPointer::new( sz )
+        error = OpenCL.clGetPlatformInfo( self, EXTENSIONS_WITH_VERSION, sz, ptr, nil)
+        error_check(error)
+        nvsz = NameVersion.size
+        return (sz/nvsz).times.collect { |i| NameVersion::new(ptr + i*nvsz) }
+      end
+
+    end
+
     register_extension( :v12, OpenCL12, "version_number >= 1.2" )
     register_extension( :v21, OpenCL21, "version_number >= 2.1" )
+    register_extension( :v30, OpenCL30, "version_number >= 3.0" )
 
   end
 

data/lib/opencl_ruby_ffi/ext.rb

@@ -9,3 +9,4 @@ require "opencl_ruby_ffi/ext/device_fission.rb"
 require "opencl_ruby_ffi/khr/sub_groups.rb"
 require "opencl_ruby_ffi/khr/priority_hints.rb"
 require "opencl_ruby_ffi/khr/throttle_hints.rb"
+require "opencl_ruby_ffi/khr/device_uuid.rb"

data/lib/opencl_ruby_ffi/khr/device_uuid.rb

@@ -0,0 +1,119 @@
+using OpenCLRefinements if RUBY_VERSION.scan(/\d+/).collect(&:to_i).first >= 2
+
+module OpenCL
+
+  UUID_SIZE_KHR = 16
+  LUID_SIZE_KHR = 8
+
+  DEVICE_UUID_KHR = 0x106A
+  DRIVER_UUID_KHR = 0x106B
+  DEVICE_LUID_VALID_KHR = 0x106C
+  DEVICE_LUID_KHR = 0x106D
+  DEVICE_NODE_MASK_KHR = 0x106E
+
+  class UUID < Struct
+    layout :id, [ OpenCL.find_type(:cl_uchar), UUID_SIZE_KHR ]
+    def to_s
+      a = self[:id].to_a
+      s = ""
+      s << "%02x" % a[15]
+      s << "%02x" % a[14]
+      s << "%02x" % a[13]
+      s << "%02x" % a[12]
+      s << "-"
+      s << "%02x" % a[11]
+      s << "%02x" % a[10]
+      s << "-"
+      s << "%02x" % a[9]
+      s << "%02x" % a[8]
+      s << "-"
+      s << "%02x" % a[7]
+      s << "%02x" % a[6]
+      s << "-"
+      s << "%02x" % a[5]
+      s << "%02x" % a[4]
+      s << "%02x" % a[3]
+      s << "%02x" % a[2]
+      s << "%02x" % a[1]
+      s << "%02x" % a[0]
+    end
+
+    def self.from_string(uuid)
+      new.from_string(uuid)
+    end
+
+    def from_string(uuid)
+      m = uuid.match(/(\h\h)(\h\h)(\h\h)(\h\h)-(\h\h)(\h\h)-(\h\h)(\h\h)-(\h\h)(\h\h)-(\h\h)(\h\h)(\h\h)(\h\h)(\h\h)(\h\h)/)
+      raise "invalid format" unless m
+      UUID_SIZE_KHR.times { |i|
+        self[:id][UUID_SIZE_KHR-1-i] = m[i+1].to_i(16)
+      }
+      self
+    end
+  end
+
+  class LUID < Struct
+    layout :id, [ OpenCL.find_type(:cl_uchar), LUID_SIZE_KHR ]
+    def to_s
+      a = self[:id].to_a
+      s = ""
+      s << "%02x" % a[7]
+      s << "%02x" % a[6]
+      s << "%02x" % a[5]
+      s << "%02x" % a[4]
+      s << "%02x" % a[3]
+      s << "%02x" % a[2]
+      s << "%02x" % a[1]
+      s << "%02x" % a[0]
+    end
+
+    def self.from_string(uuid)
+      new.from_string(uuid)
+    end
+
+    def from_string(uuid)
+      m = uuid.match(/(\h\h)(\h\h)(\h\h)(\h\h)(\h\h)(\h\h)(\h\h)(\h\h)/)
+      raise "invalid format" unless m
+      LUID_SIZE_KHR.times { |i|
+        self[:id][LUID_SIZE_KHR-1-i] = m[i+1].to_i(16)
+      }
+      self
+    end
+  end
+
+  class Device
+    UUID_KHR = 0x106A
+    LUID_VALID_KHR = 0x106C
+    LUID_KHR = 0x106D
+    NODE_MASK_KHR = 0x106E
+
+    module KHRDeviceUUID
+      extend InnerGenerator
+      get_info("Device", :cl_bool, "luid_valid_khr")
+      get_info("Device", :cl_uint, "node_mask_khr")
+
+      def uuid_khr
+        id = UUID.new
+        error = OpenCL.clGetDeviceInfo( self, UUID_KHR, UUID_SIZE_KHR, id, nil)
+        error_check(error)
+        return id
+      end
+
+      def driver_uuid_khr
+        id = UUID.new
+        error = OpenCL.clGetDeviceInfo( self, DRIVER_UUID_KHR, UUID_SIZE_KHR, id, nil)
+        error_check(error)
+        return id
+      end
+
+      def luid_khr
+        id = LUID.new
+        error = OpenCL.clGetDeviceInfo( self, LUID_KHR, LUID_SIZE_KHR, id, nil)
+        error_check(error)
+        return id
+      end
+    end
+    register_extension( :cl_khr_device_uuid, KHRDeviceUUID, "extensions.include?(\"cl_khr_device_uuid\")" )
+  end
+
+end

data/lib/opencl_ruby_ffi/opencl_ruby_ffi_base.rb

@@ -126,6 +126,76 @@ module OpenCL
     end
   end
 
+  class Version
+    include Comparable
+    MAJOR_BITS = 10
+    MINOR_BITS = 10
+    PATCH_BITS = 12
+    MAJOR_MASK = (1 << MAJOR_BITS) - 1
+    MINOR_MASK = (1 << MINOR_BITS) - 1
+    PATCH_MASK = (1 << PATCH_BITS) - 1
+
+    attr_reader :major, :minor, :patch
+    def initialize(major, minor = 0, patch = 0)
+      @major = major
+      @minor = minor
+      @patch = patch
+    end
+
+    def to_int
+      Version.make(@major, @minor, @patch)
+    end
+    alias to_i to_int
+
+    def <=>(other)
+      res = (@major <=> other.major)
+      res = (@minor <=> other.minor) if res == 0
+      res = (@patch <=> other.patch) if res == 0
+      res
+    end
+
+    def to_s
+      "#{@major}.#{@minor}.#{@patch}"
+    end
+
+    def self.major(v)
+      v >> (MINOR_BITS + PATCH_BITS)
+    end
+
+    def self.minor(v)
+      (v >> (PATCH_BITS)) & MINOR_MASK
+    end
+
+    def self.patch(v)
+      v & PATCH_MASK
+    end
+
+    def self.make(major, minor = 0, patch = 0)
+      ((major & MAJOR_MASK) << (MINOR_BITS + PATCH_BITS)) +
+      ((minor & MINOR_MASK) << PATCH_BITS) +
+       (patch & PATCH_MASK)
+    end
+
+    def self.from_int(v)
+      self.new(major(v), minor(v), patch(v))
+    end
+  end
+
+  # Maps the :cl_name_version type of OpenCL
+  class NameVersion < Struct
+    MAX_NAME_SIZE = 64
+    layout :version, :cl_version,
+           :name, [:char, MAX_NAME_SIZE]
+
+    def version
+      Version.from_int(self[:version])
+    end
+
+    def name
+      self[:name].to_s
+    end
+  end
+
   module InnerInterface
 
     private
@@ -169,7 +239,7 @@ module OpenCL
       end
       return properties
     end
-  
+
     # Extracts the origin_symbol and region_symbol named options for image from the given hash. Returns the read (or detemined suitable) origin and region in a tuple
     def get_origin_region( image, options, origin_symbol, region_symbol )
       origin = MemoryPointer::new( :size_t, 3 )
@@ -214,6 +284,19 @@ module OpenCL
       return properties
     end
   
+    # EXtracts the :properties named option (for a Mem) from the hash given and returns the properties values
+    def get_mem_properties( options )
+      properties = nil
+      if options[:properties] then
+        properties = MemoryPointer::new( :cl_mem_properties, options[:properties].length + 1 )
+        options[:properties].each_with_index { |e,i|
+          properties[i].write_cl_mem_properties(e.respond_to?(:to_ptr) ? e : e.to_i)
+        }
+        properties[options[:properties].length].write_cl_mem_properties(0)
+      end
+      return properties
+    end
+  
     # Extracts the :device_list named option from the hash given and returns [ number of devices, an Pointer to the list of Device or nil ]
     def get_device_list( options )
       devices = options[:device_list]
@@ -248,6 +331,7 @@ module OpenCL
       :cl_command_queue_properties => CommandQueue::Properties,
       :cl_device_affinity_domain => Device::AffinityDomain,
       :cl_device_svm_capabilities => Device::SVMCapabilities,
+      :cl_device_atomic_capabilities => Device::AtomicCapabilities,
       :cl_channel_order => ChannelOrder,
       :cl_channel_type => ChannelType,
       :cl_mem_flags => Mem::Flags,
@@ -287,11 +371,8 @@ module OpenCL
   module ExtensionInnerGenerator
 
     private
-    # Generates a new method for klass that use the given clGetKlassInfo extension of the object's platform, to read an info of the given type. The info queried is specified by name.
-    # @param [String] klass the property is to be found
-    # @param [Symbol] type of the property
-    # @param [String] name of the property
-    # @!macro [attach] get_info
+
+    # @!macro [attach] get_info_ext
     #   @!method $3
     #   Returns the OpenCL::$1::$3 info
     #   @return $2
@@ -347,11 +428,7 @@ EOF
       module_eval s
     end
 
-    # Generates a new method for klass that use the given clGetKlassInfo extension of the object's platform, to read an Array of element of the given type. The info queried is specified by name.
-    # @param [String] klass the property is to be found
-    # @param [Symbol] type of the property
-    # @param [String] name of the property
-    # @!macro [attach] get_info_array
+    # @!macro [attach] get_info_array_ext
     #   @!method $3
     #   Returns the OpenCL::$1::$3 info
     #   @return an Array of $2
@@ -409,10 +486,6 @@ EOF
 
     private
 
-    # Generates a new method for klass that use the apropriate clGetKlassInfo, to read an info of the given type. The info queried is specified by name.
-    # @param [String] klass the property is to be found
-    # @param [Symbol] type of the property
-    # @param [String] name of the property
     # @!macro [attach] get_info
     #   @!method $3
     #   Returns the OpenCL::$1::$3 info
@@ -465,11 +538,6 @@ EOF
       module_eval s
     end
 
-    # Generates a new method for klass that use the apropriate clGetKlassInfo, to read an Array of element of the given type. The info queried is specified by name.
-    # @param [String] klass the property is to be found
-    # @param [Symbol] type of the property
-    # @param [String] name of the property
-    # @param [Bool] 
     # @!macro [attach] get_info_array
     #   @!method $3
     #   Returns the OpenCL::$1::$3 info

data/lib/opencl_ruby_ffi/opencl_ruby_ffi_base_gen.rb

@@ -102,6 +102,8 @@ module OpenCL
   PLATFORM_VENDOR = 0x0903
   PLATFORM_EXTENSIONS = 0x0904
   PLATFORM_HOST_TIMER_RESOLUTION = 0x0905
+  PLATFORM_NUMERIC_VERSION = 0x0906
+  PLATFORM_EXTENSIONS_WITH_VERSION = 0x0907
   DEVICE_TYPE_DEFAULT = (1 << 0)
   DEVICE_TYPE_CPU = (1 << 1)
   DEVICE_TYPE_GPU = (1 << 2)
@@ -201,6 +203,20 @@ module OpenCL
   DEVICE_IL_VERSION = 0x105B
   DEVICE_MAX_NUM_SUB_GROUPS = 0x105C
   DEVICE_SUB_GROUP_INDEPENDENT_FORWARD_PROGRESS = 0x105D
+  DEVICE_NUMERIC_VERSION = 0x105E
+  DEVICE_EXTENSIONS_WITH_VERSION = 0x1060
+  DEVICE_ILS_WITH_VERSION = 0x1061
+  DEVICE_BUILT_IN_KERNELS_WITH_VERSION = 0x1062
+  DEVICE_ATOMIC_MEMORY_CAPABILITIES = 0x1063
+  DEVICE_ATOMIC_FENCE_CAPABILITIES = 0x1064
+  DEVICE_NON_UNIFORM_WORK_GROUP_SUPPORT = 0x1065
+  DEVICE_OPENCL_C_ALL_VERSIONS = 0x1066
+  DEVICE_PREFERRED_WORK_GROUP_SIZE_MULTIPLE = 0x1067
+  DEVICE_WORK_GROUP_COLLECTIVE_FUNCTIONS_SUPPORT = 0x1068
+  DEVICE_GENERIC_ADDRESS_SPACE_SUPPORT = 0x1069
+  DEVICE_OPENCL_C_FEATURES = 0x106F
+  DEVICE_DEVICE_ENQUEUE_SUPPORT = 0x1070
+  DEVICE_PIPE_SUPPORT = 0x1071
   FP_DENORM = (1 << 0)
   FP_INF_NAN = (1 << 1)
   FP_ROUND_TO_NEAREST = (1 << 2)
@@ -240,12 +256,20 @@ module OpenCL
   DEVICE_SVM_FINE_GRAIN_BUFFER = (1 << 1)
   DEVICE_SVM_FINE_GRAIN_SYSTEM = (1 << 2)
   DEVICE_SVM_ATOMICS = (1 << 3)
+  DEVICE_ATOMIC_ORDER_RELAXED = (1 << 0)
+  DEVICE_ATOMIC_ORDER_ACQ_REL = (1 << 1)
+  DEVICE_ATOMIC_ORDER_SEQ_CST = (1 << 2)
+  DEVICE_ATOMIC_SCOPE_WORK_ITEM = (1 << 3)
+  DEVICE_ATOMIC_SCOPE_WORK_GROUP = (1 << 4)
+  DEVICE_ATOMIC_SCOPE_DEVICE = (1 << 5)
+  DEVICE_ATOMIC_SCOPE_ALL_DEVICES = (1 << 6)
   QUEUE_CONTEXT = 0x1090
   QUEUE_DEVICE = 0x1091
   QUEUE_REFERENCE_COUNT = 0x1092
   QUEUE_PROPERTIES = 0x1093
   QUEUE_SIZE = 0x1094
   QUEUE_DEVICE_DEFAULT = 0x1095
+  QUEUE_PROPERTIES_ARRAY = 0x1098
   MEM_READ_WRITE = (1 << 0)
   MEM_WRITE_ONLY = (1 << 1)
   MEM_READ_ONLY = (1 << 2)
@@ -323,6 +347,7 @@ module OpenCL
   MEM_ASSOCIATED_MEMOBJECT = 0x1107
   MEM_OFFSET = 0x1108
   MEM_USES_SVM_POINTER = 0x1109
+  MEM_PROPERTIES = 0x110A
   IMAGE_FORMAT = 0x1110
   IMAGE_ELEMENT_SIZE = 0x1111
   IMAGE_ROW_PITCH = 0x1112
@@ -336,6 +361,7 @@ module OpenCL
   IMAGE_NUM_SAMPLES = 0x111A
   PIPE_PACKET_SIZE = 0x1120
   PIPE_MAX_PACKETS = 0x1121
+  PIPE_PROPERTIES = 0x1122
   ADDRESS_NONE = 0x1130
   ADDRESS_CLAMP_TO_EDGE = 0x1131
   ADDRESS_CLAMP = 0x1132
@@ -451,6 +477,7 @@ module OpenCL
   COMMAND_SVM_MEMFILL = 0x120B
   COMMAND_SVM_MAP = 0x120C
   COMMAND_SVM_UNMAP = 0x120D
+  COMMAND_SVM_MIGRATE_MEM = 0x120E
   COMPLETE = 0x0
   RUNNING = 0x1
   SUBMITTED = 0x2
@@ -482,6 +509,13 @@ module OpenCL
   MEM_HOST_WRITETHROUGH_QCOM = 0x40A6
   MEM_HOST_WRITE_COMBINING_QCOM = 0x40A7
   MEM_ION_HOST_PTR_QCOM = 0x40A8
+  NAME_VERSION_MAX_NAME_SIZE = 64
+  VERSION_MAJOR_BITS = 10
+  VERSION_MINOR_BITS = 10
+  VERSION_PATCH_BITS = 12
+  VERSION_MAJOR_MASK = (1 << VERSION_MAJOR_BITS) - 1
+  VERSION_MINOR_MASK = (1 << VERSION_MINOR_BITS) - 1
+  VERSION_PATCH_MASK = (1 << VERSION_PATCH_BITS) - 1
   # Parent class to map OpenCL errors, and is used to raise unknown errors
   class Error < StandardError
     attr_reader :code
@@ -695,8 +729,7 @@ EOF
 
     # Returns true if flag is bitwise included in the Bitfield
     def include?(flag)
-      return true if ( @val & flag ) == flag
-      return false
+      return ( @val & flag ) == flag
     end
 
     # Returns a String corresponding to the Bitfield description
@@ -744,7 +777,7 @@ EOF
       return @val
     end
 
-    # Setss the internal representation of the Bitfield to val
+    # Sets the internal representation of the Bitfield to val
     def flags=(val)
       @val = val
     end
@@ -799,6 +832,8 @@ EOF
     VENDOR = 0x0903
     EXTENSIONS = 0x0904
     HOST_TIMER_RESOLUTION = 0x0905
+    NUMERIC_VERSION = 0x0906
+    EXTENSIONS_WITH_VERSION = 0x0907
   
     # Creates a new Platform and retains it if specified and aplicable
     def initialize(ptr, retain = true)
@@ -914,6 +949,20 @@ EOF
     IL_VERSION = 0x105B
     MAX_NUM_SUB_GROUPS = 0x105C
     SUB_GROUP_INDEPENDENT_FORWARD_PROGRESS = 0x105D
+    NUMERIC_VERSION = 0x105E
+    EXTENSIONS_WITH_VERSION = 0x1060
+    ILS_WITH_VERSION = 0x1061
+    BUILT_IN_KERNELS_WITH_VERSION = 0x1062
+    ATOMIC_MEMORY_CAPABILITIES = 0x1063
+    ATOMIC_FENCE_CAPABILITIES = 0x1064
+    NON_UNIFORM_WORK_GROUP_SUPPORT = 0x1065
+    OPENCL_C_ALL_VERSIONS = 0x1066
+    PREFERRED_WORK_GROUP_SIZE_MULTIPLE = 0x1067
+    WORK_GROUP_COLLECTIVE_FUNCTIONS_SUPPORT = 0x1068
+    GENERIC_ADDRESS_SPACE_SUPPORT = 0x1069
+    OPENCL_C_FEATURES = 0x106F
+    DEVICE_ENQUEUE_SUPPORT = 0x1070
+    PIPE_SUPPORT = 0x1071
     PARTITION_EQUALLY = 0x1086
     PARTITION_BY_COUNTS = 0x1087
     PARTITION_BY_COUNTS_LIST_END = 0x0
@@ -929,6 +978,13 @@ EOF
     SVM_FINE_GRAIN_SYSTEM = (1 << 2)
     SVM_ATOMICS = (1 << 3)
     PAGE_SIZE_QCOM = 0x40A1
+    ATOMIC_ORDER_RELAXED = (1 << 0)
+    ATOMIC_ORDER_ACQ_REL = (1 << 1)
+    ATOMIC_ORDER_SEQ_CST = (1 << 2)
+    ATOMIC_SCOPE_WORK_ITEM = (1 << 3)
+    ATOMIC_SCOPE_WORK_GROUP = (1 << 4)
+    ATOMIC_SCOPE_DEVICE = (1 << 5)
+    ATOMIC_SCOPE_ALL_DEVICES = (1 << 6)
 
     #DEFINED in ext/device_fission.rb  
 #    # Creates a new Device and retains it if specified and aplicable
@@ -1079,6 +1135,25 @@ EOF
       end
     end
 
+    # Bitfield that maps the :cl_device_atomic_capabilities
+    class AtomicCapabilities < Bitfield
+      ORDER_RELAXED = (1 << 0)
+      ORDER_ACQ_REL = (1 << 1)
+      ORDER_SEQ_CST = (1 << 2)
+      SCOPE_WORK_ITEM = (1 << 3)
+      SCOPE_WORK_GROUP = (1 << 4)
+      SCOPE_DEVICE = (1 << 5)
+      SCOPE_ALL_DEVICES = (1 << 6)
+      # Returns an Array of String representing the different flags set
+      def names
+        fs = []
+        %w( ORDER_RELAXED ORDER_ACQ_REL ORDER_SEQ_CST SCOPE_WORK_ITEM SCOPE_WORK_GROUP SCOPE_DEVICE SCOPE_ALL_DEVICES ).each { |f|
+          fs.push(f) if self.include?( self.class.const_get(f) )
+        }
+        return fs
+      end
+    end
+
   end
   class Context < ExtendedStruct
     layout :dummy, :pointer
@@ -1132,6 +1207,7 @@ EOF
     PROPERTIES = 0x1093
     SIZE = 0x1094
     DEVICE_DEFAULT = 0x1095
+    PROPERTIES_ARRAY = 0x1098
     # Creates a new CommandQueue and retains it if specified and aplicable
     def initialize(ptr, retain = true)
       super(ptr)
@@ -1202,6 +1278,7 @@ EOF
     ASSOCIATED_MEMOBJECT = 0x1107
     OFFSET = 0x1108
     USES_SVM_POINTER = 0x1109
+    PROPERTIES = 0x110A
     HOST_UNCACHED_QCOM = 0x40A4
     HOST_WRITEBACK_QCOM = 0x40A5
     HOST_WRITETHROUGH_QCOM = 0x40A6
@@ -1737,6 +1814,7 @@ EOF
     SVM_MEMFILL = 0x120B
     SVM_MAP = 0x120C
     SVM_UNMAP = 0x120D
+    SVM_MIGRATE_MEM = 0x120E
     @codes = {}
     @codes[0x11F0] = 'NDRANGE_KERNEL'
     @codes[0x11F1] = 'TASK'
@@ -1768,6 +1846,7 @@ EOF
     @codes[0x120B] = 'SVM_MEMFILL'
     @codes[0x120C] = 'SVM_MAP'
     @codes[0x120D] = 'SVM_UNMAP'
+    @codes[0x120E] = 'SVM_MIGRATE_MEM'
   end
 
   # Enum that maps the :cl_gl_object_type type
@@ -1839,6 +1918,7 @@ EOF
     layout :dummy, :pointer
     PACKET_SIZE = 0x1120
     MAX_PACKETS = 0x1121
+    PROPERTIES = 0x1122
   end
   attach_function :clGetPlatformIDs, [:cl_uint,:pointer,:pointer], :cl_int
   attach_function :clGetPlatformInfo, [Platform,:cl_platform_info,:size_t,:pointer,:pointer], :cl_int
@@ -1974,6 +2054,14 @@ EOF
             callback :clSetProgramReleaseCallback_notify, [Program.by_ref,:pointer], :void
             attach_function :clSetProgramReleaseCallback, [Program,:clSetProgramReleaseCallback_notify,:pointer], :cl_int
             attach_function :clSetProgramSpecializationConstant, [Program,:cl_uint,:size_t,:pointer], :cl_int
+            begin # OpenCL 3.0
+              attach_function :clCreateBufferWithProperties, [Context,:pointer,:cl_mem_flags,:size_t,:pointer,:pointer], Mem
+              attach_function :clCreateImageWithProperties, [Context,:pointer,:cl_mem_flags,:pointer,:pointer,:pointer,:pointer], Mem
+              callback :clSetContextDestructorCallback_notify, [Context.by_ref,:pointer], :void
+              attach_function :clSetContextDestructorCallback, [Context,:clSetContextDestructorCallback_notify,:pointer], :cl_int
+            rescue NotFoundError => e
+              warn "Warning OpenCL 2.2 loader detected!"
+            end
           rescue NotFoundError => e
             warn "Warning OpenCL 2.1 loader detected!"
           end

data/lib/opencl_ruby_ffi/opencl_types.rb

@@ -67,6 +67,10 @@ module OpenCL
     [ :cl_uint, :cl_profiling_info ],
     [ :cl_bitfield, :cl_sampler_properties ],
     [ :cl_uint, :cl_kernel_exec_info ],
+    [ :cl_bitfield, :cl_device_atomic_capabilities ],
+    [ :cl_uint, :cl_khronos_vendor_id ],
+    [ :cl_bitfield, :cl_mem_properties ],
+    [ :cl_uint, :cl_version ],
     [ :cl_uint, :cl_gl_object_type ],
     [ :cl_uint, :cl_gl_texture_info ],
     [ :cl_uint, :cl_gl_platform_info ],

data/opencl_ruby_ffi.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name = 'opencl_ruby_ffi'
-  s.version = "1.3.7"
+  s.version = "1.3.8"
   s.author = "Brice Videau"
   s.email = "bvideau@anl.gov"
   s.homepage = "https://github.com/Nanosim-LIG/opencl-ruby"
   s.summary = "Ruby OpenCL FFI bindings"
-  s.description = "Ruby OpenCL FFI bindings. OpenCL 2.2 ready"
+  s.description = "Ruby OpenCL FFI bindings. OpenCL 3.0 ready"
   s.files =  Dir[ 'opencl_ruby_ffi.gemspec', 'LICENSE', 'lib/**/**/*.rb', '.yardopts', 'templates_custom/default/module/setup.rb' ]
   s.license = 'BSD-2-Clause'
   s.required_ruby_version = '>= 1.8.7'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencl_ruby_ffi
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2021-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
@@ -70,7 +70,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: Ruby OpenCL FFI bindings. OpenCL 2.2 ready
+description: Ruby OpenCL FFI bindings. OpenCL 3.0 ready
 email: bvideau@anl.gov
 executables: []
 extensions: []
@@ -106,6 +106,7 @@ files:
 - lib/opencl_ruby_ffi/intel/unofficial.rb
 - lib/opencl_ruby_ffi/khr/d3d10_sharing.rb
 - lib/opencl_ruby_ffi/khr/d3d11_sharing.rb
+- lib/opencl_ruby_ffi/khr/device_uuid.rb
 - lib/opencl_ruby_ffi/khr/dx9_media_sharing.rb
 - lib/opencl_ruby_ffi/khr/egl_event.rb
 - lib/opencl_ruby_ffi/khr/egl_image.rb