Sparse API: createSparseArray() -> sparse()

shehzan10 · shehzan10 · commit 709c82929385 · 2016-09-01T18:28:53.000-04:00
diff --git a/include/af/sparse.h b/include/af/sparse.h
@@ -15,17 +15,17 @@ namespace af
 {
     class array;
 
-    AFAPI array createSparseArray(const dim_t nRows, const dim_t nCols,
-                                  const array values, const array rowIdx, const array colIdx,
-                                  const af::storage stype = AF_STORAGE_CSR);
+    AFAPI array sparse(const dim_t nRows, const dim_t nCols,
+                       const array values, const array rowIdx, const array colIdx,
+                       const af::storage stype = AF_STORAGE_CSR);
 
-    AFAPI array createSparseArray(const dim_t nRows, const dim_t nCols, const dim_t nNZ,
-                                  const void* const values,
-                                  const int * const rowIdx, const int * const colIdx,
-                                  const dtype type = f32, const af::storage stype = AF_STORAGE_CSR,
-                                  const af::source src = afHost);
+    AFAPI array sparse(const dim_t nRows, const dim_t nCols, const dim_t nNZ,
+                       const void* const values,
+                       const int * const rowIdx, const int * const colIdx,
+                       const dtype type = f32, const af::storage stype = AF_STORAGE_CSR,
+                       const af::source src = afHost);
 
-    AFAPI array createSparseArray(const array dense, const af::storage stype = AF_STORAGE_CSR);
+    AFAPI array sparse(const array dense, const af::storage stype = AF_STORAGE_CSR);
 
     AFAPI array sparseConvertStorage(const array in, const af::storage stype);
 
diff --git a/src/api/cpp/sparse.cpp b/src/api/cpp/sparse.cpp
@@ -13,21 +13,21 @@
 
 namespace af
 {
-    array createSparseArray(const dim_t nRows, const dim_t nCols,
-                            const array values, const array rowIdx, const array colIdx,
-                            const af::storage stype)
+    array sparse(const dim_t nRows, const dim_t nCols,
+                 const array values, const array rowIdx, const array colIdx,
+                 const af::storage stype)
     {
         af_array out = 0;
         AF_THROW(af_create_sparse_array(&out, nRows, nCols,
                             values.get(), rowIdx.get(), colIdx.get(), stype));
         return array(out);
     }
 
-    array createSparseArray(const dim_t nRows, const dim_t nCols, const dim_t nNZ,
-                            const void * const values,
-                            const int * const rowIdx, const int * const colIdx,
-                            const dtype type, const af::storage stype,
-                            const af::source src)
+    array sparse(const dim_t nRows, const dim_t nCols, const dim_t nNZ,
+                 const void * const values,
+                 const int * const rowIdx, const int * const colIdx,
+                 const dtype type, const af::storage stype,
+                 const af::source src)
     {
         af_array out = 0;
         AF_THROW(af_create_sparse_array_from_ptr(&out, nRows, nCols, nNZ,
@@ -36,7 +36,7 @@ namespace af
     }
 
 
-    array createSparseArray(const array dense, const af::storage stype)
+    array sparse(const array dense, const af::storage stype)
     {
         af_array out = 0;
         AF_THROW(af_create_sparse_array_from_dense(&out, dense.get(), stype));
diff --git a/test/sparse.cpp b/test/sparse.cpp
@@ -89,7 +89,7 @@ void sparseTester(const int m, const int n, const int k, int factor, double eps)
     af::array dRes1 = matmul(A, B);
 
     // Create Sparse Array From Dense
-    af::array sA = af::createSparseArray(A, AF_STORAGE_CSR);
+    af::array sA = af::sparse(A, AF_STORAGE_CSR);
 
     // Sparse Matmul
     af::array sRes1 = matmul(sA, B);
@@ -121,7 +121,7 @@ void sparseTransposeTester(const int m, const int n, const int k, int factor, do
     af::array dRes3 = matmul(A, B, AF_MAT_CTRANS, AF_MAT_NONE);
 
     // Create Sparse Array From Dense
-    af::array sA = af::createSparseArray(A, AF_STORAGE_CSR);
+    af::array sA = af::sparse(A, AF_STORAGE_CSR);
 
     // Sparse Matmul
     af::array sRes2 = matmul(sA, B, AF_MAT_TRANS, AF_MAT_NONE);
@@ -146,7 +146,7 @@ void convertCSR(const int M, const int N, const float ratio)
 #endif
     a = a * (a > ratio);
 
-    af::array s = af::createSparseArray(a, AF_STORAGE_CSR);
+    af::array s = af::sparse(a, AF_STORAGE_CSR);
     af::array aa = af::sparseConvertStorage(s, AF_STORAGE_DENSE);
 
     ASSERT_EQ(0, af::max<double>(af::abs(a - aa)));

Original file line number	Diff line number	Diff line change
`@@ -13,21 +13,21 @@`
`13`	`13`
`14`	`14`	`namespace af`
`15`	`15`	`{`
`16`		`- array createSparseArray(const dim_t nRows, const dim_t nCols,`
`17`		`- const array values, const array rowIdx, const array colIdx,`
`18`		`- const af::storage stype)`
	`16`	`+ array sparse(const dim_t nRows, const dim_t nCols,`
	`17`	`+ const array values, const array rowIdx, const array colIdx,`
	`18`	`+ const af::storage stype)`
`19`	`19`	`{`
`20`	`20`	`af_array out = 0;`
`21`	`21`	`AF_THROW(af_create_sparse_array(&out, nRows, nCols,`
`22`	`22`	`values.get(), rowIdx.get(), colIdx.get(), stype));`
`23`	`23`	`return array(out);`
`24`	`24`	`}`
`25`	`25`
`26`		`- array createSparseArray(const dim_t nRows, const dim_t nCols, const dim_t nNZ,`
`27`		`- const void * const values,`
`28`		`- const int * const rowIdx, const int * const colIdx,`
`29`		`- const dtype type, const af::storage stype,`
`30`		`- const af::source src)`
	`26`	`+ array sparse(const dim_t nRows, const dim_t nCols, const dim_t nNZ,`
	`27`	`+ const void * const values,`
	`28`	`+ const int * const rowIdx, const int * const colIdx,`
	`29`	`+ const dtype type, const af::storage stype,`
	`30`	`+ const af::source src)`
`31`	`31`	`{`
`32`	`32`	`af_array out = 0;`
`33`	`33`	`AF_THROW(af_create_sparse_array_from_ptr(&out, nRows, nCols, nNZ,`
`@@ -36,7 +36,7 @@ namespace af`
`36`	`36`	`}`
`37`	`37`
`38`	`38`
`39`		`- array createSparseArray(const array dense, const af::storage stype)`
	`39`	`+ array sparse(const array dense, const af::storage stype)`
`40`	`40`	`{`
`41`	`41`	`af_array out = 0;`
`42`	`42`	`AF_THROW(af_create_sparse_array_from_dense(&out, dense.get(), stype));`