Sparse API: getArrays() -> getInfo()

shehzan10 · shehzan10 · commit dedae85b1f21 · 2016-09-01T18:34:59.000-04:00
diff --git a/include/af/sparse.h b/include/af/sparse.h
@@ -29,7 +29,8 @@ namespace af
 
     AFAPI array sparseConvertStorage(const array in, const af::storage stype);
 
-    AFAPI void sparseGetArrays(array &values, array &rowIdx, array &colIdx, const array in);
+    AFAPI void sparseGetInfo(array &values, array &rowIdx, array &colIdx, af::storage &stype,
+                             const array in);
 
     AFAPI array sparseGetValues(const array in);
 
@@ -68,7 +69,8 @@ extern "C" {
     AFAPI af_err af_sparse_convert_storage(af_array *out, const af_array in,
                                            const af_storage destStorage);
 
-    AFAPI af_err af_sparse_get_arrays(af_array *values, af_array *rowIdx, af_array *colIdx, const af_array in);
+    AFAPI af_err af_sparse_get_info(af_array *values, af_array *rowIdx, af_array *colIdx, af_storage *stype,
+                                    const af_array in);
 
     AFAPI af_err af_sparse_get_values(af_array *out, const af_array in);
 
diff --git a/src/api/c/sparse.cpp b/src/api/c/sparse.cpp
@@ -337,13 +337,14 @@ af_array getSparseValues(const af_array in)
     return getHandle(getSparseArray<T>(in).getValues());
 }
 
-af_err af_sparse_get_arrays(af_array *values, af_array *rows, af_array *cols,
-                      const af_array in)
+af_err af_sparse_get_info(af_array *values, af_array *rows, af_array *cols, af_storage *stype,
+                          const af_array in)
 {
     try {
         if(values != NULL) AF_CHECK(af_sparse_get_values(values, in));
-        if(rows   != NULL) AF_CHECK(af_sparse_get_row_idx(rows  , in));
-        if(cols   != NULL) AF_CHECK(af_sparse_get_col_idx(cols  , in));
+        if(rows   != NULL) AF_CHECK(af_sparse_get_row_idx(rows , in));
+        if(cols   != NULL) AF_CHECK(af_sparse_get_col_idx(cols , in));
+        if(stype  != NULL) AF_CHECK(af_sparse_get_storage(stype, in));
     }
     CATCHALL;
 
diff --git a/src/api/cpp/sparse.cpp b/src/api/cpp/sparse.cpp
@@ -50,14 +50,16 @@ namespace af
         return array(out);
     }
 
-    void sparseGetArrays(array &values, array &rowIdx, array &colIdx,
-                         const array in)
+    void sparseGetInfo(array &values, array &rowIdx, array &colIdx, storage &stype,
+                       const array in)
     {
         af_array values_ = 0, rowIdx_ = 0, colIdx_ = 0;
-        AF_THROW(af_sparse_get_arrays(&values_, &rowIdx_, &colIdx_, in.get()));
+        af_storage stype_ = AF_STORAGE_DENSE;
+        AF_THROW(af_sparse_get_info(&values_, &rowIdx_, &colIdx_, &stype_, in.get()));
         values = array(values_);
         rowIdx = array(rowIdx_);
         colIdx = array(colIdx_);
+        stype  = stype_;
         return;
     }
 
diff --git a/src/api/unified/sparse.cpp b/src/api/unified/sparse.cpp
@@ -46,10 +46,11 @@ af_err af_sparse_convert_storage(af_array *out, const af_array in,
     return CALL(out, in, destStorage);
 }
 
-af_err af_sparse_get_arrays(af_array *values, af_array *rowIdx, af_array *colIdx, const af_array in)
+af_err af_sparse_get_info(af_array *values, af_array *rowIdx, af_array *colIdx, af_storage *stype,
+                          const af_array in)
 {
     CHECK_ARRAYS(in);
-    return CALL(values, rowIdx, colIdx, in);
+    return CALL(values, rowIdx, colIdx, stype, in);
 }
 
 af_err af_sparse_get_values(af_array *out, const af_array in)

Original file line number	Diff line number	Diff line change
`@@ -337,13 +337,14 @@ af_array getSparseValues(const af_array in)`
`337`	`337`	`return getHandle(getSparseArray<T>(in).getValues());`
`338`	`338`	`}`
`339`	`339`
`340`		`-af_err af_sparse_get_arrays(af_array values, af_array rows, af_array *cols,`
`341`		`- const af_array in)`
	`340`	`+af_err af_sparse_get_info(af_array values, af_array rows, af_array cols, af_storage stype,`
	`341`	`+ const af_array in)`
`342`	`342`	`{`
`343`	`343`	`try {`
`344`	`344`	`if(values != NULL) AF_CHECK(af_sparse_get_values(values, in));`
`345`		`- if(rows != NULL) AF_CHECK(af_sparse_get_row_idx(rows , in));`
`346`		`- if(cols != NULL) AF_CHECK(af_sparse_get_col_idx(cols , in));`
	`345`	`+ if(rows != NULL) AF_CHECK(af_sparse_get_row_idx(rows , in));`
	`346`	`+ if(cols != NULL) AF_CHECK(af_sparse_get_col_idx(cols , in));`
	`347`	`+ if(stype != NULL) AF_CHECK(af_sparse_get_storage(stype, in));`
`347`	`348`	`}`
`348`	`349`	`CATCHALL;`
`349`	`350`
Original file line number	Diff line number	Diff line change
`@@ -50,14 +50,16 @@ namespace af`
`50`	`50`	`return array(out);`
`51`	`51`	`}`
`52`	`52`
`53`		`- void sparseGetArrays(array &values, array &rowIdx, array &colIdx,`
`54`		`- const array in)`
	`53`	`+ void sparseGetInfo(array &values, array &rowIdx, array &colIdx, storage &stype,`
	`54`	`+ const array in)`
`55`	`55`	`{`
`56`	`56`	`af_array values_ = 0, rowIdx_ = 0, colIdx_ = 0;`
`57`		`- AF_THROW(af_sparse_get_arrays(&values_, &rowIdx_, &colIdx_, in.get()));`
	`57`	`+ af_storage stype_ = AF_STORAGE_DENSE;`
	`58`	`+ AF_THROW(af_sparse_get_info(&values_, &rowIdx_, &colIdx_, &stype_, in.get()));`
`58`	`59`	`values = array(values_);`
`59`	`60`	`rowIdx = array(rowIdx_);`
`60`	`61`	`colIdx = array(colIdx_);`
	`62`	`+ stype = stype_;`
`61`	`63`	`return;`
`62`	`64`	`}`
`63`	`65`
Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,11 @@ af_err af_sparse_convert_storage(af_array *out, const af_array in,`
`46`	`46`	`return CALL(out, in, destStorage);`
`47`	`47`	`}`
`48`	`48`
`49`		`-af_err af_sparse_get_arrays(af_array values, af_array rowIdx, af_array *colIdx, const af_array in)`
	`49`	`+af_err af_sparse_get_info(af_array values, af_array rowIdx, af_array colIdx, af_storage stype,`
	`50`	`+ const af_array in)`
`50`	`51`	`{`
`51`	`52`	`CHECK_ARRAYS(in);`
`52`		`- return CALL(values, rowIdx, colIdx, in);`
	`53`	`+ return CALL(values, rowIdx, colIdx, stype, in);`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`af_err af_sparse_get_values(af_array *out, const af_array in)`