Sparse API: getNumNonZero() -> getNNZ()

shehzan10 · shehzan10 · commit bb1b73e1567e · 2016-09-01T18:30:41.000-04:00
diff --git a/include/af/sparse.h b/include/af/sparse.h
@@ -37,7 +37,7 @@ namespace af
 
     AFAPI array sparseGetColIdx(const array in);
 
-    AFAPI dim_t sparseGetNumNonZero(const array in);
+    AFAPI dim_t sparseGetNNZ(const array in);
 
     AFAPI af::storage sparseGetStorage(const array in);
 }
@@ -76,7 +76,7 @@ extern "C" {
 
     AFAPI af_err af_sparse_get_col_idx(af_array *out, const af_array in);
 
-    AFAPI af_err af_sparse_get_num_nonzero(dim_t *out, const af_array in);
+    AFAPI af_err af_sparse_get_nnz(dim_t *out, const af_array in);
 
     AFAPI af_err af_sparse_get_storage(af_storage *out, const af_array in);
 
diff --git a/src/api/c/sparse.cpp b/src/api/c/sparse.cpp
@@ -388,7 +388,7 @@ af_err af_sparse_get_col_idx(af_array *out, const af_array in)
     return AF_SUCCESS;
 }
 
-af_err af_sparse_get_num_nonzero(dim_t *out, const af_array in)
+af_err af_sparse_get_nnz(dim_t *out, const af_array in)
 {
     try {
         const SparseArrayBase base = getSparseArrayBase(in);
diff --git a/src/api/cpp/sparse.cpp b/src/api/cpp/sparse.cpp
@@ -82,10 +82,10 @@ namespace af
         return array(out);
     }
 
-    dim_t sparseGetNumNonZero(const array in)
+    dim_t sparseGetNNZ(const array in)
     {
         dim_t out = 0;
-        AF_THROW(af_sparse_get_num_nonzero(&out, in.get()));
+        AF_THROW(af_sparse_get_nnz(&out, in.get()));
         return out;
     }
 
diff --git a/src/api/unified/sparse.cpp b/src/api/unified/sparse.cpp
@@ -70,7 +70,7 @@ af_err af_sparse_get_col_idx(af_array *out, const af_array in)
     return CALL(out, in);
 }
 
-af_err af_sparse_get_num_nonzero(dim_t *out, const af_array in)
+af_err af_sparse_get_nnz(dim_t *out, const af_array in)
 {
     CHECK_ARRAYS(in);
     return CALL(out, in);

Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ af_err af_sparse_get_col_idx(af_array *out, const af_array in)`
`388`	`388`	`return AF_SUCCESS;`
`389`	`389`	`}`
`390`	`390`
`391`		`-af_err af_sparse_get_num_nonzero(dim_t *out, const af_array in)`
	`391`	`+af_err af_sparse_get_nnz(dim_t *out, const af_array in)`
`392`	`392`	`{`
`393`	`393`	`try {`
`394`	`394`	`const SparseArrayBase base = getSparseArrayBase(in);`
Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,10 @@ namespace af`
`82`	`82`	`return array(out);`
`83`	`83`	`}`
`84`	`84`
`85`		`- dim_t sparseGetNumNonZero(const array in)`
	`85`	`+ dim_t sparseGetNNZ(const array in)`
`86`	`86`	`{`
`87`	`87`	`dim_t out = 0;`
`88`		`- AF_THROW(af_sparse_get_num_nonzero(&out, in.get()));`
	`88`	`+ AF_THROW(af_sparse_get_nnz(&out, in.get()));`
`89`	`89`	`return out;`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ af_err af_sparse_get_col_idx(af_array *out, const af_array in)`
`70`	`70`	`return CALL(out, in);`
`71`	`71`	`}`
`72`	`72`
`73`		`-af_err af_sparse_get_num_nonzero(dim_t *out, const af_array in)`
	`73`	`+af_err af_sparse_get_nnz(dim_t *out, const af_array in)`
`74`	`74`	`{`
`75`	`75`	`CHECK_ARRAYS(in);`
`76`	`76`	`return CALL(out, in);`