opencl_ruby_ffi 1.3.11 → 1.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 065ec7c422916ba7d169142533db9bd995454f4ba4f1c15140a9520678a2bfd6
-  data.tar.gz: bbc4f7adf1314fc7d52ac0d17f055395f49f0b36cee51a93ccd13ad7463ad99a
+  metadata.gz: fdde36869013e898818c10e84618fc8af7efbfb37f65f0dc420a5cbcfe98e724
+  data.tar.gz: a1934b0c7beb47644793083adaa04765dcc8eb7cddf54fc51ee1f203ebf545c7
 SHA512:
-  metadata.gz: cf5f687a27e5366205e978a0040da1f973e543953f286221c8bf0af9a0b2089d42f826039965cdf59bd9c1c7f64dca51b2bc50663818093fe667a5435dc429bf
-  data.tar.gz: 249cdaa1aba3ede6812b759c41fe21e468b40c15621f04e759829507dea1597d9fc2e31b85d8c0ef54cc65c0828da683ff0d6ad88414b14b22b87085c477b0f2
+  metadata.gz: f0c9376a0dc33def8c99a553526f77755223ca2592b845713fad3567bd30b8e3c4af8a1630db4f30739ada00119f53b75ab16a5a13c323205c87410565e6d568
+  data.tar.gz: ade66f8ccb6bdfbfdd8a3e0a88878e129507317fd710bf52ec0425c96441d5982765e7e222c6c6c154a68ee7812e6cb144fa72aefcc35ada654899c69e2c40ef

data/lib/opencl_ruby_ffi/opencl_ruby_ffi_base.rb

@@ -79,7 +79,7 @@ module OpenCL
 
     # Returns a String containing a user friendly representation of the ImageFormat
     def to_s
-      return "{ #{self.channel_order}, #{self.channel_data_type} }"
+      return "{ channel_order: #{self.channel_order}, channel_data_type: #{self.channel_data_type} }"
     end
 
   end
@@ -95,7 +95,7 @@ module OpenCL
            :image_slice_pitch,    :size_t,
            :num_mip_levels,       :cl_uint, 
            :num_samples,          :cl_uint,  
-           :buffer,               Mem.ptr
+           :buffer,               :pointer
 
      # Creates anew ImageDesc using the values provided by the user
      def initialize( image_type = nil, image_width = nil, image_height = nil, image_depth = nil, image_array_size = nil, image_row_pitch = nil, image_slice_pitch = nil, num_mip_levels = nil, num_samples = nil, buffer = nil )
@@ -115,6 +115,100 @@ module OpenCL
          self[:buffer] = buffer if buffer
        end
      end
+
+     def image_type
+       return Mem::Type.new(self[:image_type])
+     end
+
+     def image_type=(type)
+       return self[:image_type] = type
+     end
+
+     def image_width
+       return self[:image_width]
+     end
+
+     def image_width=(width)
+       return self[:image_width] = width
+     end
+
+     def image_height
+       return self[:image_height]
+     end
+
+     def image_height=(height)
+       return self[:image_height] = height
+     end
+
+     def image_depth
+       return self[:image_depth]
+     end
+
+     def image_depth=(depth)
+       return self[:image_depth] = depth
+     end
+
+     def image_array_size
+       return self[:image_array_size]
+     end
+
+     def image_array_size=(array_size)
+       return self[:image_array_size] = array_size
+     end
+
+     def image_row_pitch
+       return self[:image_row_pitch]
+     end
+
+     def image_row_pitch=(row_pitch)
+       return self[:image_row_pitch] = row_pitch
+     end
+
+     def image_slice_pitch
+       return self[:image_slice_pitch]
+     end
+
+     def image_slice_pitch=(slice_pitch)
+       return self[:image_slice_pitch] = slice_pitch
+     end
+
+     def num_mip_levels
+       return self[:num_mip_levels]
+     end
+
+     def num_mip_levels=(num_mip_levels)
+       return self[:num_mip_levels] = num_mip_levels
+     end
+
+     def num_samples
+       return self[:num_samples]
+     end
+
+     def num_samples=(num_samples)
+       return self[:num_samples] = num_samples
+     end
+
+     def buffer
+       return self[:buffer]
+     end
+
+     def buffer=(buffer)
+       return self[:buffer] = buffer
+     end
+
+     # Returns a String containing a user friendly representation of the ImageDesc
+     def to_s
+       return "{ image_type: #{image_type},"\
+              " image_width: #{self[:image_width]},"\
+              " image_height: #{self[:image_height]},"\
+              " image_depth: #{self[:image_depth]},"\
+              " image_array_size: #{self[:image_array_size]},"\
+              " image_row_pitch: #{self[:image_row_pitch]},"\
+              " image_slice_pitch: #{self[:image_slice_pitch]},"\
+              " num_mip_levels: #{self[:num_mip_levels]},"\
+              " num_samples: #{self[:num_samples]},"\
+              " buffer: #{self[:buffer].to_i.to_s(16)} }"
+     end
   end
 
   # Maps the :cl_buffer_region type of OpenCL
@@ -132,6 +226,26 @@ module OpenCL
         self[:size]   = sz if sz
       end
     end
+
+    def origin
+      return self[:origin]
+    end
+
+    def origin=(origin)
+      return self[:origin] = origin
+    end
+
+    def sz
+      return self[:size]
+    end
+
+    def sz=(sz)
+      return self[:size] = sz
+    end
+
+    def to_s
+      return "{ origin: #{self[:origin]}, size: #{self[:size]} }"
+    end
   end
 
   class Version
@@ -202,6 +316,10 @@ module OpenCL
     def name
       self[:name].to_s
     end
+
+    def to_s
+      "{ name: #{name}, version: #{version} }"
+    end
   end
 
   module InnerInterface

data/opencl_ruby_ffi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'opencl_ruby_ffi'
-  s.version = "1.3.11"
+  s.version = "1.3.12"
   s.author = "Brice Videau"
   s.email = "bvideau@anl.gov"
   s.homepage = "https://github.com/Nanosim-LIG/opencl-ruby"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencl_ruby_ffi
 version: !ruby/object:Gem::Version
-  version: 1.3.11
+  version: 1.3.12
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray