numo-tiny_linalg 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '023843b368ce62924768c3341587977e57edb6aca0e6d93b64279d5e7965bf0b'
-  data.tar.gz: fe00ae7b435a94a6ff2790320f89bfef078efafed110e253f8929553480b67d6
+  metadata.gz: 7a298eaec7ee7338e4856ac50b22a06bf774073456a01f5ffb2a405cab632f7a
+  data.tar.gz: a44ae42f723ee7c9a1af6c2b1a01e6257f1fc417a5cd2a22cb6be51ac0589c1c
 SHA512:
-  metadata.gz: 36d907834c73b633ae3872ba5fa73f315dd01d79e99487e7fb4f6f2e3f37a7fbcbfa1b25d078b4d44cd66213da545a665c35817d6929d22a8a05fa023791bd2f
-  data.tar.gz: eaab6dbb2835d60ad3432525a830a1a5f19625c7b87d1010db81efeb480892c0807612d8d13cdc23c60abde1d7304594fc4562099102a6738b8cee1aeccb55a6
+  metadata.gz: fce33aa331257bc37d7a972e09a0cf1d9328046459c9de6b9feaf8341d0d4545d202b90d6bb0e5e6ee097b4c9c58a4bc76fc0224fd87dc10818c8f566259ab7e
+  data.tar.gz: 6da516469d0fdfb47884fea2d9fc2483b5ea066063ce1681afc8e9319d1cfcc6863f59e96a4ce1d7cb22ceb159a8b2f8f6e41478958ea245a5eaaf209753ea2c

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 ## [Unreleased]
 
-## [[0.0.3](https://github.com/yoshoku/numo-tiny_linalg/compare/v0.0.3...v0.0.4)] - 2023-08-06
+## [[0.1.0](https://github.com/yoshoku/numo-tiny_linalg/compare/v0.0.4...v0.1.0)] - 2023-08-06
+- Refactor codes and update documentations.
+
+## [[0.0.4](https://github.com/yoshoku/numo-tiny_linalg/compare/v0.0.3...v0.0.4)] - 2023-08-06
 - Add dsygv, ssygv, zhegv, and chegv module functions to TinyLinalg::Lapack.
 - Add dsygvd, ssygvd, zhegvd, and chegvd module functions to TinyLinalg::Lapack.
 - Add dsygvx, ssygvx, zhegvx, and chegvx module functions to TinyLinalg::Lapack.

data/README.md

@@ -5,11 +5,11 @@
 [![BSD 3-Clause License](https://img.shields.io/badge/License-BSD%203--Clause-orange.svg)](https://github.com/yoshoku/numo-tiny_linalg/blob/main/LICENSE.txt)
 [![Documentation](https://img.shields.io/badge/api-reference-blue.svg)](https://yoshoku.github.io/numo-tiny_linalg/doc/)
 
-Numo::TinyLinalg is a subset library from Numo::Linalg consisting only of methods used in Machine Learning algorithms.
-
-This gem is still **under development** and may undergo many changes in the future.
+Numo::TinyLinalg is a subset library from [Numo::Linalg](https://github.com/ruby-numo/numo-linalg) consisting only of methods used in Machine Learning algorithms.
+The functions Numo::TinyLinalg supports are dot, det, eigh, inv, pinv, qr, solve, and svd.
 
 ## Installation
+Unlike Numo::Linalg, Numo::TinyLinalg only supports OpenBLAS as a backend library for BLAS and LAPACK.
 
 Install the OpenBlas.
 

data/ext/numo/tiny_linalg/blas/gemm.hpp

@@ -102,9 +102,9 @@ private:
 
     dtype alpha = kw_values[0] != Qundef ? Converter().to_dtype(kw_values[0]) : Converter().one();
     dtype beta = kw_values[1] != Qundef ? Converter().to_dtype(kw_values[1]) : Converter().zero();
-    enum CBLAS_ORDER order = kw_values[2] != Qundef ? get_cblas_order(kw_values[2]) : CblasRowMajor;
-    enum CBLAS_TRANSPOSE transa = kw_values[3] != Qundef ? get_cblas_trans(kw_values[3]) : CblasNoTrans;
-    enum CBLAS_TRANSPOSE transb = kw_values[4] != Qundef ? get_cblas_trans(kw_values[4]) : CblasNoTrans;
+    enum CBLAS_ORDER order = kw_values[2] != Qundef ? Util().get_cblas_order(kw_values[2]) : CblasRowMajor;
+    enum CBLAS_TRANSPOSE transa = kw_values[3] != Qundef ? Util().get_cblas_trans(kw_values[3]) : CblasNoTrans;
+    enum CBLAS_TRANSPOSE transb = kw_values[4] != Qundef ? Util().get_cblas_trans(kw_values[4]) : CblasNoTrans;
 
     narray_t* a_nary = NULL;
     GetNArray(a, a_nary);
@@ -172,52 +172,6 @@ private:
 
     return ret;
   };
-
-  static enum CBLAS_TRANSPOSE get_cblas_trans(VALUE val) {
-    const char* option_str = StringValueCStr(val);
-    enum CBLAS_TRANSPOSE res = CblasNoTrans;
-
-    if (std::strlen(option_str) > 0) {
-      switch (option_str[0]) {
-      case 'n':
-      case 'N':
-        res = CblasNoTrans;
-        break;
-      case 't':
-      case 'T':
-        res = CblasTrans;
-        break;
-      case 'c':
-      case 'C':
-        res = CblasConjTrans;
-        break;
-      }
-    }
-
-    RB_GC_GUARD(val);
-
-    return res;
-  }
-
-  static enum CBLAS_ORDER get_cblas_order(VALUE val) {
-    const char* option_str = StringValueCStr(val);
-
-    if (std::strlen(option_str) > 0) {
-      switch (option_str[0]) {
-      case 'r':
-      case 'R':
-        break;
-      case 'c':
-      case 'C':
-        rb_warn("Numo::TinyLinalg::BLAS.gemm does not support column major.");
-        break;
-      }
-    }
-
-    RB_GC_GUARD(val);
-
-    return CblasRowMajor;
-  }
 };
 
 } // namespace TinyLinalg

data/ext/numo/tiny_linalg/blas/gemv.hpp

@@ -94,8 +94,8 @@ private:
 
     dtype alpha = kw_values[0] != Qundef ? Converter().to_dtype(kw_values[0]) : Converter().one();
     dtype beta = kw_values[1] != Qundef ? Converter().to_dtype(kw_values[1]) : Converter().zero();
-    enum CBLAS_ORDER order = kw_values[2] != Qundef ? get_cblas_order(kw_values[2]) : CblasRowMajor;
-    enum CBLAS_TRANSPOSE trans = kw_values[3] != Qundef ? get_cblas_trans(kw_values[3]) : CblasNoTrans;
+    enum CBLAS_ORDER order = kw_values[2] != Qundef ? Util().get_cblas_order(kw_values[2]) : CblasRowMajor;
+    enum CBLAS_TRANSPOSE trans = kw_values[3] != Qundef ? Util().get_cblas_trans(kw_values[3]) : CblasNoTrans;
 
     narray_t* a_nary = NULL;
     GetNArray(a, a_nary);
@@ -160,52 +160,6 @@ private:
 
     return ret;
   }
-
-  static enum CBLAS_TRANSPOSE get_cblas_trans(VALUE val) {
-    const char* option_str = StringValueCStr(val);
-    enum CBLAS_TRANSPOSE res = CblasNoTrans;
-
-    if (std::strlen(option_str) > 0) {
-      switch (option_str[0]) {
-      case 'n':
-      case 'N':
-        res = CblasNoTrans;
-        break;
-      case 't':
-      case 'T':
-        res = CblasTrans;
-        break;
-      case 'c':
-      case 'C':
-        res = CblasConjTrans;
-        break;
-      }
-    }
-
-    RB_GC_GUARD(val);
-
-    return res;
-  }
-
-  static enum CBLAS_ORDER get_cblas_order(VALUE val) {
-    const char* option_str = StringValueCStr(val);
-
-    if (std::strlen(option_str) > 0) {
-      switch (option_str[0]) {
-      case 'r':
-      case 'R':
-        break;
-      case 'c':
-      case 'C':
-        rb_warn("Numo::TinyLinalg::BLAS.gemm does not support column major.");
-        break;
-      }
-    }
-
-    RB_GC_GUARD(val);
-
-    return CblasRowMajor;
-  }
 };
 
 } // namespace TinyLinalg

data/ext/numo/tiny_linalg/lapack/geqrf.hpp

@@ -28,7 +28,7 @@ struct CGeQrf {
   }
 };
 
-template <int nary_dtype_id, typename DType, typename FncType>
+template <int nary_dtype_id, typename dtype, class LapackFn>
 class GeQrf {
 public:
   static void define_module_function(VALUE mLapack, const char* fnc_name) {
@@ -41,14 +41,14 @@ private:
   };
 
   static void iter_geqrf(na_loop_t* const lp) {
-    DType* a = (DType*)NDL_PTR(lp, 0);
-    DType* tau = (DType*)NDL_PTR(lp, 1);
+    dtype* a = (dtype*)NDL_PTR(lp, 0);
+    dtype* tau = (dtype*)NDL_PTR(lp, 1);
     int* info = (int*)NDL_PTR(lp, 2);
     geqrf_opt* opt = (geqrf_opt*)(lp->opt_ptr);
     const lapack_int m = NDL_SHAPE(lp, 0)[0];
     const lapack_int n = NDL_SHAPE(lp, 0)[1];
     const lapack_int lda = n;
-    const lapack_int i = FncType().call(opt->matrix_layout, m, n, a, lda, tau);
+    const lapack_int i = LapackFn().call(opt->matrix_layout, m, n, a, lda, tau);
     *info = static_cast<int>(i);
   }
 
@@ -61,7 +61,7 @@ private:
     ID kw_table[1] = { rb_intern("order") };
     VALUE kw_values[1] = { Qundef };
     rb_get_kwargs(kw_args, kw_table, 0, 1, kw_values);
-    const int matrix_layout = kw_values[0] != Qundef ? get_matrix_layout(kw_values[0]) : LAPACK_ROW_MAJOR;
+    const int matrix_layout = kw_values[0] != Qundef ? Util().get_matrix_layout(kw_values[0]) : LAPACK_ROW_MAJOR;
 
     if (CLASS_OF(a_vnary) != nary_dtype) {
       a_vnary = rb_funcall(nary_dtype, rb_intern("cast"), 1, a_vnary);
@@ -93,26 +93,6 @@ private:
 
     return ret;
   }
-
-  static int get_matrix_layout(VALUE val) {
-    const char* option_str = StringValueCStr(val);
-
-    if (std::strlen(option_str) > 0) {
-      switch (option_str[0]) {
-      case 'r':
-      case 'R':
-        break;
-      case 'c':
-      case 'C':
-        rb_warn("Numo::TinyLinalg::Lapack.getrf does not support column major.");
-        break;
-      }
-    }
-
-    RB_GC_GUARD(val);
-
-    return LAPACK_ROW_MAJOR;
-  }
 };
 
 } // namespace TinyLinalg

data/ext/numo/tiny_linalg/lapack/gesdd.hpp

@@ -1,35 +1,35 @@
 namespace TinyLinalg {
 
-struct DGESDD {
+struct DGeSdd {
   lapack_int call(int matrix_order, char jobz, lapack_int m, lapack_int n,
                   double* a, lapack_int lda, double* s, double* u, lapack_int ldu, double* vt, lapack_int ldvt) {
     return LAPACKE_dgesdd(matrix_order, jobz, m, n, a, lda, s, u, ldu, vt, ldvt);
   };
 };
 
-struct SGESDD {
+struct SGeSdd {
   lapack_int call(int matrix_order, char jobz, lapack_int m, lapack_int n,
                   float* a, lapack_int lda, float* s, float* u, lapack_int ldu, float* vt, lapack_int ldvt) {
     return LAPACKE_sgesdd(matrix_order, jobz, m, n, a, lda, s, u, ldu, vt, ldvt);
   };
 };
 
-struct ZGESDD {
+struct ZGeSdd {
   lapack_int call(int matrix_order, char jobz, lapack_int m, lapack_int n,
                   lapack_complex_double* a, lapack_int lda, double* s, lapack_complex_double* u, lapack_int ldu, lapack_complex_double* vt, lapack_int ldvt) {
     return LAPACKE_zgesdd(matrix_order, jobz, m, n, a, lda, s, u, ldu, vt, ldvt);
   };
 };
 
-struct CGESDD {
+struct CGeSdd {
   lapack_int call(int matrix_order, char jobz, lapack_int m, lapack_int n,
                   lapack_complex_float* a, lapack_int lda, float* s, lapack_complex_float* u, lapack_int ldu, lapack_complex_float* vt, lapack_int ldvt) {
     return LAPACKE_cgesdd(matrix_order, jobz, m, n, a, lda, s, u, ldu, vt, ldvt);
   };
 };
 
-template <int nary_dtype_id, int nary_rtype_id, typename DType, typename RType, typename FncType>
-class GESDD {
+template <int nary_dtype_id, int nary_rtype_id, typename dtype, typename rtype, class LapackFn>
+class GeSdd {
 public:
   static void define_module_function(VALUE mLapack, const char* mf_name) {
     rb_define_module_function(mLapack, mf_name, RUBY_METHOD_FUNC(tiny_linalg_gesdd), -1);
@@ -42,10 +42,10 @@ private:
   };
 
   static void iter_gesdd(na_loop_t* const lp) {
-    DType* a = (DType*)NDL_PTR(lp, 0);
-    RType* s = (RType*)NDL_PTR(lp, 1);
-    DType* u = (DType*)NDL_PTR(lp, 2);
-    DType* vt = (DType*)NDL_PTR(lp, 3);
+    dtype* a = (dtype*)NDL_PTR(lp, 0);
+    rtype* s = (rtype*)NDL_PTR(lp, 1);
+    dtype* u = (dtype*)NDL_PTR(lp, 2);
+    dtype* vt = (dtype*)NDL_PTR(lp, 3);
     int* info = (int*)NDL_PTR(lp, 4);
     gesdd_opt* opt = (gesdd_opt*)(lp->opt_ptr);
 
@@ -56,7 +56,7 @@ private:
     const lapack_int ldu = opt->jobz == 'S' ? min_mn : m;
     const lapack_int ldvt = opt->jobz == 'S' ? min_mn : n;
 
-    lapack_int i = FncType().call(opt->matrix_order, opt->jobz, m, n, a, lda, s, u, ldu, vt, ldvt);
+    lapack_int i = LapackFn().call(opt->matrix_order, opt->jobz, m, n, a, lda, s, u, ldu, vt, ldvt);
     *info = static_cast<int>(i);
   };
 

data/ext/numo/tiny_linalg/lapack/gesv.hpp

@@ -1,6 +1,6 @@
 namespace TinyLinalg {
 
-struct DGESV {
+struct DGeSv {
   lapack_int call(int matrix_layout, lapack_int n, lapack_int nrhs,
                   double* a, lapack_int lda, lapack_int* ipiv,
                   double* b, lapack_int ldb) {
@@ -8,7 +8,7 @@ struct DGESV {
   }
 };
 
-struct SGESV {
+struct SGeSv {
   lapack_int call(int matrix_layout, lapack_int n, lapack_int nrhs,
                   float* a, lapack_int lda, lapack_int* ipiv,
                   float* b, lapack_int ldb) {
@@ -16,7 +16,7 @@ struct SGESV {
   }
 };
 
-struct ZGESV {
+struct ZGeSv {
   lapack_int call(int matrix_layout, lapack_int n, lapack_int nrhs,
                   lapack_complex_double* a, lapack_int lda, lapack_int* ipiv,
                   lapack_complex_double* b, lapack_int ldb) {
@@ -24,7 +24,7 @@ struct ZGESV {
   }
 };
 
-struct CGESV {
+struct CGeSv {
   lapack_int call(int matrix_layout, lapack_int n, lapack_int nrhs,
                   lapack_complex_float* a, lapack_int lda, lapack_int* ipiv,
                   lapack_complex_float* b, lapack_int ldb) {
@@ -32,8 +32,8 @@ struct CGESV {
   }
 };
 
-template <int nary_dtype_id, typename DType, typename FncType>
-class GESV {
+template <int nary_dtype_id, typename dtype, class LapackFn>
+class GeSv {
 public:
   static void define_module_function(VALUE mLapack, const char* fnc_name) {
     rb_define_module_function(mLapack, fnc_name, RUBY_METHOD_FUNC(tiny_linalg_gesv), -1);
@@ -45,8 +45,8 @@ private:
   };
 
   static void iter_gesv(na_loop_t* const lp) {
-    DType* a = (DType*)NDL_PTR(lp, 0);
-    DType* b = (DType*)NDL_PTR(lp, 1);
+    dtype* a = (dtype*)NDL_PTR(lp, 0);
+    dtype* b = (dtype*)NDL_PTR(lp, 1);
     int* ipiv = (int*)NDL_PTR(lp, 2);
     int* info = (int*)NDL_PTR(lp, 3);
     gesv_opt* opt = (gesv_opt*)(lp->opt_ptr);
@@ -54,7 +54,7 @@ private:
     const lapack_int nhrs = lp->args[1].ndim == 1 ? 1 : NDL_SHAPE(lp, 1)[1];
     const lapack_int lda = n;
     const lapack_int ldb = nhrs;
-    const lapack_int i = FncType().call(opt->matrix_layout, n, nhrs, a, lda, ipiv, b, ldb);
+    const lapack_int i = LapackFn().call(opt->matrix_layout, n, nhrs, a, lda, ipiv, b, ldb);
     *info = static_cast<int>(i);
   }
 
@@ -71,7 +71,7 @@ private:
 
     rb_get_kwargs(kw_args, kw_table, 0, 1, kw_values);
 
-    const int matrix_layout = kw_values[0] != Qundef ? get_matrix_layout(kw_values[0]) : LAPACK_ROW_MAJOR;
+    const int matrix_layout = kw_values[0] != Qundef ? Util().get_matrix_layout(kw_values[0]) : LAPACK_ROW_MAJOR;
 
     if (CLASS_OF(a_vnary) != nary_dtype) {
       a_vnary = rb_funcall(nary_dtype, rb_intern("cast"), 1, a_vnary);
@@ -123,26 +123,6 @@ private:
 
     return ret;
   }
-
-  static int get_matrix_layout(VALUE val) {
-    const char* option_str = StringValueCStr(val);
-
-    if (std::strlen(option_str) > 0) {
-      switch (option_str[0]) {
-      case 'r':
-      case 'R':
-        break;
-      case 'c':
-      case 'C':
-        rb_warn("Numo::TinyLinalg::Lapack.gesv does not support column major.");
-        break;
-      }
-    }
-
-    RB_GC_GUARD(val);
-
-    return LAPACK_ROW_MAJOR;
-  }
 };
 
 } // namespace TinyLinalg

data/ext/numo/tiny_linalg/lapack/gesvd.hpp

@@ -1,6 +1,6 @@
 namespace TinyLinalg {
 
-struct DGESVD {
+struct DGeSvd {
   lapack_int call(int matrix_order, char jobu, char jobvt, lapack_int m, lapack_int n,
                   double* a, lapack_int lda, double* s, double* u, lapack_int ldu, double* vt, lapack_int ldvt,
                   double* superb) {
@@ -8,7 +8,7 @@ struct DGESVD {
   };
 };
 
-struct SGESVD {
+struct SGeSvd {
   lapack_int call(int matrix_order, char jobu, char jobvt, lapack_int m, lapack_int n,
                   float* a, lapack_int lda, float* s, float* u, lapack_int ldu, float* vt, lapack_int ldvt,
                   float* superb) {
@@ -16,7 +16,7 @@ struct SGESVD {
   };
 };
 
-struct ZGESVD {
+struct ZGeSvd {
   lapack_int call(int matrix_order, char jobu, char jobvt, lapack_int m, lapack_int n,
                   lapack_complex_double* a, lapack_int lda, double* s, lapack_complex_double* u, lapack_int ldu, lapack_complex_double* vt, lapack_int ldvt,
                   double* superb) {
@@ -24,7 +24,7 @@ struct ZGESVD {
   };
 };
 
-struct CGESVD {
+struct CGeSvd {
   lapack_int call(int matrix_order, char jobu, char jobvt, lapack_int m, lapack_int n,
                   lapack_complex_float* a, lapack_int lda, float* s, lapack_complex_float* u, lapack_int ldu, lapack_complex_float* vt, lapack_int ldvt,
                   float* superb) {
@@ -32,8 +32,8 @@ struct CGESVD {
   };
 };
 
-template <int nary_dtype_id, int nary_rtype_id, typename DType, typename RType, typename FncType>
-class GESVD {
+template <int nary_dtype_id, int nary_rtype_id, typename dtype, typename rtype, class LapackFn>
+class GeSvd {
 public:
   static void define_module_function(VALUE mLapack, const char* mf_name) {
     rb_define_module_function(mLapack, mf_name, RUBY_METHOD_FUNC(tiny_linalg_gesvd), -1);
@@ -47,10 +47,10 @@ private:
   };
 
   static void iter_gesvd(na_loop_t* const lp) {
-    DType* a = (DType*)NDL_PTR(lp, 0);
-    RType* s = (RType*)NDL_PTR(lp, 1);
-    DType* u = (DType*)NDL_PTR(lp, 2);
-    DType* vt = (DType*)NDL_PTR(lp, 3);
+    dtype* a = (dtype*)NDL_PTR(lp, 0);
+    rtype* s = (rtype*)NDL_PTR(lp, 1);
+    dtype* u = (dtype*)NDL_PTR(lp, 2);
+    dtype* vt = (dtype*)NDL_PTR(lp, 3);
     int* info = (int*)NDL_PTR(lp, 4);
     gesvd_opt* opt = (gesvd_opt*)(lp->opt_ptr);
 
@@ -61,9 +61,9 @@ private:
     const lapack_int ldu = opt->jobu == 'A' ? m : min_mn;
     const lapack_int ldvt = n;
 
-    RType* superb = (RType*)ruby_xmalloc(min_mn * sizeof(RType));
+    rtype* superb = (rtype*)ruby_xmalloc(min_mn * sizeof(rtype));
 
-    lapack_int i = FncType().call(opt->matrix_order, opt->jobu, opt->jobvt, m, n, a, lda, s, u, ldu, vt, ldvt, superb);
+    lapack_int i = LapackFn().call(opt->matrix_order, opt->jobu, opt->jobvt, m, n, a, lda, s, u, ldu, vt, ldvt, superb);
     *info = static_cast<int>(i);
 
     ruby_xfree(superb);

data/ext/numo/tiny_linalg/lapack/getrf.hpp

@@ -1,35 +1,35 @@
 namespace TinyLinalg {
 
-struct DGETRF {
+struct DGeTrf {
   lapack_int call(int matrix_layout, lapack_int m, lapack_int n,
                   double* a, lapack_int lda, lapack_int* ipiv) {
     return LAPACKE_dgetrf(matrix_layout, m, n, a, lda, ipiv);
   }
 };
 
-struct SGETRF {
+struct SGeTrf {
   lapack_int call(int matrix_layout, lapack_int m, lapack_int n,
                   float* a, lapack_int lda, lapack_int* ipiv) {
     return LAPACKE_sgetrf(matrix_layout, m, n, a, lda, ipiv);
   }
 };
 
-struct ZGETRF {
+struct ZGeTrf {
   lapack_int call(int matrix_layout, lapack_int m, lapack_int n,
                   lapack_complex_double* a, lapack_int lda, lapack_int* ipiv) {
     return LAPACKE_zgetrf(matrix_layout, m, n, a, lda, ipiv);
   }
 };
 
-struct CGETRF {
+struct CGeTrf {
   lapack_int call(int matrix_layout, lapack_int m, lapack_int n,
                   lapack_complex_float* a, lapack_int lda, lapack_int* ipiv) {
     return LAPACKE_cgetrf(matrix_layout, m, n, a, lda, ipiv);
   }
 };
 
-template <int nary_dtype_id, typename DType, typename FncType>
-class GETRF {
+template <int nary_dtype_id, typename dtype, class LapackFn>
+class GeTrf {
 public:
   static void define_module_function(VALUE mLapack, const char* fnc_name) {
     rb_define_module_function(mLapack, fnc_name, RUBY_METHOD_FUNC(tiny_linalg_getrf), -1);
@@ -41,14 +41,14 @@ private:
   };
 
   static void iter_getrf(na_loop_t* const lp) {
-    DType* a = (DType*)NDL_PTR(lp, 0);
+    dtype* a = (dtype*)NDL_PTR(lp, 0);
     int* ipiv = (int*)NDL_PTR(lp, 1);
     int* info = (int*)NDL_PTR(lp, 2);
     getrf_opt* opt = (getrf_opt*)(lp->opt_ptr);
     const lapack_int m = NDL_SHAPE(lp, 0)[0];
     const lapack_int n = NDL_SHAPE(lp, 0)[1];
     const lapack_int lda = n;
-    const lapack_int i = FncType().call(opt->matrix_layout, m, n, a, lda, ipiv);
+    const lapack_int i = LapackFn().call(opt->matrix_layout, m, n, a, lda, ipiv);
     *info = static_cast<int>(i);
   }
 
@@ -61,7 +61,7 @@ private:
     ID kw_table[1] = { rb_intern("order") };
     VALUE kw_values[1] = { Qundef };
     rb_get_kwargs(kw_args, kw_table, 0, 1, kw_values);
-    const int matrix_layout = kw_values[0] != Qundef ? get_matrix_layout(kw_values[0]) : LAPACK_ROW_MAJOR;
+    const int matrix_layout = kw_values[0] != Qundef ? Util().get_matrix_layout(kw_values[0]) : LAPACK_ROW_MAJOR;
 
     if (CLASS_OF(a_vnary) != nary_dtype) {
       a_vnary = rb_funcall(nary_dtype, rb_intern("cast"), 1, a_vnary);
@@ -93,26 +93,6 @@ private:
 
     return ret;
   }
-
-  static int get_matrix_layout(VALUE val) {
-    const char* option_str = StringValueCStr(val);
-
-    if (std::strlen(option_str) > 0) {
-      switch (option_str[0]) {
-      case 'r':
-      case 'R':
-        break;
-      case 'c':
-      case 'C':
-        rb_warn("Numo::TinyLinalg::Lapack.getrf does not support column major.");
-        break;
-      }
-    }
-
-    RB_GC_GUARD(val);
-
-    return LAPACK_ROW_MAJOR;
-  }
 };
 
 } // namespace TinyLinalg

data/ext/numo/tiny_linalg/lapack/getri.hpp

@@ -1,31 +1,31 @@
 namespace TinyLinalg {
 
-struct DGETRI {
+struct DGeTri {
   lapack_int call(int matrix_layout, lapack_int n, double* a, lapack_int lda, const lapack_int* ipiv) {
     return LAPACKE_dgetri(matrix_layout, n, a, lda, ipiv);
   }
 };
 
-struct SGETRI {
+struct SGeTri {
   lapack_int call(int matrix_layout, lapack_int n, float* a, lapack_int lda, const lapack_int* ipiv) {
     return LAPACKE_sgetri(matrix_layout, n, a, lda, ipiv);
   }
 };
 
-struct ZGETRI {
+struct ZGeTri {
   lapack_int call(int matrix_layout, lapack_int n, lapack_complex_double* a, lapack_int lda, const lapack_int* ipiv) {
     return LAPACKE_zgetri(matrix_layout, n, a, lda, ipiv);
   }
 };
 
-struct CGETRI {
+struct CGeTri {
   lapack_int call(int matrix_layout, lapack_int n, lapack_complex_float* a, lapack_int lda, const lapack_int* ipiv) {
     return LAPACKE_cgetri(matrix_layout, n, a, lda, ipiv);
   }
 };
 
-template <int nary_dtype_id, typename DType, typename FncType>
-class GETRI {
+template <int nary_dtype_id, typename dtype, class LapackFn>
+class GeTri {
 public:
   static void define_module_function(VALUE mLapack, const char* fnc_name) {
     rb_define_module_function(mLapack, fnc_name, RUBY_METHOD_FUNC(tiny_linalg_getri), -1);
@@ -37,13 +37,13 @@ private:
   };
 
   static void iter_getri(na_loop_t* const lp) {
-    DType* a = (DType*)NDL_PTR(lp, 0);
+    dtype* a = (dtype*)NDL_PTR(lp, 0);
     lapack_int* ipiv = (lapack_int*)NDL_PTR(lp, 1);
     int* info = (int*)NDL_PTR(lp, 2);
     getri_opt* opt = (getri_opt*)(lp->opt_ptr);
     const lapack_int n = NDL_SHAPE(lp, 0)[0];
     const lapack_int lda = n;
-    const lapack_int i = FncType().call(opt->matrix_layout, n, a, lda, ipiv);
+    const lapack_int i = LapackFn().call(opt->matrix_layout, n, a, lda, ipiv);
     *info = static_cast<int>(i);
   }
 
@@ -57,7 +57,7 @@ private:
     ID kw_table[1] = { rb_intern("order") };
     VALUE kw_values[1] = { Qundef };
     rb_get_kwargs(kw_args, kw_table, 0, 1, kw_values);
-    const int matrix_layout = kw_values[0] != Qundef ? get_matrix_layout(kw_values[0]) : LAPACK_ROW_MAJOR;
+    const int matrix_layout = kw_values[0] != Qundef ? Util().get_matrix_layout(kw_values[0]) : LAPACK_ROW_MAJOR;
 
     if (CLASS_OF(a_vnary) != nary_dtype) {
       a_vnary = rb_funcall(nary_dtype, rb_intern("cast"), 1, a_vnary);
@@ -102,26 +102,6 @@ private:
 
     return ret;
   }
-
-  static int get_matrix_layout(VALUE val) {
-    const char* option_str = StringValueCStr(val);
-
-    if (std::strlen(option_str) > 0) {
-      switch (option_str[0]) {
-      case 'r':
-      case 'R':
-        break;
-      case 'c':
-      case 'C':
-        rb_warn("Numo::TinyLinalg::Lapack.getri does not support column major.");
-        break;
-      }
-    }
-
-    RB_GC_GUARD(val);
-
-    return LAPACK_ROW_MAJOR;
-  }
 };
 
 } // namespace TinyLinalg