Skip to content

Add nm_bool to dia_init and add sptype switch to sparse_to_nmatrix and typo fix #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Uditgulati wants to merge 2 commits into from
Closed

Add nm_bool to dia_init and add sptype switch to sparse_to_nmatrix and typo fix #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53b85a5
Fix minor typo
Uditgulati May 27, 2019
67ebc85
Add nm_bool to dia_sparse_nmatrix_init and add sptype switch to nm_sp…
Uditgulati May 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 85 additions & 12 deletions ext/sparse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

//allocates memory to the given sparse matrix object
VALUE nm_sparse_alloc(VALUE klass)
{
VALUE nm_sparse_alloc(VALUE klass){
csr_nmatrix* mat = ALLOC(csr_nmatrix);

return Data_Wrap_Struct(klass, NULL, nm_free, mat);
Expand Down Expand Up @@ -306,6 +305,15 @@ VALUE dia_sparse_nmatrix_init(int argc, VALUE* argv){
}

switch(mat->dtype){
case nm_bool:
{
bool* elements = ALLOC_N(bool, (size_t)RARRAY_LEN(argv[1]));
for (size_t index = 0; index < (size_t)RARRAY_LEN(argv[1]); index++) {
elements[index] = (bool)NUM2DBL(RARRAY_AREF(argv[1], index));
}
mat->diag->elements = elements;
break;
}
case nm_int:
{
int* elements = ALLOC_N(int, (size_t)RARRAY_LEN(argv[1]));
Expand Down Expand Up @@ -388,7 +396,7 @@ VALUE nm_sparse_to_array(VALUE self){

size_t count = input->count;
VALUE* array = ALLOC_N(VALUE, input->count);
switch (input->dtype) {
switch (input->sptype) {
case coo:
{
double* elements = ALLOC_N(double, count);
Expand Down Expand Up @@ -465,10 +473,65 @@ VALUE nm_sparse_to_nmatrix(VALUE self){
result->shape[1] = input->shape[1];
result->count = input->count;

void* elements;

switch (input->dtype) {
case nm_bool:
{
bool* temp_elements = ALLOC_N(bool, result->count);
elements = temp_elements;
}
case nm_int:
{
int* temp_elements = ALLOC_N(int, result->count);
elements = temp_elements;
}
case nm_float32:
{
float* temp_elements = ALLOC_N(float, result->count);
elements = temp_elements;
}
case nm_float64:
{
double* elements = ALLOC_N(double, result->count);
double* temp_elements = ALLOC_N(double, result->count);
elements = temp_elements;
}
case nm_complex32:
{
float complex* temp_elements = ALLOC_N(float complex, result->count);
elements = temp_elements;
}
case nm_complex64:
{
float complex* temp_elements = ALLOC_N(float complex, result->count);
elements = temp_elements;
}
}
switch (input->sptype) {
case coo:
{
get_dense_from_coo(input->coo->elements,
input->shape[0],
input->shape[1],
input->coo->ia,
input->coo->ja,
elements);
result->elements = elements;
break;
}
case csc:
{
get_dense_from_csc(input->csc->elements,
input->shape[0],
input->shape[1],
input->csc->ia,
input->csc->ja,
elements);
result->elements = elements;
break;
}
case csr:
{
get_dense_from_csr(input->csr->elements,
input->shape[0],
input->shape[1],
Expand All @@ -478,15 +541,25 @@ VALUE nm_sparse_to_nmatrix(VALUE self){
result->elements = elements;
break;
}
case dia:
{
get_dense_from_dia(input->diag->elements,
input->shape[0],
input->shape[1],
input->diag->offset,
elements);
result->elements = elements;
break;
}
}
return Data_Wrap_Struct(NMatrix, NULL, nm_free, result);
}

//extracts elements from coo type sparse matrix
//called by nm_sparse_to_nmatrix to get elements list
void get_dense_from_coo(const double* data, const size_t rows,
void get_dense_from_coo(const void* data, const size_t rows,
const size_t cols, const size_t* ia,
const size_t* ja, double* elements){
const size_t* ja, void* elements){
for(size_t i = 0; i < rows*cols; ++i){ elements[i] = 0; }

size_t index = 0;
Expand All @@ -501,9 +574,9 @@ void get_dense_from_coo(const double* data, const size_t rows,

//extracts elements from csc type sparse matrix
//called by nm_sparse_to_nmatrix to get elements list
void get_dense_from_csc(const double* data, const size_t rows,
void get_dense_from_csc(const void* data, const size_t rows,
const size_t cols, const size_t* ia,
const size_t* ja, double* elements){
const size_t* ja, void* elements){
for(size_t i = 0; i < rows*cols; ++i){ elements[i] = 0; }

size_t index = 0;
Expand All @@ -518,9 +591,9 @@ void get_dense_from_csc(const double* data, const size_t rows,

//extracts elements from csr type sparse matrix
//called by nm_sparse_to_nmatrix to get elements list
void get_dense_from_csr(const double* data, const size_t rows,
void get_dense_from_csr(const void* data, const size_t rows,
const size_t cols, const size_t* ia,
const size_t* ja, double* elements){
const size_t* ja, void* elements){
for(size_t i = 0; i < rows*cols; ++i){ elements[i] = 0; }

size_t index = 0;
Expand All @@ -535,9 +608,9 @@ void get_dense_from_csr(const double* data, const size_t rows,

//extracts elements from dia type sparse matrix
//called by nm_sparse_to_nmatrix to get elements list
void get_dense_from_dia(const double* data, const size_t rows,
void get_dense_from_dia(const void* data, const size_t rows,
const size_t cols, const size_t* offset,
double* elements){
void* elements){
for(size_t i = 0; i < rows*cols; ++i){ elements[i] = 0; }

size_t index = 0;
Expand Down