red-arrow-nmatrix 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3ffe755b9e4e51b7314d91da2c286f92c681d4f
-  data.tar.gz: d65872943ccf869167e90ddaad2d4593ad50c6fd
+  metadata.gz: 57917fdcb774924da3d381bf4412eed4ec0e9bd2
+  data.tar.gz: 2ea62014eea605a60a872e46f7632c3562b43279
 SHA512:
-  metadata.gz: 952dcdde2b3ae47934b13957e7018e803f3b108f578f02849ee4eeefc1ad860e9f2e56f56e6df19bdfb4d71d06a3d69bba965f8fba723ff0d5bdaa5f8f49212a
-  data.tar.gz: 4c2d47e6a134271d64e378d43c76d89489dc5a8f8842d11d497b7211b829cef53f2522bf8e08821a8523e9cb728afb184159c28333596bd8319d6cd75b2d3f65
+  metadata.gz: be9c3167b15fd4ac0a0923387d3571eb8575beefa72e8da49a3b242a612d5a24ce925b8029f477fb456e500551f65874418aa6b2051b523880a9fe052c963997
+  data.tar.gz: 8fcd0b7d185aa92217d933cb6b5d121d29699c796076103cc075593797c54a49105952948f6861c032c0fd50e31be59dc2d2f02f5d7bad0f1e2e8e1e5ea709f5

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 0.0.2 - 2017-05-18
+
+### Fixed
+
+  * Added missing C source files.
+
 ## 0.0.1 - 2017-05-18
 
 Initial release!!!

data/ext/arrow-nmatrix/arrow-nmatrix.c

@@ -0,0 +1,214 @@
+/*
+ * Copyright 2017 Kouhei Sutou <kou@clear-code.com>
+ *
+ * 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.
+ */
+
+#include <arrow-glib/arrow-glib.h>
+
+#include <rbgobject.h>
+
+#include <nmatrix.h>
+
+/* TODO: NMatrix should extern them. */
+extern const size_t DTYPE_SIZES[NM_NUM_DTYPES];
+/* extern size_t nm_storage_count_max_elements(const STORAGE* storage); */
+
+void Init_arrow_nmatrix(void);
+
+static nm_dtype_t
+garrow_type_to_nmatrix_dtype(GArrowType arrow_type)
+{
+  nm_dtype_t nmatrix_type = (nm_dtype_t)-1;
+
+  switch (arrow_type) {
+  case GARROW_TYPE_UINT8:
+    nmatrix_type = BYTE;
+    break;
+  case GARROW_TYPE_INT8:
+    nmatrix_type = INT8;
+    break;
+  case GARROW_TYPE_INT16:
+    nmatrix_type = INT16;
+    break;
+  case GARROW_TYPE_INT32:
+    nmatrix_type = INT32;
+    break;
+  case GARROW_TYPE_INT64:
+    nmatrix_type = INT64;
+    break;
+  case GARROW_TYPE_FLOAT:
+    nmatrix_type = FLOAT32;
+    break;
+  case GARROW_TYPE_DOUBLE:
+    nmatrix_type = FLOAT64;
+    break;
+  case GARROW_TYPE_NA:
+  case GARROW_TYPE_BOOL:
+  case GARROW_TYPE_UINT16:
+  case GARROW_TYPE_UINT32:
+  case GARROW_TYPE_UINT64:
+  case GARROW_TYPE_HALF_FLOAT:
+  case GARROW_TYPE_STRING:
+  case GARROW_TYPE_BINARY:
+  case GARROW_TYPE_DATE32:
+  case GARROW_TYPE_DATE64:
+  case GARROW_TYPE_TIMESTAMP:
+  case GARROW_TYPE_TIME32:
+  case GARROW_TYPE_TIME64:
+  case GARROW_TYPE_INTERVAL:
+  case GARROW_TYPE_DECIMAL:
+  case GARROW_TYPE_LIST:
+  case GARROW_TYPE_STRUCT:
+  case GARROW_TYPE_UNION:
+  case GARROW_TYPE_DICTIONARY:
+  default:
+    break;
+  }
+
+  return nmatrix_type;
+}
+
+static VALUE
+rb_arrow_tensor_to_nmatrix(VALUE self)
+{
+  GArrowTensor *tensor;
+  GArrowType value_type;
+  nm_dtype_t nmatrix_data_type;
+  gint64 *shape;
+  gint n_dimensions;
+  GArrowBuffer *buffer;
+  GBytes *data;
+  gconstpointer data_raw;
+  gsize data_size;
+  VALUE rb_nmatrix = Qnil;
+
+  tensor = RVAL2GOBJ(self);
+  value_type = garrow_tensor_get_value_type(tensor);
+  nmatrix_data_type = garrow_type_to_nmatrix_dtype(value_type);
+  if (nmatrix_data_type == (nm_dtype_t)-1) {
+    GArrowDataType *data_type;
+    VALUE rb_data_type;
+    data_type = garrow_tensor_get_value_data_type(tensor);
+    rb_data_type = GOBJ2RVAL(data_type);
+    g_object_unref(data_type);
+    rb_raise(rb_eArgError,
+             "Arrow::Tensor data type must be uint8, int*, float or double: "
+             "<%" PRIsVALUE ">",
+             rb_data_type);
+  }
+
+  shape = garrow_tensor_get_shape(tensor, &n_dimensions);
+  buffer = garrow_tensor_get_buffer(tensor);
+  data = garrow_buffer_get_data(buffer);
+  data_raw = g_bytes_get_data(data, &data_size);
+
+  rb_nmatrix = rb_nmatrix_dense_create(nmatrix_data_type,
+                                       (size_t *)shape,
+                                       n_dimensions,
+                                       (void *)data_raw,
+                                       data_size);
+  g_bytes_unref(data);
+  g_object_unref(buffer);
+  g_free(shape);
+
+  return rb_nmatrix;
+}
+
+static GArrowDataType *
+nmatrix_dtype_to_garrow_data_type(nm_dtype_t nmatrix_type)
+{
+  GArrowDataType *arrow_data_type = NULL;
+
+  switch (nmatrix_type) {
+  case BYTE:
+    arrow_data_type = garrow_uint8_data_type_new();
+    break;
+  case INT8:
+    arrow_data_type = garrow_int8_data_type_new();
+    break;
+  case INT16:
+    arrow_data_type = garrow_int16_data_type_new();
+    break;
+  case INT32:
+    arrow_data_type = garrow_int32_data_type_new();
+    break;
+  case INT64:
+    arrow_data_type = garrow_int64_data_type_new();
+    break;
+  case FLOAT32:
+    arrow_data_type = garrow_float_data_type_new();
+    break;
+  case FLOAT64:
+    arrow_data_type = garrow_double_data_type_new();
+    break;
+  case COMPLEX64:
+  case COMPLEX128:
+  case RUBYOBJ:
+  default:
+    break;
+  }
+
+  return arrow_data_type;
+}
+
+static VALUE
+rb_nmatrix_to_arrow(VALUE self)
+{
+  GArrowDoubleDataType *data_type;
+  GArrowBuffer *data;
+  GArrowTensor *tensor;
+  VALUE rb_tensor;
+
+  data_type = nmatrix_dtype_to_garrow_data_type(NM_DTYPE(self));
+  if (!data_type) {
+    rb_raise(rb_eArgError,
+             "NMatrix data type must be "
+             ":byte, :int8, :int16, :int32, :int64, :float32 or :float64: "
+             "<%" PRIsVALUE ">",
+             self);
+  }
+  data = garrow_buffer_new((const guint8 *)NM_DENSE_ELEMENTS(self),
+                           NM_SIZEOF_DTYPE(self) * NM_DENSE_COUNT(self));
+  tensor = garrow_tensor_new(GARROW_DATA_TYPE(data_type),
+                             data,
+                             (gint64 *)(NM_STORAGE(self)->shape),
+                             NM_DIM(self),
+                             NULL,
+                             0,
+                             NULL,
+                             0);
+  g_object_unref(data);
+  g_object_unref(data_type);
+
+  rb_tensor = GOBJ2RVAL(tensor);
+  g_object_unref(tensor);
+
+  return rb_tensor;
+}
+
+void
+Init_arrow_nmatrix(void)
+{
+  VALUE rb_Arrow;
+  VALUE rb_ArrowTensor;
+
+  rb_Arrow = rb_const_get(rb_cObject, rb_intern("Arrow"));
+  rb_ArrowTensor = rb_const_get(rb_Arrow, rb_intern("Tensor"));
+
+  rb_define_method(rb_ArrowTensor, "to_nmatrix",
+                   rb_arrow_tensor_to_nmatrix, 0);
+
+  rb_define_method(cNMatrix, "to_arrow",
+                   rb_nmatrix_to_arrow, 0);
+}

data/lib/arrow-nmatrix/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module ArrowNMatrix
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/red-arrow-nmatrix.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.files = ["README.md", "Rakefile", "Gemfile", "#{spec.name}.gemspec"]
   spec.files += [".yardopts"]
   spec.files += Dir.glob("lib/**/*.rb")
+  spec.files += Dir.glob("ext/**/*.c")
   spec.files += Dir.glob("doc/text/*")
   spec.extensions = ["ext/arrow-nmatrix/extconf.rb"]
   spec.test_files += Dir.glob("test/**/*")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: red-arrow-nmatrix
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -140,6 +140,7 @@ files:
 - Rakefile
 - doc/text/apache-2.0.txt
 - doc/text/news.md
+- ext/arrow-nmatrix/arrow-nmatrix.c
 - ext/arrow-nmatrix/extconf.rb
 - lib/arrow-nmatrix.rb
 - lib/arrow-nmatrix/version.rb
@@ -174,7 +175,7 @@ specification_version: 4
 summary: Red Arrow NMatrix is a library that provides converters between Apache Arrow's
   tensor data (`Arrow::Tensor`) and NMatrix's matrix data (`NMatrix`).
 test_files:
-- test/test-to-arrow.rb
-- test/helper.rb
-- test/run-test.rb
 - test/test-to-nmatrix.rb
+- test/run-test.rb
+- test/helper.rb
+- test/test-to-arrow.rb