tensor_stream 0.8.1 → 0.8.5

data/lib/tensor_stream/images.rb

@@ -0,0 +1,16 @@
+module TensorStream
+  module Images
+    extend OpHelper
+    extend TensorStream::Utils
+
+    def self.decode_png(contents, channels: 0, dtype: :uint8, name: nil)
+      _op(:decode_png, contents, channels: channels, data_type: dtype, name: name)
+    end
+
+    def self.encode_png(contents, compression: -1, name: nil)
+      check_allowed_types(contents, [:uint8, :uint16])
+      contents = convert_to_tensor(contents, dtype: :uint16)
+      _op(:encode_png, contents, compression: compression, name: name)
+    end
+  end
+end

data/lib/tensor_stream/ops.rb

@@ -2,7 +2,7 @@ module TensorStream
   # Class that defines all available ops supported by TensorStream
   module Ops
     FLOATING_POINT_TYPES = %i[float32 float64 float].freeze
-    INTEGER_TYPES = %i[int32 int int64].freeze
+    INTEGER_TYPES = %i[uint8 int32 int int64].freeze
     NUMERIC_TYPES = FLOATING_POINT_TYPES + INTEGER_TYPES
 
     ##
@@ -634,6 +634,10 @@ module TensorStream
       _op(:stack, *values, axis: axis, name: name)
     end
 
+    def squeeze(value, axis: [], name: nil)
+      _op(:squeeze, value, axis: axis, name: nil)
+    end
+
     def setdiff1d(x, y, index_dtype: :int32, name: nil)
       result = _op(:setdiff1d, x, y, index_dtype: index_dtype, name: name)
       [result[0], result[1]]

data/lib/tensor_stream/session.rb

@@ -124,21 +124,6 @@ module TensorStream
       end
     end
 
-    protected
-
-    def run_with_session_context(tensor, session_context, context)
-      session_context[:_cache][:placement][tensor.name] = assign_evaluator(tensor) if session_context[:_cache][:placement][tensor.name].nil?
-      session_context[:_cache][:placement][tensor.name][1].run_with_buffer(tensor, session_context, context)
-    end
-
-    def recursive_eval(value, depth = 2)
-      if value.is_a?(Array) && depth > 0
-        value.collect { |v| recursive_eval(v, depth - 1) }
-      else
-        value.respond_to?(:to_ruby) ? value.to_ruby : value
-      end
-    end
-
     def assign_evaluator(tensor)
       device = @evaluator_classes.map do |klass|
         next nil if tensor.is_a?(Operation) && !klass.ops.include?(tensor.operation.to_sym)
@@ -157,6 +142,21 @@ module TensorStream
       end
     end
 
+    protected
+
+    def run_with_session_context(tensor, session_context, context)
+      session_context[:_cache][:placement][tensor.name] = assign_evaluator(tensor) if session_context[:_cache][:placement][tensor.name].nil?
+      session_context[:_cache][:placement][tensor.name][1].run_with_buffer(tensor, session_context, context)
+    end
+
+    def recursive_eval(value, depth = 2)
+      if value.is_a?(Array) && depth > 0
+        value.collect { |v| recursive_eval(v, depth - 1) }
+      else
+        value.respond_to?(:to_ruby) ? value.to_ruby : value
+      end
+    end
+
     def prepare_evaluators(tensor_arr, context)
       context[:_cache][:placement] ||= {}
 

data/lib/tensor_stream/tensor.rb

@@ -260,7 +260,7 @@ module TensorStream
         end
       when :string
         val.to_s
-      when :int32, :int16, :int
+      when :int32, :int16, :uint8, :int
         if !!val == val
           val ? 1 : 0
         else

data/lib/tensor_stream/train/adadelta_optimizer.rb

@@ -0,0 +1,52 @@
+module TensorStream
+  module Train
+    # High Level implementation of the Adadelta algorithm
+    class AdadeltaOptimizer < Optimizer
+      include TensorStream::OpHelper
+
+      attr_accessor :learning_rate
+
+      def initialize(learning_rate = 0.001, rho = 0.95, epsilon = 1e-8,
+        use_locking: false, name: "Adadelta")
+        @learning_rate = learning_rate
+        @rho = rho
+        @epsilon = epsilon
+    
+        # Tensor versions of the constructor arguments, created in _prepare().
+        @learning_rate_tensor = nil
+        @rho_t = nil
+        @epsilon_t = nil
+        super(name: name, use_locking: use_locking)
+      end
+
+      protected
+
+      def create_slots(var_list)
+        var_list.each do |v|
+          zeros_slot(v, "accum", @name)
+          zeros_slot(v, "accum_update", @name)
+        end
+      end
+
+      def prepare
+        @learning_rate_tensor = convert_to_tensor(@learning_rate, name: "lr")
+        @rho_t = convert_to_tensor(@rho, name: "rho")
+        @epsilon_t = convert_to_tensor(@epsilon, name: "epsilon")
+      end
+
+      def apply_dense(grad, var)
+        accum = get_slot(var, "accum")
+        accum_update = get_slot(var, "accum_update")
+        _op(:apply_adadelta,
+            var,
+            accum,
+            accum_update,
+            TensorStream.cast(@learning_rate_tensor, var.data_type),
+            TensorStream.cast(@rho_t, var.data_type),
+            TensorStream.cast(@epsilon_t, var.data_type),
+            grad,
+            use_locking: @use_locking)
+      end
+    end
+  end
+end

data/lib/tensor_stream/train/adam_optimizer.rb

@@ -1,12 +1,27 @@
 module TensorStream
   module Train
-    # High Level implementation of the gradient descent algorithm
+    # High Level implementation of the ADAM algorithm
     class AdamOptimizer < Optimizer
       include TensorStream::OpHelper
 
       attr_accessor :learning_rate
 
-      def initialize(learning_rate = 0.001, beta1=0.9, beta2=0.999, epsilon = 1e-8,
+      ##
+      # Construct a new Adam optimizer.
+      #
+      # Args:
+      # learning_rate: A Tensor or a floating point value.  The learning rate.
+      # beta1: A float value or a constant float tensor.
+      #   The exponential decay rate for the 1st moment estimates.
+      # beta2: A float value or a constant float tensor.
+      #   The exponential decay rate for the 2nd moment estimates.
+      # epsilon: A small constant for numerical stability. This epsilon is
+      #   "epsilon hat" in the Kingma and Ba paper (in the formula just before
+      #   Section 2.1), not the epsilon in Algorithm 1 of the paper.
+      # use_locking: If True use locks for update operations.
+      # name: Optional name for the operations created when applying gradients.
+      #   Defaults to "Adam".
+      def initialize(learning_rate = 0.001, beta1 = 0.9, beta2 = 0.999, epsilon = 1e-8,
                      use_locking: false, name: "Adam")
         @learning_rate = learning_rate
         @beta1 = beta1

data/lib/tensor_stream/train/gradient_descent_optimizer.rb

@@ -8,13 +8,19 @@ module TensorStream
 
       def initialize(learning_rate, use_locking: false, name: "GradientDescent")
         @learning_rate = learning_rate
+        @learning_rate_tensor = nil
         super(name: name, use_locking: use_locking)
       end
 
       protected
 
+      def prepare
+        learning_rate = call_if_callable(@learning_rate)
+        @learning_rate_tensor = convert_to_tensor(learning_rate, name: "learning_rate")
+      end
+
       def apply_dense(grad, var)
-        i_op(:apply_gradient_descent, var, TensorStream.cast(@learning_rate, grad.data_type), grad)
+        i_op(:apply_gradient_descent, var, TensorStream.cast(@learning_rate_tensor, grad.data_type), grad)
       end
     end
   end

data/lib/tensor_stream/trainer.rb

@@ -3,6 +3,7 @@ require 'tensor_stream/train/optimizer'
 require 'tensor_stream/train/gradient_descent_optimizer'
 require 'tensor_stream/train/momentum_optimizer'
 require 'tensor_stream/train/adam_optimizer'
+require 'tensor_stream/train/adadelta_optimizer'
 require 'tensor_stream/train/saver'
 
 module TensorStream

data/lib/tensor_stream/types.rb

@@ -15,6 +15,10 @@ module TensorStream
       :int32
     end
 
+    def self.uint8
+      :uint8
+    end
+
     def self.float64
       :float64
     end

data/lib/tensor_stream/utils.rb

@@ -206,6 +206,10 @@ module TensorStream
       TensorStream::Trainer
     end
 
+    def image
+      TensorStream::Images
+    end
+
     def trainable_variables
       TensorStream.get_default_graph.get_collection(TensorStream::GraphKeys::TRAINABLE_VARIABLES)
     end

data/lib/tensor_stream/variable_scope.rb

@@ -11,6 +11,7 @@ module TensorStream
     end
 
     def get_variable(name, dtype: nil, shape: nil, initializer: nil, trainable: true, collections: nil, validate_shape: false)
+      raise TensorStream::ValueError, "validate_shape=true and initializer does not have a defined shape" if validate_shape && !shape.nil && initializer.is_a?(Tensor)
       TensorStream::Variable.new(dtype || :float32, nil, shape, self, collections: collections, name: name, initializer: initializer, trainable: trainable)
     end
 

data/lib/tensor_stream/version.rb

@@ -1,5 +1,5 @@
 module TensorStream
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.8.5'.freeze
 
   def self.version
     VERSION

data/samples/linear_regression.rb

@@ -1,5 +1,5 @@
 # Linear Regression sample, using SGD and auto-differentiation
-
+require "bundler/setup"
 require 'tensor_stream'
 
 tf = TensorStream # use tf to make it look like TensorFlow
@@ -20,6 +20,7 @@ X = tf.placeholder("float")
 Y = tf.placeholder("float")
 
 # Set model weights
+
 W = tf.variable(rand, name: "weight")
 b = tf.variable(rand, name: "bias")
 
@@ -32,8 +33,10 @@ cost = ((pred - Y) ** 2).reduce(:+) / ( 2 * n_samples)
 # Other possible Optimizers
 # optimizer = TensorStream::Train::MomentumOptimizer.new(learning_rate, momentum, use_nesterov: true).minimize(cost)
 # optimizer = TensorStream::Train::AdamOptimizer.new(learning_rate).minimize(cost)
+# optimizer = TensorStream::Train::AdadeltaOptimizer.new(1.0).minimize(cost)
 optimizer = TensorStream::Train::GradientDescentOptimizer.new(learning_rate).minimize(cost)
 
+
 # Initialize the variables (i.e. assign their default value)
 init = tf.global_variables_initializer()
 

data/samples/mnist_data.rb

@@ -0,0 +1,64 @@
+# A ruby port of the example code discussed by Martin Gorner in
+# "TensorFlow and Deep Learning without a PhD, Part 1 (Google Cloud Next '17)""
+#
+# https://www.youtube.com/watch?v=u4alGiomYP4
+#
+# Requirements:
+#   mnist-learn gem
+#   opencl_ruby_ffi gem
+require "bundler/setup"
+require 'tensor_stream'
+require 'mnist-learn'
+
+# Enable OpenCL hardware accelerated computation, not using OpenCL can be very slow
+require 'tensor_stream/evaluator/opencl/opencl_evaluator'
+
+tf = TensorStream
+
+# Import MNIST data
+puts "downloading minst data"
+mnist = Mnist.read_data_sets('/tmp/data', one_hot: true)
+puts "downloading finished"
+
+x = tf.placeholder(:float32, shape: [nil, 28, 28, 1])
+w = tf.variable(tf.zeros([784, 10]))
+b = tf.variable(tf.zeros([10]))
+
+init = tf.global_variables_initializer
+
+# model
+y = tf.nn.softmax(tf.matmul(tf.reshape(x, [-1, 784]), w) + b)
+
+y_ = tf.placeholder(:float32, shape: [nil, 10])
+
+# loss function
+cross_entropy = -tf.reduce_sum(y_ * tf.log(y))
+
+is_correct = tf.equal(tf.argmax(y, 1), tf.argmax(y_, 1))
+accuracy =  tf.reduce_mean(tf.cast(is_correct, :float32))
+
+optimizer = TensorStream::Train::GradientDescentOptimizer.new(0.01)
+train_step = optimizer.minimize(cross_entropy)
+
+sess = tf.session
+sess.run(init)
+
+(0...1000).each do |i|
+  # load batch of images and correct answers
+  batch_x, batch_y = mnist.train.next_batch(100)
+  train_data = { x => batch_x, y_ => batch_y }
+
+  # train
+  sess.run(train_step, feed_dict: train_data)
+  if (i % 10 == 0)
+    # success? add code to print it
+    a, c = sess.run([accuracy, cross_entropy], feed_dict: train_data)
+    puts "#{i} train accuracy #{a}, error #{c}"
+
+    # success on test data?
+    test_data = { x => mnist.test.images, y_ => mnist.test.labels }
+    a, c = sess.run([accuracy, cross_entropy], feed_dict: test_data)
+    puts " test accuracy #{a}, error #{c}"
+  end
+end
+

data/samples/nearest_neighbor.rb

@@ -8,10 +8,9 @@ Project: https://github.com/aymericdamien/TensorFlow-Examples/
 
 Make sure to install the mnist-learn gem !!
 '''
-
+require "bundler/setup"
 require 'tensor_stream'
 require 'mnist-learn'
-require 'tensor_stream/evaluator/opencl/opencl_evaluator'
 
 tf = TensorStream
 

data/samples/raw_neural_net_sample.rb

@@ -12,9 +12,9 @@ Project: https://github.com/aymericdamien/TensorFlow-Examples/
 
 The mnist-learn gem is required as well as an OpenCL compatible device with drivers correctly installed
 """
+require "bundler/setup"
 require 'tensor_stream'
 require 'mnist-learn'
-require 'tensor_stream/evaluator/opencl/opencl_evaluator'
 
 tf = TensorStream
 # Import MNIST data

data/tensor_stream.gemspec

@@ -44,4 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_dependency "deep_merge"
   spec.add_dependency "concurrent-ruby"
+  spec.add_dependency "chunky_png"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tensor_stream
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.5
 platform: ruby
 authors:
 - Joseph Emmanuel Dayo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A reimplementation of TensorFlow for ruby. This is a ground up implementation
   with no dependency on TensorFlow. Effort has been made to make the programming style
   as near to TensorFlow as possible, comes with a pure ruby evaluator by default as
@@ -243,65 +257,14 @@ files:
 - lib/tensor_stream/evaluator/base_evaluator.rb
 - lib/tensor_stream/evaluator/buffer.rb
 - lib/tensor_stream/evaluator/evaluator.rb
-- lib/tensor_stream/evaluator/opencl/kernels/_bool_operand.cl
-- lib/tensor_stream/evaluator/opencl/kernels/_operand.cl
-- lib/tensor_stream/evaluator/opencl/kernels/abs.cl
-- lib/tensor_stream/evaluator/opencl/kernels/acos.cl
-- lib/tensor_stream/evaluator/opencl/kernels/add.cl
-- lib/tensor_stream/evaluator/opencl/kernels/apply_adam.cl
-- lib/tensor_stream/evaluator/opencl/kernels/apply_gradient.cl
-- lib/tensor_stream/evaluator/opencl/kernels/apply_momentum.cl
-- lib/tensor_stream/evaluator/opencl/kernels/argmax.cl
-- lib/tensor_stream/evaluator/opencl/kernels/argmin.cl
-- lib/tensor_stream/evaluator/opencl/kernels/asin.cl
-- lib/tensor_stream/evaluator/opencl/kernels/cast.cl
-- lib/tensor_stream/evaluator/opencl/kernels/ceil.cl
-- lib/tensor_stream/evaluator/opencl/kernels/cond.cl.erb
-- lib/tensor_stream/evaluator/opencl/kernels/cos.cl
-- lib/tensor_stream/evaluator/opencl/kernels/div.cl.erb
-- lib/tensor_stream/evaluator/opencl/kernels/exp.cl
-- lib/tensor_stream/evaluator/opencl/kernels/floor.cl
-- lib/tensor_stream/evaluator/opencl/kernels/floor_div.cl
-- lib/tensor_stream/evaluator/opencl/kernels/floor_mod.cl
-- lib/tensor_stream/evaluator/opencl/kernels/gemm.cl
-- lib/tensor_stream/evaluator/opencl/kernels/log.cl
-- lib/tensor_stream/evaluator/opencl/kernels/log1p.cl
-- lib/tensor_stream/evaluator/opencl/kernels/log_softmax.cl
-- lib/tensor_stream/evaluator/opencl/kernels/max.cl
-- lib/tensor_stream/evaluator/opencl/kernels/min.cl
-- lib/tensor_stream/evaluator/opencl/kernels/mod.cl
-- lib/tensor_stream/evaluator/opencl/kernels/mul.cl
-- lib/tensor_stream/evaluator/opencl/kernels/negate.cl
-- lib/tensor_stream/evaluator/opencl/kernels/pack.cl
-- lib/tensor_stream/evaluator/opencl/kernels/pow.cl
-- lib/tensor_stream/evaluator/opencl/kernels/real_div.cl
-- lib/tensor_stream/evaluator/opencl/kernels/reciprocal.cl
-- lib/tensor_stream/evaluator/opencl/kernels/round.cl
-- lib/tensor_stream/evaluator/opencl/kernels/sigmoid.cl
-- lib/tensor_stream/evaluator/opencl/kernels/sigmoid_grad.cl
-- lib/tensor_stream/evaluator/opencl/kernels/sign.cl
-- lib/tensor_stream/evaluator/opencl/kernels/sin.cl
-- lib/tensor_stream/evaluator/opencl/kernels/softmax.cl
-- lib/tensor_stream/evaluator/opencl/kernels/softmax_cross.cl
-- lib/tensor_stream/evaluator/opencl/kernels/softmax_cross_grad.cl
-- lib/tensor_stream/evaluator/opencl/kernels/softmax_grad.cl
-- lib/tensor_stream/evaluator/opencl/kernels/sqrt.cl
-- lib/tensor_stream/evaluator/opencl/kernels/square.cl
-- lib/tensor_stream/evaluator/opencl/kernels/squared_difference.cl
-- lib/tensor_stream/evaluator/opencl/kernels/sub.cl
-- lib/tensor_stream/evaluator/opencl/kernels/tan.cl
-- lib/tensor_stream/evaluator/opencl/kernels/tanh.cl
-- lib/tensor_stream/evaluator/opencl/kernels/tanh_grad.cl
-- lib/tensor_stream/evaluator/opencl/kernels/where.cl
-- lib/tensor_stream/evaluator/opencl/opencl_buffer.rb
-- lib/tensor_stream/evaluator/opencl/opencl_device.rb
-- lib/tensor_stream/evaluator/opencl/opencl_evaluator.rb
-- lib/tensor_stream/evaluator/opencl/opencl_template_helper.rb
 - lib/tensor_stream/evaluator/operation_helpers/array_ops_helper.rb
 - lib/tensor_stream/evaluator/operation_helpers/math_helper.rb
 - lib/tensor_stream/evaluator/operation_helpers/random_gaussian.rb
+- lib/tensor_stream/evaluator/ruby/array_ops.rb
+- lib/tensor_stream/evaluator/ruby/images_ops.rb
 - lib/tensor_stream/evaluator/ruby/math_ops.rb
 - lib/tensor_stream/evaluator/ruby/nn_ops.rb
+- lib/tensor_stream/evaluator/ruby/random_ops.rb
 - lib/tensor_stream/evaluator/ruby_evaluator.rb
 - lib/tensor_stream/exceptions.rb
 - lib/tensor_stream/graph.rb
@@ -313,6 +276,7 @@ files:
 - lib/tensor_stream/graph_serializers/serializer.rb
 - lib/tensor_stream/helpers/op_helper.rb
 - lib/tensor_stream/helpers/string_helper.rb
+- lib/tensor_stream/images.rb
 - lib/tensor_stream/initializer.rb
 - lib/tensor_stream/math_gradients.rb
 - lib/tensor_stream/monkey_patches/integer.rb
@@ -323,6 +287,7 @@ files:
 - lib/tensor_stream/session.rb
 - lib/tensor_stream/tensor.rb
 - lib/tensor_stream/tensor_shape.rb
+- lib/tensor_stream/train/adadelta_optimizer.rb
 - lib/tensor_stream/train/adam_optimizer.rb
 - lib/tensor_stream/train/gradient_descent_optimizer.rb
 - lib/tensor_stream/train/momentum_optimizer.rb
@@ -342,6 +307,7 @@ files:
 - samples/iris.rb
 - samples/linear_regression.rb
 - samples/logistic_regression.rb
+- samples/mnist_data.rb
 - samples/multigpu.rb
 - samples/nearest_neighbor.rb
 - samples/raw_neural_net_sample.rb
@@ -367,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.0.beta1
 signing_key: 
 specification_version: 4
 summary: A Pure ruby tensorflow implementation