ruby-hdf5 0.0.3 → 0.0.4

data/lib/hdf5/dtype.rb

@@ -17,7 +17,7 @@ module HDF5
     }.freeze
 
     attr_reader :numo_class, :memory_type_name, :storage_type_name, :kind, :itemsize, :byteorder, :precision, :offset,
-                :hdf5_class
+                :hdf5_class, :encoding
 
     def self.for_numo(value)
       type = TYPES.values.find { |numo_class,| value.is_a?(numo_class) }
@@ -35,6 +35,10 @@ module HDF5
     def self.for_hdf5(type_id)
       type_class = HDF5::FFI.H5Tget_class(type_id)
       itemsize = HDF5::FFI.H5Tget_size(type_id)
+      if type_class == :H5T_STRING
+        return new(:string, Numo::RObject, nil, nil, :string, itemsize, byteorder: :none,
+                   hdf5_class: type_class, encoding: StringCodec.encoding_for(type_id))
+      end
       return for_bool_hdf5(type_id, itemsize) if type_class == :H5T_ENUM
       return for_complex_hdf5(type_id, itemsize) if type_class == :H5T_COMPOUND
 
@@ -83,22 +87,28 @@ module HDF5
               HDF5::FFI.H5Tget_nmembers(type_id) == 2 &&
               HDF5::FFI.H5Tget_member_offset(type_id, real_index) == 0 &&
               HDF5::FFI.H5Tget_member_offset(type_id, imaginary_index) == component_size
+      byteorders = []
       [real_index, imaginary_index].each do |index|
         next unless index >= 0
 
         member_type_id = HDF5::FFI.H5Tget_member_type(type_id, index)
-        valid &&= member_type_id >= 0 && HDF5::FFI.H5Tget_class(member_type_id) == :H5T_FLOAT &&
-                  HDF5::FFI.H5Tget_size(member_type_id) == component_size
-        HDF5::FFI.H5Tclose(member_type_id) if member_type_id >= 0
+        begin
+          member_dtype = member_type_id >= 0 ? for_hdf5(member_type_id) : nil
+          valid &&= member_dtype && member_dtype.kind == :float && member_dtype.itemsize == component_size
+          byteorders << member_dtype.byteorder if member_dtype
+        ensure
+          HDF5::FFI.H5Tclose(member_type_id) if member_type_id >= 0
+        end
       end
+      valid &&= byteorders.length == 2 && byteorders.uniq.length == 1
       raise UnsupportedTypeError, 'Unsupported HDF5 compound datatype' unless valid
 
       symbol = itemsize == 8 ? :complex64 : :complex128
-      new(symbol, *TYPES.fetch(symbol), hdf5_class: :H5T_COMPOUND)
+      new(symbol, *TYPES.fetch(symbol), byteorder: byteorders.first, hdf5_class: :H5T_COMPOUND)
     end
 
     def initialize(symbol, numo_class, memory_type_name, storage_type_name, kind, itemsize, byteorder: :little,
-                   precision: itemsize * 8, offset: 0, hdf5_class: nil)
+                   precision: itemsize * 8, offset: 0, hdf5_class: nil, encoding: nil)
       @symbol = symbol
       @numo_class = numo_class
       @memory_type_name = memory_type_name
@@ -108,6 +118,7 @@ module HDF5
       @byteorder = byteorder
       @precision = precision
       @offset = offset
+      @encoding = encoding
       @hdf5_class = hdf5_class || (kind == :integer ? :H5T_INTEGER : :H5T_FLOAT)
       freeze
     end
@@ -141,10 +152,13 @@ module HDF5
         return itemsize < target.itemsize
       end
       return itemsize <= target.itemsize if kind == :float && target.kind == :float
+      return itemsize <= target.itemsize if kind == :complex && target.kind == :complex
+      return itemsize <= target.itemsize / 2 if kind == :float && target.kind == :complex
 
-      if kind == :integer && target.kind == :float
+      if kind == :integer && %i[float complex].include?(target.kind)
         significant_bits = unsigned? ? itemsize * 8 : itemsize * 8 - 1
-        mantissa_bits = target.itemsize == 4 ? 24 : 53
+        size = target.kind == :complex ? target.itemsize / 2 : target.itemsize
+        mantissa_bits = size == 4 ? 24 : 53
         return significant_bits <= mantissa_bits
       end
 

data/lib/hdf5/ffi.rb

@@ -34,9 +34,9 @@ module HDF5
       case [major, minor]
       in [1, 10..13]
         'ffi_10'
-      in [1, 14..]
+      in [1, 14]
         'ffi_14'
-      in [2.., _]
+      in [2, 0..2]
         'ffi_20'
       else
         raise "Unsupported HDF5 version #{major}.#{minor}.#{release}"
@@ -71,7 +71,7 @@ module HDF5
       H5Screate H5Screate_simple H5Sclose H5Sget_simple_extent_type H5Sget_simple_extent_ndims
       H5Sget_simple_extent_dims H5Sselect_hyperslab H5Sget_select_npoints
       H5Tcopy H5Tclose H5Tget_class H5Tget_size H5Tget_sign H5Tget_order H5Tget_precision H5Tget_offset
-      H5Tset_size H5Tset_cset H5Tis_variable_str H5Tcreate H5Tinsert H5Tenum_create H5Tenum_insert
+      H5Tset_size H5Tset_cset H5Tget_cset H5Tis_variable_str H5Tcreate H5Tinsert H5Tenum_create H5Tenum_insert
       H5Tenum_valueof H5Tget_nmembers H5Tget_member_index H5Tget_member_offset H5Tget_member_type H5Tget_super
       H5Pcreate H5Pclose H5Pset_chunk H5Pget_chunk H5Pget_layout H5Pset_deflate H5Pset_shuffle H5Pset_fletcher32
       H5Pset_fill_value H5Pget_fill_value H5Zfilter_avail H5Zget_filter_info

data/lib/hdf5/ffi_10.rb

@@ -269,23 +269,6 @@ module HDF5
 
     typedef :__fd_mask, :fd_mask
 
-    attach_function 'select', [
-      :int,
-      FdSet.ptr,
-      FdSet.ptr,
-      FdSet.ptr,
-      Timeval.ptr
-    ], :int
-
-    attach_function 'pselect', [
-      :int,
-      FdSet.ptr,
-      FdSet.ptr,
-      FdSet.ptr,
-      Timespec.ptr,
-      C_SigsetT.ptr
-    ], :int
-
     typedef :__blksize_t, :blksize_t
 
     typedef :__blkcnt_t, :blkcnt_t
@@ -518,39 +501,6 @@ module HDF5
 
     ImaxdivT = Anon_Type_15
 
-    attach_function 'imaxabs', [
-      :intmax_t
-    ], :intmax_t
-
-    attach_function 'imaxdiv', %i[
-      intmax_t
-      intmax_t
-    ], ImaxdivT
-
-    attach_function 'strtoimax', %i[
-      string
-      pointer
-      int
-    ], :intmax_t
-
-    attach_function 'strtoumax', %i[
-      string
-      pointer
-      int
-    ], :uintmax_t
-
-    attach_function 'wcstoimax', %i[
-      pointer
-      pointer
-      int
-    ], :intmax_t
-
-    attach_function 'wcstoumax', %i[
-      pointer
-      pointer
-      int
-    ], :uintmax_t
-
     typedef :long, :ptrdiff_t
 
     typedef :int, :wchar_t
@@ -2724,195 +2674,6 @@ module HDF5
 
     FposT = C_FposT
 
-    attach_variable :stdin, :stdin, FILE.ptr
-
-    attach_variable :stdout, :stdout, FILE.ptr
-
-    attach_variable :stderr, :stderr, FILE.ptr
-
-    attach_function 'remove', [
-      :string
-    ], :int
-
-    attach_function 'rename', %i[
-      string
-      string
-    ], :int
-
-    attach_function 'renameat', %i[
-      int
-      string
-      int
-      string
-    ], :int
-
-    attach_function 'fclose', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'tmpfile', [], FILE.ptr
-
-    attach_function 'tmpnam', [
-      :pointer # [:char, 20]
-    ], :string
-
-    attach_function 'tmpnam_r', [
-      :pointer # [:char, 20]
-    ], :string
-
-    attach_function 'tempnam', %i[
-      string
-      string
-    ], :string
-
-    attach_function 'fflush', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'fflush_unlocked', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'fopen', %i[
-      string
-      string
-    ], FILE.ptr
-
-    attach_function 'freopen', [
-      :string,
-      :string,
-      FILE.ptr
-    ], FILE.ptr
-
-    attach_function 'fdopen', %i[
-      int
-      string
-    ], FILE.ptr
-
-    attach_function 'fopencookie', [
-      :pointer,
-      :string,
-      CookieIoFunctionsT
-    ], FILE.ptr
-
-    attach_function 'fmemopen', %i[
-      pointer
-      size_t
-      string
-    ], FILE.ptr
-
-    attach_function 'open_memstream', %i[
-      pointer
-      pointer
-    ], FILE.ptr
-
-    attach_function 'setbuf', [
-      FILE.ptr,
-      :string
-    ], :void
-
-    attach_function 'setvbuf', [
-      FILE.ptr,
-      :string,
-      :int,
-      :size_t
-    ], :int
-
-    attach_function 'setbuffer', [
-      FILE.ptr,
-      :string,
-      :size_t
-    ], :void
-
-    attach_function 'setlinebuf', [
-      FILE.ptr
-    ], :void
-
-    attach_function 'fprintf', [
-      FILE.ptr,
-      :string
-    ], :int
-
-    attach_function 'printf', [
-      :string
-    ], :int
-
-    attach_function 'sprintf', %i[
-      string
-      string
-    ], :int
-
-    attach_function 'vfprintf', [
-      FILE.ptr,
-      :string,
-      :__gnuc_va_list
-    ], :int
-
-    attach_function 'vprintf', %i[
-      string
-      __gnuc_va_list
-    ], :int
-
-    attach_function 'vsprintf', %i[
-      string
-      string
-      __gnuc_va_list
-    ], :int
-
-    attach_function 'snprintf', %i[
-      string
-      size_t
-      string
-    ], :int
-
-    attach_function 'vsnprintf', %i[
-      string
-      size_t
-      string
-      __gnuc_va_list
-    ], :int
-
-    attach_function 'vasprintf', %i[
-      pointer
-      string
-      __gnuc_va_list
-    ], :int
-
-    attach_function '__asprintf', %i[
-      pointer
-      string
-    ], :int
-
-    attach_function 'asprintf', %i[
-      pointer
-      string
-    ], :int
-
-    attach_function 'vdprintf', %i[
-      int
-      string
-      __gnuc_va_list
-    ], :int
-
-    attach_function 'dprintf', %i[
-      int
-      string
-    ], :int
-
-    attach_function 'fscanf', [
-      FILE.ptr,
-      :string
-    ], :int
-
-    attach_function 'scanf', [
-      :string
-    ], :int
-
-    attach_function 'sscanf', %i[
-      string
-      string
-    ], :int
-
     typedef :float, :_Float32
 
     typedef :double, :_Float64
@@ -2921,252 +2682,6 @@ module HDF5
 
     typedef :long_double, :_Float64x
 
-    attach_function 'vfscanf', [
-      FILE.ptr,
-      :string,
-      :__gnuc_va_list
-    ], :int
-
-    attach_function 'vscanf', %i[
-      string
-      __gnuc_va_list
-    ], :int
-
-    attach_function 'vsscanf', %i[
-      string
-      string
-      __gnuc_va_list
-    ], :int
-
-    attach_function 'fgetc', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'getc', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'getchar', [], :int
-
-    attach_function 'getc_unlocked', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'getchar_unlocked', [], :int
-
-    attach_function 'fgetc_unlocked', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'fputc', [
-      :int,
-      FILE.ptr
-    ], :int
-
-    attach_function 'putc', [
-      :int,
-      FILE.ptr
-    ], :int
-
-    attach_function 'putchar', [
-      :int
-    ], :int
-
-    attach_function 'fputc_unlocked', [
-      :int,
-      FILE.ptr
-    ], :int
-
-    attach_function 'putc_unlocked', [
-      :int,
-      FILE.ptr
-    ], :int
-
-    attach_function 'putchar_unlocked', [
-      :int
-    ], :int
-
-    attach_function 'getw', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'putw', [
-      :int,
-      FILE.ptr
-    ], :int
-
-    attach_function 'fgets', [
-      :string,
-      :int,
-      FILE.ptr
-    ], :string
-
-    attach_function '__getdelim', [
-      :pointer,
-      :pointer,
-      :int,
-      FILE.ptr
-    ], :__ssize_t
-
-    attach_function 'getdelim', [
-      :pointer,
-      :pointer,
-      :int,
-      FILE.ptr
-    ], :__ssize_t
-
-    attach_function 'getline', [
-      :pointer,
-      :pointer,
-      FILE.ptr
-    ], :__ssize_t
-
-    attach_function 'fputs', [
-      :string,
-      FILE.ptr
-    ], :int
-
-    attach_function 'puts', [
-      :string
-    ], :int
-
-    attach_function 'ungetc', [
-      :int,
-      FILE.ptr
-    ], :int
-
-    attach_function 'fread', [
-      :pointer,
-      :size_t,
-      :size_t,
-      FILE.ptr
-    ], :ulong
-
-    attach_function 'fwrite', [
-      :pointer,
-      :size_t,
-      :size_t,
-      FILE.ptr
-    ], :ulong
-
-    attach_function 'fread_unlocked', [
-      :pointer,
-      :size_t,
-      :size_t,
-      FILE.ptr
-    ], :size_t
-
-    attach_function 'fwrite_unlocked', [
-      :pointer,
-      :size_t,
-      :size_t,
-      FILE.ptr
-    ], :size_t
-
-    attach_function 'fseek', [
-      FILE.ptr,
-      :long,
-      :int
-    ], :int
-
-    attach_function 'ftell', [
-      FILE.ptr
-    ], :long
-
-    attach_function 'rewind', [
-      FILE.ptr
-    ], :void
-
-    attach_function 'fseeko', [
-      FILE.ptr,
-      :__off_t,
-      :int
-    ], :int
-
-    attach_function 'ftello', [
-      FILE.ptr
-    ], :__off_t
-
-    attach_function 'fgetpos', [
-      FILE.ptr,
-      FposT.ptr
-    ], :int
-
-    attach_function 'fsetpos', [
-      FILE.ptr,
-      FposT.ptr
-    ], :int
-
-    attach_function 'clearerr', [
-      FILE.ptr
-    ], :void
-
-    attach_function 'feof', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'ferror', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'clearerr_unlocked', [
-      FILE.ptr
-    ], :void
-
-    attach_function 'feof_unlocked', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'ferror_unlocked', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'perror', [
-      :string
-    ], :void
-
-    attach_function 'fileno', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'fileno_unlocked', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'pclose', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'popen', %i[
-      string
-      string
-    ], FILE.ptr
-
-    attach_function 'ctermid', [
-      :string
-    ], :string
-
-    attach_function 'flockfile', [
-      FILE.ptr
-    ], :void
-
-    attach_function 'ftrylockfile', [
-      FILE.ptr
-    ], :int
-
-    attach_function 'funlockfile', [
-      FILE.ptr
-    ], :void
-
-    attach_function '__uflow', [
-      FILE.ptr
-    ], :int
-
-    attach_function '__overflow', [
-      FILE.ptr,
-      :int
-    ], :int
-
     enum :H5E_type_t, [
       :H5E_MAJOR, 0,
       :H5E_MINOR, 1