tensorflow 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eace7d05756f006a0710499d67eeb878234a5c67fafb877aa5e154f7f58a0b0b
-  data.tar.gz: 87f168e411872d952562550b6dfd73ed902c989b5d54df241198732f7a518ae5
+  metadata.gz: 1be807c9cecb0736fd171d31c9144d265f66ba677f9b045bf4e1d8245eb7c330
+  data.tar.gz: eef070cae5c973b546af0658a75bd8954a87f5db5a30be9114e5317ac5508f17
 SHA512:
-  metadata.gz: cc67f8f76b77adc109f85c86aba641e71e6a52f60f7de9a0c983af9bd8a1ada5dc989ebfc8ae40b75da2957d24c07716385d6d949d1df7dc5fd88d4e7bb1172c
-  data.tar.gz: 545a0fb338134f3cd1088d6467cbaa3ebba2465a845bdb91ada369cbc594f5e63108d20a6d6d5e4884885a42b915483fce8414e0ae1ec27b0833b9861a176fe1
+  metadata.gz: 428d8e228de1cdd6f17ac0592b522c2b28fc7cfd7e5007d141c96bd16f1471cdf2fa1be559e44a696247e0454cab8bcf6ab36bab1b45d215f3c1158a1e23b1ca
+  data.tar.gz: 3e91f6daa182a8aa270192e581b1f86755d80ea257e625fbd0678c9a60584e3662666af3b9b55608ecb65fca7162df84d324ce9b3d954bf08c094be1cdf474e2

data/CHANGELOG.md

@@ -1,16 +1,23 @@
-## 0.1.2
+## 0.2.0 (2021-07-07)
+
+- Added support for TensorFlow 2.5
+- Dropped support for TensorFlow < 2.5
+- Dropped support for Ruby < 2.6
+- Changed to Apache 2.0 license to match TensorFlow
+
+## 0.1.2 (2019-09-24)
 
 - Added `Audio`, `Bitwise`, `Image`, `IO`, `Linalg`, `NN`, `Strings`, and `Data::Dataset` modules
 - Added `numo` method to tensors
 - Added Boston housing dataset
 - Fixed string encoding
 
-## 0.1.1
+## 0.1.1 (2019-09-20)
 
 - Added `Math` and `RawOps` modules
 - Added support for more data types
 - Added MNIST dataset
 
-## 0.1.0
+## 0.1.0 (2019-09-17)
 
 - First release

data/LICENSE.txt

@@ -1,22 +1,202 @@
-Copyright (c) 2019 Andrew Kane
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/NOTICE.txt

@@ -0,0 +1,14 @@
+Copyright 2019-2021 The TensorFlow Authors
+Copyright 2019-2021 Andrew Kane
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.md

@@ -1,10 +1,12 @@
 # TensorFlow
 
-[TensorFlow](https://github.com/tensorflow/tensorflow) - the end-to-end machine learning platform - for Ruby
+:fire: [TensorFlow](https://github.com/tensorflow/tensorflow) - the end-to-end machine learning platform - for Ruby
 
-:fire: Uses the C API under the hood
+This gem is currently experimental and only supports basic tensor operations at the moment. Check out [Torch.rb](https://github.com/ankane/torch-rb) for a more complete deep learning library.
 
-[![Build Status](https://travis-ci.org/ankane/tensorflow.svg?branch=master)](https://travis-ci.org/ankane/tensorflow)
+To run a TensorFlow model in Ruby, [convert it to ONNX](https://github.com/onnx/tensorflow-onnx) and use [ONNX Runtime](https://github.com/ankane/onnxruntime). Check out [this tutorial](https://ankane.org/tensorflow-ruby) for a full example.
+
+[![Build Status](https://github.com/ankane/tensorflow/workflows/build/badge.svg?branch=master)](https://github.com/ankane/tensorflow/actions)
 
 ## Installation
 
@@ -22,13 +24,13 @@ gem 'tensorflow'
 
 ## Getting Started
 
-This library follows the TensorFlow 2.0 [Python API](https://www.tensorflow.org/versions/r2.0/api_docs/python/tf). Many methods and options are missing at the moment. Here’s the [current plan](https://github.com/ankane/tensorflow/issues/1). Additional PRs welcome!
+This library follows the TensorFlow 2 [Python API](https://www.tensorflow.org/api_docs/python/tf). Many methods and options are missing at the moment. Here’s the [current plan](https://github.com/ankane/tensorflow/issues/1). Additional PRs welcome!
 
 ## Constants
 
 ```ruby
-a = Tf.constant(2)
-b = Tf.constant(3)
+a = Tf.constant([1, 2, 3])
+b = Tf.constant([4, 5, 6])
 a + b
 ```
 
@@ -42,8 +44,8 @@ w = v + 1
 ## Math
 
 ```ruby
-Tf::Math.abs(-2)
-Tf::Math.sqrt(4)
+Tf::Math.abs([-1, -2])
+Tf::Math.sqrt([1.0, 4.0, 9.0])
 ```
 
 ## FizzBuzz
@@ -137,11 +139,11 @@ Everyone is encouraged to help improve this project. Here are a few ways you can
 - Write, clarify, or fix documentation
 - Suggest or add new features
 
-To get started with development and testing:
+To get started with development:
 
 ```sh
 git clone https://github.com/ankane/tensorflow.git
 cd tensorflow
 bundle install
-rake test
+bundle exec rake test
 ```

data/lib/tensorflow.rb

@@ -43,11 +43,18 @@ require "tensorflow/keras/datasets/fashion_mnist"
 require "tensorflow/keras/datasets/imdb"
 require "tensorflow/keras/datasets/mnist"
 require "tensorflow/keras/datasets/reuters"
+require "tensorflow/keras/layers/conv"
+require "tensorflow/keras/layers/conv2d"
 require "tensorflow/keras/layers/dense"
 require "tensorflow/keras/layers/dropout"
 require "tensorflow/keras/layers/flatten"
+require "tensorflow/keras/losses/sparse_categorical_crossentropy"
 require "tensorflow/keras/metrics/mean"
+require "tensorflow/keras/metrics/sparse_categorical_accuracy"
+require "tensorflow/keras/model"
 require "tensorflow/keras/models/sequential"
+require "tensorflow/keras/optimizers/adam"
+require "tensorflow/keras/preprocessing/image"
 require "tensorflow/keras/utils"
 
 module TensorFlow
@@ -80,6 +87,9 @@ module TensorFlow
 
     def convert_to_tensor(value, dtype: nil)
       value = Tensor.new(value, dtype: dtype) unless value.is_a?(Tensor)
+      if dtype && value.dtype != dtype
+        raise Error, "Tensor conversion requested dtype #{dtype} for Tensor with dtype #{value.dtype}"
+      end
       value
     end
   end

data/lib/tensorflow/context.rb

@@ -9,6 +9,30 @@ module TensorFlow
       FFI.TFE_DeleteContextOptions(options)
     end
 
+    def function?(name)
+      FFI.TFE_ContextHasFunction(@pointer, name) != 0
+    end
+
+    def device_policy
+      FFI::ContextDevicePlacementPolicy[FFI.TFE_ContextGetDevicePlacementPolicy(@pointer)]
+    end
+
+    def enable_run_metadata
+      FFI.TFE_ContextEnableRunMetadata(@pointer)
+    end
+
+    def disable_run_metadata
+      FFI.TFE_ContextDisableRunMetadata(@pointer)
+    end
+
+    def start_step
+      FFI.TFE_ContextStartStep(@pointer)
+    end
+
+    def end_step
+      FFI.TFE_ContextEndStep(@pointer)
+    end
+
     def self.finalize(pointer)
       # must use proc instead of stabby lambda
       proc { FFI.TFE_DeleteContext(pointer) }

data/lib/tensorflow/ffi.rb

@@ -36,11 +36,16 @@ module TensorFlow
     attach_function :TF_DeleteTensor, %i[pointer], :void
     attach_function :TF_TensorData, %i[pointer], :pointer
     attach_function :TF_TensorByteSize, %i[pointer], :size_t
-    attach_function :TF_StringEncode, %i[pointer size_t pointer size_t pointer], :size_t
-    attach_function :TF_StringDecode, %i[pointer size_t pointer pointer pointer], :size_t
-    attach_function :TF_StringEncodedSize, %i[size_t], :size_t
+
+    # https://github.com/tensorflow/tensorflow/blob/master/tensorflow/c/tf_tstring.h
+    attach_function :TF_StringInit, %i[pointer], :void
+    attach_function :TF_StringCopy, %i[pointer pointer size_t], :void
+    attach_function :TF_StringGetDataPointer, %i[pointer], :string
+    attach_function :TF_StringGetSize, %i[pointer], :size_t
 
     # https://github.com/tensorflow/tensorflow/blob/master/tensorflow/c/eager/c_api.h
+    ContextDevicePlacementPolicy = enum(:explicit, :warn, :silent, :silent_for_int32)
+
     attach_function :TFE_NewContextOptions, %i[], :pointer
     attach_function :TFE_ContextOptionsSetAsync, %i[pointer char], :void
     attach_function :TFE_DeleteContextOptions, %i[pointer], :void
@@ -75,5 +80,10 @@ module TensorFlow
     attach_function :TFE_OpSetAttrTypeList, %i[pointer string pointer int], :void
     attach_function :TFE_OpSetAttrShapeList, %i[pointer string pointer pointer int pointer], :void
     attach_function :TFE_Execute, %i[pointer pointer pointer pointer], :pointer
+    attach_function :TFE_ContextHasFunction, %i[pointer string], :uchar
+    attach_function :TFE_ContextEnableRunMetadata, %i[pointer], :void
+    attach_function :TFE_ContextDisableRunMetadata, %i[pointer], :void
+    attach_function :TFE_ContextStartStep, %i[pointer], :void
+    attach_function :TFE_ContextEndStep, %i[pointer], :void
   end
 end

data/lib/tensorflow/keras/layers/conv.rb

@@ -0,0 +1,14 @@
+module TensorFlow
+  module Keras
+    module Layers
+      class Conv
+        def initialize(rank, filters, kernel_size, activation: nil)
+          @rank = rank
+          @filter = filters
+          @kernel_size = kernel_size
+          @activation = activation
+        end
+      end
+    end
+  end
+end

data/lib/tensorflow/keras/layers/conv2d.rb

@@ -0,0 +1,11 @@
+module TensorFlow
+  module Keras
+    module Layers
+      class Conv2D < Conv
+        def initialize(filters, kernel_size, activation: nil)
+          super(2, filters, kernel_size, activation: activation)
+        end
+      end
+    end
+  end
+end

data/lib/tensorflow/keras/layers/dense.rb

@@ -2,7 +2,65 @@ module TensorFlow
   module Keras
     module Layers
       class Dense
-        def initialize(units, activation: nil)
+        def initialize(units, activation: nil, use_bias: true, kernel_initializer: "glorot_uniform", bias_initializer: "zeros", dtype: :float)
+          @units = units
+          @activation = activation
+          @use_bias = use_bias
+          @kernel_initializer = kernel_initializer
+          @bias_initializer = bias_initializer
+          @dtype = dtype
+          @built = false
+        end
+
+        def build(input_shape)
+          last_dim = input_shape.last
+          @kernel = Utils.add_weight(name: "kernel", shape: [last_dim, @units], initializer: @kernel_initializer, dtype: @dtype)
+
+          if @use_bias
+            @bias = Utils.add_weight(name: "bias", shape: [@units], initializer: @bias_initializer, dtype: @dtype)
+          else
+            @bias = nil
+          end
+
+          @output_shape = [last_dim, @units]
+
+          @built = true
+        end
+
+        def output_shape
+          @output_shape
+        end
+
+        def count_params
+          @units + @kernel.shape.inject(&:*)
+        end
+
+        def call(inputs)
+          build(inputs.shape) unless @built
+
+          rank = inputs.shape.size
+
+          if rank > 2
+            raise Error, "Rank > 2 not supported yet"
+          else
+            inputs = TensorFlow.cast(inputs, @dtype)
+            outputs = TensorFlow.matmul(inputs, @kernel)
+          end
+
+          if @use_bias
+            outputs = NN.bias_add(outputs, @bias)
+          end
+
+          case @activation
+          when "relu"
+            NN.relu(outputs)
+          when "softmax"
+            NN.softmax(outputs)
+          when nil
+            outputs
+          else
+            raise "Unknown activation: #{@activation}"
+          end
         end
       end
     end

data/lib/tensorflow/keras/layers/dropout.rb

@@ -4,6 +4,23 @@ module TensorFlow
       class Dropout
         def initialize(rate)
         end
+
+        def build(input_shape)
+          @output_shape = input_shape
+        end
+
+        def call(inputs)
+          # TODO implement
+          TensorFlow.identity(inputs)
+        end
+
+        def output_shape
+          @output_shape
+        end
+
+        def count_params
+          0
+        end
       end
     end
   end

data/lib/tensorflow/keras/layers/flatten.rb

@@ -3,6 +3,21 @@ module TensorFlow
     module Layers
       class Flatten
         def initialize(input_shape: nil)
+          @input_shape = input_shape
+        end
+
+        def output_shape
+          flattened_dim = @input_shape.inject(&:*)
+          [-1, flattened_dim]
+        end
+
+        def count_params
+          0
+        end
+
+        def call(inputs)
+          flattened_dim = inputs.shape[1..-1].inject(&:*)
+          TensorFlow.reshape(inputs, [-1, flattened_dim])
         end
       end
     end

data/lib/tensorflow/keras/losses/sparse_categorical_crossentropy.rb

@@ -0,0 +1,14 @@
+module TensorFlow
+  module Keras
+    module Losses
+      class SparseCategoricalCrossentropy
+        def call(target, output)
+          output = Math.log(output)
+          target = TensorFlow.cast(target, :int64)
+          cost, _ = RawOps.sparse_softmax_cross_entropy_with_logits(features: output, labels: target)
+          Math.reduce_sum(cost) / TensorFlow.cast(RawOps.size(input: cost), :float)
+        end
+      end
+    end
+  end
+end

data/lib/tensorflow/keras/metrics/mean.rb

@@ -2,15 +2,29 @@ module TensorFlow
   module Keras
     module Metrics
       class Mean
+        def initialize(name: nil, dtype: :float)
+          @dtype = dtype
+          @total = Utils.add_weight(name: "total", initializer: "zeros", dtype: @dtype)
+          @count = Utils.add_weight(name: "count", initializer: "zeros", dtype: @dtype)
+        end
+
+        def call(*args)
+          update_state(*args)
+        end
+
         def update_state(values)
-          input = TensorFlow.convert_to_tensor(values, dtype: :float)
-          @total = Math.reduce_sum(input)
-          @count = RawOps.size(input: input)
+          input = TensorFlow.convert_to_tensor(values)
+          input = TensorFlow.cast(input, @dtype)
+          @total.assign_add(Math.reduce_sum(input))
+          @count.assign_add(TensorFlow.cast(RawOps.size(input: input), @dtype))
         end
 
         def result
           RawOps.div_no_nan(x: @total, y: TensorFlow.cast(@count, :float))
         end
+
+        def reset_states
+        end
       end
     end
   end

data/lib/tensorflow/keras/metrics/sparse_categorical_accuracy.rb

@@ -0,0 +1,20 @@
+module TensorFlow
+  module Keras
+    module Metrics
+      class SparseCategoricalAccuracy < Mean
+        def update_state(y_true, y_pred)
+          y_true = TensorFlow.convert_to_tensor(y_true)
+          y_pred = TensorFlow.convert_to_tensor(y_pred)
+
+          y_pred = RawOps.arg_max(input: y_pred, dimension: -1)
+
+          if y_pred.dtype != y_true.dtype
+            y_pred = TensorFlow.cast(y_pred, y_true.dtype)
+          end
+
+          super(Math.equal(y_true, y_pred))
+        end
+      end
+    end
+  end
+end

data/lib/tensorflow/keras/model.rb

@@ -0,0 +1,6 @@
+module TensorFlow
+  module Keras
+    class Model
+    end
+  end
+end

data/lib/tensorflow/keras/models/sequential.rb

@@ -25,6 +25,31 @@ module TensorFlow
         def evaluate(x, y)
           raise "Not implemented"
         end
+
+        def summary
+          sep = "_________________________________________________________________\n"
+
+          output_shape = nil
+          @layers.each do |layer|
+            layer.build(output_shape) if layer.respond_to?(:build)
+            output_shape = layer.output_shape
+          end
+
+          total_params = @layers.map(&:count_params).sum
+
+          summary = String.new("")
+          summary << "Model: \"sequential\"\n"
+          summary << sep
+          summary << "Layer (type)                 Output Shape              Param #   \n"
+          summary << "=================================================================\n"
+          summary << @layers.map { |l| "%-28s %-25s %-10s\n" % [l.class.name.split("::").last, ([nil] + l.output_shape[1..-1]).inspect, l.count_params] }.join(sep)
+          summary << "=================================================================\n"
+          summary << "Total params: #{total_params}\n"
+          summary << "Trainable params: #{total_params}\n"
+          summary << "Non-trainable params: 0\n"
+          summary << sep
+          puts summary
+        end
       end
     end
   end

data/lib/tensorflow/keras/optimizers/adam.rb

@@ -0,0 +1,8 @@
+module TensorFlow
+  module Keras
+    module Optimizers
+      class Adam
+      end
+    end
+  end
+end

data/lib/tensorflow/keras/preprocessing/image.rb

@@ -0,0 +1,22 @@
+module TensorFlow
+  module Keras
+    module Preprocessing
+      module Image
+        class << self
+          def load_img(path, target_size: nil)
+            img = MiniMagick::Image.open(path)
+            if target_size
+              # TODO make resize consistent with Python
+              img.resize "#{target_size.map(&:to_i).join("x")}!", "-filter", "point"
+            end
+            img
+          end
+
+          def img_to_array(img)
+            Numo::SFloat.cast(img.get_pixels)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tensorflow/keras/utils.rb

@@ -2,6 +2,32 @@ module TensorFlow
   module Keras
     module Utils
       class << self
+        def add_weight(name: nil, shape: [], initializer: nil, dtype: :float)
+          variable = Variable.new(shape: shape, name: name, dtype: dtype)
+          initial_value =
+            case initializer
+            when "zeros"
+              TensorFlow.fill(TensorFlow.convert_to_tensor(shape, dtype: :int64), 0.0)
+            when "glorot_uniform"
+              # TODO compute fans
+              fan_in = shape[0]
+              fan_out = shape[1]
+              scale = 1.0
+              scale /= [1.0, (fan_in + fan_out) / 2.0].max
+              limit = ::Math.sqrt(3.0 * scale)
+
+              minval = -limit
+              maxval = limit
+
+              rnd = RawOps.random_uniform(shape: shape, dtype: :float)
+              Math.add(rnd * (maxval - minval), minval)
+            else
+              raise Error, "Unknown initializer: #{initializer}"
+            end
+          variable.assign(initial_value)
+          variable
+        end
+
         def get_file(fname, origin, file_hash: nil, cache_subdir: "datasets")
           # destination
           # TODO handle this better

data/lib/tensorflow/math.rb

@@ -493,7 +493,7 @@ module TensorFlow
 
       def reduction_dims(input_tensor)
         rank = RawOps.rank(input: input_tensor).value
-        (0...rank).to_a
+        TensorFlow.constant((0...rank).to_a, dtype: :int32)
       end
     end
   end

data/lib/tensorflow/ops.rb

@@ -29,6 +29,10 @@ module TensorFlow
       RawOps.range(start: start, limit: limit, delta: delta)
     end
 
+    def reshape(tensor, shape)
+      RawOps.reshape(tensor: tensor, shape: shape)
+    end
+
     def squeeze(input, axis: nil)
       RawOps.squeeze(input: input, squeeze_dims: axis)
     end

data/lib/tensorflow/tensor.rb

@@ -105,19 +105,9 @@ module TensorFlow
         when :complex128
           data_pointer.read_array_of_double(element_count * 2).each_slice(2).map { |v| Complex(*v) }
         when :string
-          # string tensor format
-          # https://github.com/tensorflow/tensorflow/blob/5453aee48858fd375172d7ae22fad1557e8557d6/tensorflow/c/tf_tensor.h#L57
-          start_offset_size = element_count * 8
-          offsets = data_pointer.read_array_of_uint64(element_count)
-          byte_size = FFI.TF_TensorByteSize(tensor_pointer)
+          tf_string_size = 24
           element_count.times.map do |i|
-            str_len = (offsets[i + 1] || (byte_size - start_offset_size)) - offsets[i]
-            str = (data_pointer + start_offset_size + offsets[i]).read_bytes(str_len)
-            dst = ::FFI::MemoryPointer.new(:char, str.bytesize + 100)
-            dst_len = ::FFI::MemoryPointer.new(:size_t)
-            FFI.TF_StringDecode(str, str.bytesize, dst, dst_len, @status)
-            check_status @status
-            dst.read_pointer.read_bytes(dst_len.read_int32)
+            FFI.TF_StringGetDataPointer(data_pointer + i * tf_string_size)
           end
         when :bool
           data_pointer.read_array_of_int8(element_count).map { |v| v == 1 }
@@ -226,20 +216,13 @@ module TensorFlow
       shape
     end
 
-    # string tensor format
-    # https://github.com/tensorflow/tensorflow/blob/5453aee48858fd375172d7ae22fad1557e8557d6/tensorflow/c/tf_tensor.h#L57
     def string_ptr(data)
-      start_offset_size = data.size * 8
-      offsets = [0]
-      data.each do |str|
-        offsets << offsets.last + str.bytesize + 1
-      end
-      data_ptr = ::FFI::MemoryPointer.new(:char, start_offset_size + offsets.pop)
-      data_ptr.write_array_of_uint64(offsets)
-      data.zip(offsets) do |str, offset|
-        dst_len = FFI.TF_StringEncodedSize(str.bytesize)
-        FFI.TF_StringEncode(str, str.bytesize, data_ptr + start_offset_size + offset, dst_len, @status)
-        check_status @status
+      tf_string_size = 24
+      data_ptr = ::FFI::MemoryPointer.new(:char, data.size * tf_string_size)
+      data.each_with_index do |str, i|
+        offset = data_ptr + i * tf_string_size
+        FFI.TF_StringInit(offset)
+        FFI.TF_StringCopy(offset, str, str.bytesize)
       end
       data_ptr
     end

data/lib/tensorflow/variable.rb

@@ -1,9 +1,13 @@
 module TensorFlow
   class Variable
-    def initialize(initial_value, dtype: nil)
+    attr_reader :name
+
+    def initialize(initial_value = nil, dtype: nil, shape: nil, name: nil)
       @dtype = dtype || Utils.infer_type(Array(initial_value).flatten)
+      @shape = shape
+      @name = name
       @pointer = RawOps.var_handle_op(dtype: type_enum, shape: [], shared_name: Utils.default_context.shared_name)
-      assign(initial_value)
+      assign(initial_value) if initial_value
     end
 
     def assign(value)
@@ -42,12 +46,21 @@ module TensorFlow
       inspect
     end
 
+    def shape
+      read_value.shape
+    end
+
     def inspect
       value = read_value
       inspection = %w(numo shape dtype).map { |v| "#{v}: #{value.send(v).inspect}"}
+      inspection.unshift("name: #{name}") if name
       "#<#{self.class} #{inspection.join(", ")}>"
     end
 
+    def to_ptr
+      read_value.to_ptr
+    end
+
     private
 
     def type_enum

data/lib/tensorflow/version.rb

@@ -1,3 +1,3 @@
 module TensorFlow
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tensorflow
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -52,84 +52,15 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: google-protobuf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: 
-email: andrew@chartkick.com
+description:
+email: andrew@ankane.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE.txt
+- NOTICE.txt
 - README.md
 - lib/tensorflow.rb
 - lib/tensorflow/audio.rb
@@ -149,11 +80,18 @@ files:
 - lib/tensorflow/keras/datasets/imdb.rb
 - lib/tensorflow/keras/datasets/mnist.rb
 - lib/tensorflow/keras/datasets/reuters.rb
+- lib/tensorflow/keras/layers/conv.rb
+- lib/tensorflow/keras/layers/conv2d.rb
 - lib/tensorflow/keras/layers/dense.rb
 - lib/tensorflow/keras/layers/dropout.rb
 - lib/tensorflow/keras/layers/flatten.rb
+- lib/tensorflow/keras/losses/sparse_categorical_crossentropy.rb
 - lib/tensorflow/keras/metrics/mean.rb
+- lib/tensorflow/keras/metrics/sparse_categorical_accuracy.rb
+- lib/tensorflow/keras/model.rb
 - lib/tensorflow/keras/models/sequential.rb
+- lib/tensorflow/keras/optimizers/adam.rb
+- lib/tensorflow/keras/preprocessing/image.rb
 - lib/tensorflow/keras/utils.rb
 - lib/tensorflow/linalg.rb
 - lib/tensorflow/math.rb
@@ -167,9 +105,9 @@ files:
 - lib/tensorflow/version.rb
 homepage: https://github.com/ankane/tensorflow
 licenses:
-- MIT
+- Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -177,15 +115,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: TensorFlow - the end-to-end machine learning platform - for Ruby
 test_files: []