opencl_ruby_ffi 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdcb6a798b01c3d88e50d3a357590ba5630e6912
-  data.tar.gz: 0ddb538e3b6ea0b1c4d2f22891ec4f88a78d0eb4
+  metadata.gz: acb95c841675fa710d38152d404a4793e719377d
+  data.tar.gz: 7210478d7cd4d25bc2a5927933cdd1f7baf9d615
 SHA512:
-  metadata.gz: 0d5635ebdd72a6e050317696afa0b5d827cee2bdf6a34193bb37272e96d9f3984d82a5329ac5226ee26532c8d894f51c701218cbae58e68c74dcf39ba8816235
-  data.tar.gz: 88952cd81565ad78720a4db3cdbbae2e23e635bcba191cf9c21182f02cc2c796604875e448b9d29ebdb3a407afdd4e9dc646e61207985bc508f95c4a9d9ffb79
+  metadata.gz: 5d6a9321eb0a9ac0328be3d712226345b51e41ea49731171732134270bf638be47ed31dd3eb6bf3cb3643d2ae09ff62621bb5f5b27b1dfc9c2a122dcdca771c9
+  data.tar.gz: 60e325360ba6a96d9610803ef567354f77f735e99e7c30e25e51d4cc7031642551f3feea2f051c58b3b3b89474d0584c5a19e50052f01a2755bcc39ce4840391

data/lib/opencl_ruby_ffi/CommandQueue.rb

@@ -141,7 +141,18 @@ module OpenCL
     ptr = clEnqueueMapImage( command_queue, image, blocking, flags, origin, region, image_row_pitch, image_slice_pitch, num_events, events, event, error )
     error_check( error.read_cl_int )
     ev = Event::new( event.read_pointer, false )
-    return [ev, ptr, image_row_pitch.read_size_t, image_slice_pitch.read_size_t]
+    size = nil
+    image_row_pitch = image_row_pitch.read_size_t
+    image_slice_pitch = image_slice_pitch.read_size_t
+    case image.type
+    when Mem::IMAGE1D_ARRAY, Mem::IMAGE1D_BUFFER, Mem::IMAGE1D
+      size = region[0].read_size_t*image.pixel_size
+    when Mem::IMAGE2D, Mem::IMAGE2D_ARRAY
+      size = region[1].read_size_t*image_row_pitch
+    when Mem::IMAGE3D
+      size = region[2].read_size_t*image_slice_pitch
+    end
+    return [ev, ptr.slice(0,size), image_row_pitch, image_slice_pitch]
   end
 
   # Enqueues a command to map aa Buffer into host memory
@@ -181,7 +192,7 @@ module OpenCL
     ptr = clEnqueueMapBuffer( command_queue, buffer, blocking, flags, offset, size, num_events, events, event, error )
     error_check( error.read_cl_int )
     ev = Event::new( event.read_pointer, false )
-    return [ev, ptr]
+    return [ev, ptr.slice(0, size)]
   end
 
   # Enqueues a command to unmap a previously mapped region of a memory object

data/lib/opencl_ruby_ffi/Image.rb

@@ -98,7 +98,7 @@ module OpenCL
     slice_pitch = options[:slice_pitch] if options[:slice_pitch]
     if context.platform.version_number > 1.1 then
       desc = ImageDesc::new(Mem::IMAGE3D, width, height, depth, 0, row_pitch, slice_pitch, 0, 0, nil)
-      return create_image( context, format, desc, flags, data )
+      return create_image( context, format, desc, options )
     end
     flags = get_flags( options )
     host_ptr = options[:host_ptr]
@@ -243,6 +243,13 @@ module OpenCL
     get_info("Image", :size_t, "height")
     get_info("Image", :size_t, "depth")
 
+    def pixel_size
+      s = size / width
+      s /= height if height != 0
+      s /= depth if depth != 0
+      return s
+    end
+
     module OpenCL12
       extend InnerGenerator
 

data/opencl_ruby_ffi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'opencl_ruby_ffi'
-  s.version = "1.3.1"
+  s.version = "1.3.2"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   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.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray