tensor_stream 1.0.0 → 1.0.1

data/lib/tensor_stream/graph_deserializers/yaml_loader.rb

@@ -58,4 +58,4 @@ module TensorStream
       @graph
     end
   end
-end
+end

data/lib/tensor_stream/graph_keys.rb

@@ -1,7 +1,7 @@
 module TensorStream
   class GraphKeys
-    GLOBAL_VARIABLES = 'variables'.freeze
-    TRAINABLE_VARIABLES = 'trainable_variables'.freeze
-    GLOBAL_STEP = 'global_step'.freeze
+    GLOBAL_VARIABLES = "variables".freeze
+    TRAINABLE_VARIABLES = "trainable_variables".freeze
+    GLOBAL_STEP = "global_step".freeze
   end
 end

data/lib/tensor_stream/graph_serializers/graphml.rb

@@ -48,7 +48,7 @@ module TensorStream
     private
 
     def add_to_group(groups, name, arr_buf)
-      name_parts = name.split('/')
+      name_parts = name.split("/")
       return false if name_parts.size < 2
 
       prefix = name_parts.shift
@@ -67,35 +67,35 @@ module TensorStream
     end
 
     def find_or_create_group(prefix, groups)
-      if !groups[prefix]
-        groups[prefix] = { buf: [], group: {} }
+      unless groups[prefix]
+        groups[prefix] = {buf: [], group: {}}
       end
 
-      return groups[prefix]
+      groups[prefix]
     end
 
     def create_group(id, title, group)
       arr_buf = []
       arr_buf << "<node id=\"#{id}\" yfiles.foldertype=\"group\">"
       arr_buf << '<data key="d9">'
-      arr_buf << '<y:ProxyAutoBoundsNode>'
+      arr_buf << "<y:ProxyAutoBoundsNode>"
       arr_buf << '<y:Realizers active="0">'
-      arr_buf << '<y:GroupNode>'
+      arr_buf << "<y:GroupNode>"
       arr_buf << '<y:Fill color="#CAECFF84" transparent="false"/>'
       arr_buf << '<y:BorderStyle color="#666699" type="dotted" width="1.0"/>'
-      arr_buf << '<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#99CCFF" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.4609375" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="67.18603515625" x="-8.593017578125" y="0.0">' + title + '</y:NodeLabel>'
+      arr_buf << '<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#99CCFF" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.4609375" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="67.18603515625" x="-8.593017578125" y="0.0">' + title + "</y:NodeLabel>"
       arr_buf << '<y:Shape type="roundrectangle"/>'
-      arr_buf << '</y:GroupNode>'
-      arr_buf << '</y:Realizers>'
-      arr_buf << '</y:ProxyAutoBoundsNode>'
-      arr_buf << '</data>'
+      arr_buf << "</y:GroupNode>"
+      arr_buf << "</y:Realizers>"
+      arr_buf << "</y:ProxyAutoBoundsNode>"
+      arr_buf << "</data>"
       arr_buf << '<graph edgedefault="directed" id="n105:">'
       arr_buf << group[:buf]
       group[:group].each do |k, g|
         arr_buf << create_group(k, k, g)
       end
-      arr_buf << '</graph>'
-      arr_buf << '</node>'
+      arr_buf << "</graph>"
+      arr_buf << "</node>"
       arr_buf
     end
 
@@ -120,17 +120,17 @@ module TensorStream
       end
       node_buf << "<data key=\"d9\">"
       node_buf << "<y:ShapeNode>"
-      if tensor.internal?
-        node_buf << "  <y:Fill color=\"#FFFF99\" transparent=\"false\"/>"
+      node_buf << if tensor.internal?
+        "  <y:Fill color=\"#FFFF99\" transparent=\"false\"/>"
       else
-        node_buf << "  <y:Fill color=\"#99CC00\" transparent=\"false\"/>"
+        "  <y:Fill color=\"#99CC00\" transparent=\"false\"/>"
       end
       node_buf << "  <y:NodeLabel alignment=\"center\">#{tensor.operation}</y:NodeLabel>"
       node_buf << "</y:ShapeNode>"
       node_buf << "</data>"
       node_buf << "</node>"
 
-      if !add_to_group(groups, tensor.name, node_buf)
+      unless add_to_group(groups, tensor.name, node_buf)
         add_to_group(groups, "program/#{tensor.name}", node_buf)
       end
 
@@ -176,10 +176,10 @@ module TensorStream
           input_buf << "<y:ShapeNode>"
 
           input_buf << if input.internal?
-                         "  <y:Fill color=\"#C0C0C0\" transparent=\"false\"/>"
-                       else
-                         "  <y:Fill color=\"#FFFFFF\" transparent=\"false\"/>"
-                       end
+            "  <y:Fill color=\"#C0C0C0\" transparent=\"false\"/>"
+          else
+            "  <y:Fill color=\"#FFFFFF\" transparent=\"false\"/>"
+          end
 
           input_buf << "  <y:NodeLabel alignment=\"center\">#{input.name}</y:NodeLabel>"
 
@@ -204,7 +204,7 @@ module TensorStream
     end
 
     def _gml_string(str)
-      str.tr('/', '-')
+      str.tr("/", "-")
     end
 
     def output_edge(input, tensor, arr_buf, index = 0)
@@ -215,22 +215,22 @@ module TensorStream
       arr_buf << "<y:PolyLineEdge>"
       arr_buf << "<y:EdgeLabel >"
       arr_buf << if !@last_session_context.empty?
-                   "<![CDATA[  #{_val(input)}  ]]>"
-                 elsif input.shape.shape.nil?
-                   "<![CDATA[ #{input.data_type} ? ]]>"
-                 else
-                   "<![CDATA[ #{input.data_type} #{input.shape.shape.empty? ? 'scalar' : input.shape.shape.to_json}  ]]>"
-                 end
+        "<![CDATA[  #{_val(input)}  ]]>"
+      elsif input.shape.shape.nil?
+        "<![CDATA[ #{input.data_type} ? ]]>"
+      else
+        "<![CDATA[ #{input.data_type} #{input.shape.shape.empty? ? "scalar" : input.shape.shape.to_json}  ]]>"
+      end
       arr_buf << "</y:EdgeLabel >"
       arr_buf << "<y:Arrows source=\"none\" target=\"standard\"/>"
       arr_buf << if index.zero?
-                  "<y:LineStyle color=\"#FF0000\" type=\"line\" width=\"1.0\"/>"
-                 else
-                   "<y:LineStyle color=\"#0000FF\" type=\"line\" width=\"1.0\"/>"
-                 end
+        "<y:LineStyle color=\"#FF0000\" type=\"line\" width=\"1.0\"/>"
+      else
+        "<y:LineStyle color=\"#0000FF\" type=\"line\" width=\"1.0\"/>"
+      end
       arr_buf << "</y:PolyLineEdge>"
       arr_buf << "</data>"
       arr_buf << "</edge>"
     end
   end
-end
+end

data/lib/tensor_stream/graph_serializers/packer.rb

@@ -1,4 +1,4 @@
-require 'base64'
+require "base64"
 
 module TensorStream
   # Utility class to handle data type serialization
@@ -7,36 +7,36 @@ module TensorStream
       value = value.is_a?(Array) ? value.flatten : [value]
       byte_value = case data_type
                    when :float64
-                     value.pack('d*')
+                     value.pack("d*")
                    when :float32, :float16, :float
-                     value.pack('f*')
+                     value.pack("f*")
                    when :uint32
-                     value.pack('L*')
+                     value.pack("L*")
                    when :int32, :int
-                     value.pack('l*')
+                     value.pack("l*")
                    when :int64
-                     value.pack('q*')
+                     value.pack("q*")
                    when :uint64
-                     value.pack('Q*')
+                     value.pack("Q*")
                    when :uint8
-                     value.pack('C*')
+                     value.pack("C*")
                    when :boolean
-                     value.map { |v| v ? 1 : 0 }.pack('C*')
+                     value.map { |v| v ? 1 : 0 }.pack("C*")
                    when :string
                      if value.is_a?(Array)
-                      value.to_yaml
+                       value.to_yaml
                      else
-                      value
+                       value
                      end
                    else
-                    raise "unknown type #{data_type}"
-                   end
+                     raise "unknown type #{data_type}"
+      end
 
       byte_value
     end
 
     def self.pack_to_str(value, data_type)
-      pack(value, data_type).bytes.map { |b| b.chr =~ /[^[:print:]]/ ? "\\#{sprintf("%o", b).rjust(3, '0')}" : b.chr }.join
+      pack(value, data_type).bytes.map { |b| /[^[:print:]]/.match?(b.chr) ? "\\#{sprintf("%o", b).rjust(3, "0")}" : b.chr }.join
     end
 
     def self.unpack_from_str(content, data_type)
@@ -47,22 +47,22 @@ module TensorStream
     def self.unpack(unpacked, data_type)
       case data_type
       when :float32, :float, :float16
-        unpacked.unpack('f*')
+        unpacked.unpack("f*")
       when :float64
-        unpacked.unpack('d*')
+        unpacked.unpack("d*")
       when :int32, :int
-        unpacked.unpack('L*')
+        unpacked.unpack("L*")
       when :uint32
-        unpacked.unpack('l*')
+        unpacked.unpack("l*")
       when :int64
-        unpacked.unpack('q*')
+        unpacked.unpack("q*")
       when :uint64
-        unpacked.unpack('Q*')
+        unpacked.unpack("Q*")
       when :uint8
-        unpacked.unpack('C*')
+        unpacked.unpack("C*")
       when :boolean
-        unpacked.unpack('C*').map { |v| v == 1 }
+        unpacked.unpack("C*").map { |v| v == 1 }
       end
     end
   end
-end
+end

data/lib/tensor_stream/graph_serializers/pbtext.rb

@@ -12,10 +12,10 @@ module TensorStream
 
       node_keys.each do |k|
         node = if block_given?
-                 yield graph, k
-               else
-                 graph.get_tensor_by_name(k)
-               end
+          yield graph, k
+        else
+          graph.get_tensor_by_name(k)
+        end
 
         @lines << "node {"
         @lines << "  name: #{node.name.to_json}"
@@ -27,13 +27,13 @@ module TensorStream
             @lines << "  input: #{input.name.to_json}"
           end
           # type
-          pb_attr('T', "type: #{sym_to_protobuf_type(node.data_type)}")
+          pb_attr("T", "type: #{sym_to_protobuf_type(node.data_type)}")
 
           case node.operation.to_s
-          when 'const'
-            pb_attr('value', tensor_value(node))
-          when 'variable_v2'
-            pb_attr('shape', shape_buf(node, 'shape'))
+          when "const"
+            pb_attr("value", tensor_value(node))
+          when "variable_v2"
+            pb_attr("shape", shape_buf(node, "shape"))
           end
           process_options(node)
         end
@@ -50,7 +50,7 @@ module TensorStream
     def process_options(node)
       return if node.options.nil?
       node.options.reject { |_k, v| v.nil? }.each do |k, v|
-        next if %w[name internal_name data_type].include?(k.to_s) || k.to_s.start_with?('__')
+        next if %w[name internal_name data_type].include?(k.to_s) || k.to_s.start_with?("__")
         @lines << "  attr {"
         @lines << "    key: \"#{k}\""
         @lines << "    value {"
@@ -63,55 +63,51 @@ module TensorStream
     def attr_value(val, indent = 0)
       spaces = " " * indent
       case val.class.to_s
-      when 'TrueClass', 'FalseClass'
+      when "TrueClass", "FalseClass"
         @lines << "#{spaces}b: #{val}"
-      when 'Integer'
+      when "Integer"
         @lines << "#{spaces}i: #{val}"
-      when 'String',
+      when "String",
         @lines << "#{spaces}s: #{val}"
-      when 'Float'
+      when "Float"
         @lines << "#{spaces}f: #{val}"
-      when 'Symbol'
+      when "Symbol"
         @lines << "#{spaces}sym: #{val}"
-      when 'Array'
+      when "Array"
         @lines << "#{spaces}list {"
         val.each do |v_item|
           attr_value(v_item, indent + 2)
         end
         @lines << "#{spaces}}"
-      when 'TensorStream::TensorShape'
+      when "TensorStream::TensorShape"
         @lines << "#{spaces}shape {"
-        if val.shape
-          val.shape.each do |dim|
-            @lines << "#{spaces}  dim {"
-            @lines << "#{spaces}    size: #{dim}"
-            @lines << "#{spaces}  }"
-          end
+        val.shape&.each do |dim|
+          @lines << "#{spaces}  dim {"
+          @lines << "#{spaces}    size: #{dim}"
+          @lines << "#{spaces}  }"
         end
         @lines << "#{spaces}}"
-      when 'TensorStream::Variable'
+      when "TensorStream::Variable"
       else
         raise "unknown type #{val.class}"
       end
     end
 
     def pack_arr_float(float_arr)
-      float_arr.flatten.pack('f*').bytes.map { |b| b.chr =~ /[^[:print:]]/ ? "\\#{sprintf("%o", b).rjust(3, '0')}" : b.chr }.join
+      float_arr.flatten.pack("f*").bytes.map { |b| /[^[:print:]]/.match?(b.chr) ? "\\#{sprintf("%o", b).rjust(3, "0")}" : b.chr }.join
     end
 
     def pack_arr_int(int_arr)
-      int_arr.flatten.pack('l*').bytes.map { |b| b.chr =~ /[^[:print:]]/ ? "\\#{sprintf("%o", b).rjust(3, '0')}" : b.chr }.join
+      int_arr.flatten.pack("l*").bytes.map { |b| /[^[:print:]]/.match?(b.chr) ? "\\#{sprintf("%o", b).rjust(3, "0")}" : b.chr }.join
     end
 
-    def shape_buf(tensor, shape_type = 'tensor_shape')
+    def shape_buf(tensor, shape_type = "tensor_shape")
       arr = []
       arr << "  #{shape_type} {"
-      if tensor.shape.shape
-        tensor.shape.shape.each do |dim|
-          arr << "    dim {"
-          arr << "      size: #{dim}"
-          arr << "    }"
-        end
+      tensor.shape.shape&.each do |dim|
+        arr << "    dim {"
+        arr << "      size: #{dim}"
+        arr << "    }"
       end
       arr << "  }"
       arr
@@ -140,14 +136,14 @@ module TensorStream
         end
       else
         val_type = if TensorStream::Ops::INTEGER_TYPES.include?(tensor.data_type)
-                     "int_val"
-                   elsif TensorStream::Ops::FLOATING_POINT_TYPES.include?(tensor.data_type)
-                     "float_val"
-                   elsif tensor.data_type == :string
-                     "string_val"
-                   else
-                     "val"
-                   end
+          "int_val"
+        elsif TensorStream::Ops::FLOATING_POINT_TYPES.include?(tensor.data_type)
+          "float_val"
+        elsif tensor.data_type == :string
+          "string_val"
+        else
+          "val"
+        end
         arr << "  #{val_type}: #{tensor.const_value.to_json}"
       end
       arr << "}"
@@ -186,4 +182,4 @@ module TensorStream
       @lines << "  }"
     end
   end
-end
+end

data/lib/tensor_stream/graph_serializers/serializer.rb

@@ -4,6 +4,7 @@ module TensorStream
       File.write(filename, get_string(tensor, session, graph_keys = nil))
     end
 
-    def get_string(tensor, session = nil); end
+    def get_string(tensor, session = nil)
+    end
   end
-end
+end

data/lib/tensor_stream/graph_serializers/yaml.rb

@@ -12,10 +12,10 @@ module TensorStream
 
       node_keys.each do |k|
         node = if block_given?
-                 yield graph, k
-               else
-                 graph.get_tensor_by_name(k)
-               end
+          yield graph, k
+        else
+          graph.get_tensor_by_name(k)
+        end
         next unless node.is_a?(Operation)
 
         serialized_arr << node.to_h
@@ -24,4 +24,4 @@ module TensorStream
       serialized_arr.to_yaml
     end
   end
-end
+end

data/lib/tensor_stream/helpers/infer_shape.rb

@@ -1,4 +1,4 @@
-require 'tensor_stream/evaluator/operation_helpers/array_ops_helper'
+require "tensor_stream/evaluator/operation_helpers/array_ops_helper"
 module TensorStream
   ##
   # Convenience class for guessing the shape of a tensor
@@ -9,18 +9,35 @@ module TensorStream
 
     def self.infer_shape(tensor)
       case tensor.operation
+      when :assign
+        possible_shape = if tensor.inputs[0]&.shape&.shape
+          tensor.inputs[0].shape.shape
+        else
+          tensor.inputs[1].shape.shape
+        end
+
+        possible_shape
+      when :const
+        shape_eval(tensor.options[:value])
+      when :variable_v2
+        tensor.shape ? tensor.shape.shape : nil
+      when :placeholder
+        return nil if tensor.inputs[0].nil?
+        return tensor.inputs[0].shape.shape if tensor.inputs.size == 1
+
+        TensorShape.infer_shape(tensor.inputs[0].shape.shape, tensor.inputs[1].shape.shape) if tensor.inputs.size == 2 && tensor.inputs[0] && tensor.inputs[1]
       when :case, :case_grad
-        tensor.inputs[2].shape.shape if tensor.inputs[2]
+        tensor.inputs[2]&.shape&.shape
       when :const
         shape_eval(tensor.options[:value])
       when :variable_v2
         tensor.shape ? tensor.shape.shape : nil
       when :assign
-        possible_shape = if tensor.inputs[0] && tensor.inputs[0].shape.shape
-                           tensor.inputs[0].shape.shape
-                         else
-                           tensor.inputs[1].shape.shape
-                         end
+        possible_shape = if tensor.inputs[0]&.shape&.shape
+          tensor.inputs[0].shape.shape
+        else
+          tensor.inputs[1].shape.shape
+        end
 
         possible_shape
       when :index
@@ -39,11 +56,11 @@ module TensorStream
 
         axis = tensor.inputs[1].nil? ? 0 : tensor.inputs[1].const_value
         new_shape = tensor.inputs[0].shape.shape
-        new_shape.each_with_index.collect do |shape, index|
+        new_shape.each_with_index.collect { |shape, index|
           next nil if index == axis
 
           shape
-        end.compact
+        }.compact
       when :mean, :prod, :sum, :arg_max
         return [] if tensor.inputs[1].nil?
         return nil if tensor.inputs[0].nil?
@@ -58,24 +75,14 @@ module TensorStream
         axis = [axis] unless axis.is_a?(Array)
         axis = axis.map { |a| a < 0 ? rank - a.abs : a }
 
-        input_shape.each_with_index.map do |item, index|
+        input_shape.each_with_index.map { |item, index|
           if axis.include?(index)
             next 1 if tensor.options[:keepdims]
 
             next nil
           end
           item
-        end.compact
-      when :reshape
-        new_shape = tensor.inputs[1] && tensor.inputs[1].const_value ? tensor.inputs[1].const_value : nil
-        return nil if new_shape.nil?
-        return nil if tensor.inputs[0].shape.nil?
-
-        input_shape = tensor.inputs[0].shape.shape
-        return new_shape if input_shape.nil? && !new_shape.include?(-1) && !new_shape.include?(nil)
-        return nil if input_shape.nil? || input_shape.include?(nil)
-
-        TensorShape.fix_inferred_elements(new_shape, input_shape.reduce(:*))
+        }.compact
       when :flow_group
         []
       when :zeros, :ones, :fill, :random_standard_normal, :random_uniform, :truncated_normal
@@ -94,28 +101,6 @@ module TensorStream
         size = tensor.inputs[0].shape.shape.reduce(:*) || 1
         dummy_tensor_for_shape = TensorShape.reshape(Array.new(size), tensor.inputs[0].shape)
         shape_eval(arr_pad(dummy_tensor_for_shape, tensor.inputs[1].const_value))
-      when :mat_mul
-        return nil if tensor.inputs[0].shape.shape.nil? || tensor.inputs[1].shape.shape.nil?
-        return [] if tensor.inputs[0].shape.shape.empty? || tensor.inputs[1].shape.shape.empty?
-        return nil if tensor.inputs[0].shape.shape.size != 2 || tensor.inputs[1].shape.shape.size != 2
-
-        shape1, m = if tensor.options[:transpose_a]
-                      [tensor.inputs[0].shape.shape[0], tensor.inputs[0].shape.shape[1]]
-                    else
-                      [tensor.inputs[0].shape.shape[1], tensor.inputs[0].shape.shape[0]]
-                    end
-
-        shape2, n = if tensor.options[:transpose_b]
-                      [tensor.inputs[1].shape.shape[1], tensor.inputs[1].shape.shape[0]]
-                    else
-                      [tensor.inputs[1].shape.shape[0], tensor.inputs[1].shape.shape[1]]
-                    end
-
-        return nil if shape1.nil? || shape2.nil? || shape1 < 0 || shape2 < 0
-
-        raise TensorStream::ValueError, "incompatible shape sizes for matrix multiplication (#{shape1} != #{shape2}) #{tensor.inputs[0].shape.shape} vs #{tensor.inputs[1].shape.shape}" if shape1 != shape2
-
-        [m, n]
       when :transpose
         return nil unless shape_full_specified(tensor.inputs[0])
         return nil if tensor.inputs[1].is_a?(Tensor)
@@ -152,10 +137,6 @@ module TensorStream
         new_shape
       when :slice, :squeeze
         nil
-      when :tile
-        nil
-      when :expand_dims
-        nil
       when :broadcast_gradient_args
         nil
       when :no_op
@@ -168,8 +149,6 @@ module TensorStream
         return [tensor.inputs[0].const_value, tensor.inputs[1].const_value] if tensor.inputs[0].const_value && tensor.inputs[1].const_value
 
         nil
-      when :size
-        []
       when :unstack
         return nil unless tensor.inputs[0].shape.known?
 
@@ -190,10 +169,10 @@ module TensorStream
         strides = tensor.options[:strides]
 
         case tensor.options[:padding]
-        when 'SAME'
+        when "SAME"
           new_shape[1] /= strides[1]
           new_shape[2] /= strides[2]
-        when 'VALID'
+        when "VALID"
           new_shape[1] = (new_shape[1] - tensor.inputs[1].shape.shape[0]) / strides[1] + 1
           new_shape[2] = (new_shape[2] - tensor.inputs[1].shape.shape[1]) / strides[2] + 1
         else
@@ -206,11 +185,32 @@ module TensorStream
 
         tensor.inputs[0].const_value
       else
-        return nil if tensor.inputs[0].nil?
-        return tensor.inputs[0].shape.shape if tensor.inputs.size == 1
-
-        TensorShape.infer_shape(tensor.inputs[0].shape.shape, tensor.inputs[1].shape.shape) if tensor.inputs.size == 2 && tensor.inputs[0] && tensor.inputs[1]
+        TensorStream::OpMaker.infer_shape(self, tensor)
       end
     end
+
+    def self._infer_reduction_op_shape(tensor)
+      return [] if tensor.inputs[1].nil?
+      return nil if tensor.inputs[0].nil?
+      return nil unless tensor.inputs[0].shape.known?
+
+      input_shape = tensor.inputs[0].shape.shape
+      rank = input_shape.size
+
+      axis = tensor.inputs[1].const_value
+      return nil if axis.nil?
+
+      axis = [axis] unless axis.is_a?(Array)
+      axis = axis.map { |a| a < 0 ? rank - a.abs : a }
+
+      input_shape.each_with_index.map { |item, index|
+        if axis.include?(index)
+          next 1 if tensor.options[:keepdims]
+
+          next nil
+        end
+        item
+      }.compact
+    end
   end
-end
+end