FFI backend

lib/tensorflow.rb

@@ -1,4 +1,4 @@
-require 'sciruby/Tensorflow'
+require 'tensorflow/tensorflow_wrap'
 require 'tensorflow/opspec'
 require 'tensorflow/tensor'
 require 'tensorflow/graph'

lib/tensorflow/graph.rb

@@ -7,12 +7,12 @@ class Tensorflow::Graph
     # @!attribute c
     #  contains the graph representation.
     def initialize
-        self.c = Tensorflow::TF_NewGraph()
+        self.c = TensorflowAPI::new_graph()
         @number_of_defaults_created = Hash.new(0)
     end
 
     def delete_graph
-        Tensorflow::TF_DeleteGraph(c)
+        Tensorflow::delete_graph(c)
     end
 
     # write_to writes out a serialized representation of graph in binary wire format.
@@ -94,11 +94,11 @@ def AddOperation(opspec)
         opspec.name = opspec.type if opspec.name == ''
         cname = CString(opspec.name)
         ctype = CString(opspec.type)
-        cdesc = Tensorflow::TF_NewOperation(c, ctype, cname)
+        cdesc = TensorflowAPI::new_operation(c, ctype, cname)
 
         unless opspec.input.empty?
             opspec.input.each do |name|
-                Tensorflow::TF_AddInput(cdesc, name.c)
+                Tensorflow::add_input(cdesc, name.c)
             end
         end
 
@@ -110,7 +110,7 @@ def AddOperation(opspec)
             cdesc = Tensorflow.input_list_helper(cdesc, c_array, length)
          end
 
-        status = Tensorflow::Status.new
+        status = TensorflowAPI::Status.new
         opspec.attr.each do |name, value|
             cdesc, status = set_attributes(cdesc, status, name, value)
             # Memory leak here as the TF_OperationDescription
@@ -122,7 +122,7 @@ def AddOperation(opspec)
             # consider adding a TF_DeleteOperationDescription
             # function to the C API.
         end
-        Tensorflow::Operation.new(Tensorflow::TF_FinishOperation(cdesc, status.c), self)
+        Tensorflow::Operation.new(Tensorflow::finish_operation(cdesc, status.c), self)
     end
 
 private
@@ -192,9 +192,9 @@ def set_attributes(cdesc, status, name, value)
             end
             Tensorflow::TF_SetAttrFloatList(cdesc, cAttrName, list, size)
         when 'DataType'
-            Tensorflow::TF_SetAttrType(cdesc, cAttrName, value)
+            TensorflowAPI::set_attr_type(cdesc, cAttrName, value)
         when 'Tensor'
-            Tensorflow::TF_SetAttrTensor(cdesc, cAttrName, value.tensor, status.c)
+            TensorflowAPI::set_attr_tensor(cdesc, cAttrName, value.tensor, status)
         # TODO: Insert Tensor_list, DataType_list, Bool
         else
             raise 'Attribute type not supported or attribute type not specififed properly. Please look into the documentation for set_attributes in the graph class for more information.'

lib/tensorflow/op.rb

@@ -33,7 +33,5 @@ def Placeholder(scope, dtype)
 
 # A simple makeshift function to convert a ruby string to C++ string
 def CString(string)
-    vector = Tensorflow::String_Vector.new
-    vector[0] = string
-    vector[0]
+    string
 end

lib/tensorflow/status.rb

@@ -3,11 +3,11 @@
 class Tensorflow::Status
     attr_accessor :c
     def initialize
-        self.c = Tensorflow::TF_NewStatus()
+        self.c = Tensorflow::new_status()
     end
 
     def newstatus
-        self.c = Tensorflow::TF_NewStatus()
+        self.c = Tensorflow::new_status()
     end
 
     def code

lib/tensorflow/tensor.rb

@@ -53,11 +53,11 @@ def initialize(value, type = nil)
             rank.zero? ? [1] : shape, Tensorflow::TF_INT64
         )
         if type_num == Tensorflow::TF_STRING
-         self.tensor = Tensorflow::String_encoder(CString(value), CString([0].pack("Q")) )
+         self.tensor = Tensorflow::String_encoder(value, [0].pack("Q"))
          return self
         end
-        self.tensor = Tensorflow::TF_NewTensor_wrapper(type_num,
-                                                       dimension_data, rank, tensor_data, data_size * flatten.length)
+        self.tensor = TensorflowAPI.new_tensor(type_num,
+                                                       dimension_data, rank, tensor_data, data_size * flatten.length, nil, nil)
     end
 
     #
@@ -148,12 +148,11 @@ def ruby_array_to_c(array, type)
             c_array = Tensorflow::Int.new(array.length)
             array.each_with_index { |value, i| c_array[i] = value }
         when Tensorflow::TF_INT64
-            c_array = Tensorflow::Long_long.new(array.length)
-            array.each_with_index { |value, i| c_array[i] = value }
+            c_array = FFI::MemoryPointer.new(:long_long, array.size)
+            array.each_with_index { |value, i| c_array.put_long_long i, value }
         when Tensorflow::TF_STRING
-            c_array = Tensorflow::String_Vector.new
-            array.each_with_index { |value, i| c_array[i] = value }
-            c_array = Tensorflow.string_array_from_string_vector(c_array)
+            c_array = FFI::MemoryPointer.new(:pointer, array.size)
+            array.each_with_index { |value, i| c_array.put_pointer i, FFI::MemoryPointer.from_string(value) }
         else
             c_array = Tensorflow::Complex_Vector.new
             array.each_with_index { |value, i| c_array[i] = value }