Mentions légales du service

Skip to content
Snippets Groups Projects
Commit f01e150d authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Add CSR/IJV prints

parent 1a0d40da
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 330 additions and 45 deletions
z_spm_print.c
+ 330
− 45
View file @ f01e150d
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "z_spm.h" #include "z_spm.h"
void void
z_spmPrint( FILE *f, const pastix_spm_t *spm ) z_spmCSCPrint( FILE *f, const pastix_spm_t *spm )
{ {
pastix_int_t i, j, baseval; pastix_int_t i, j, baseval;
pastix_int_t k, ii, jj, dofi, dofj, col, row; pastix_int_t k, ii, jj, dofi, dofj, col, row;
...@@ -63,11 +63,9 @@ z_spmPrint( FILE *f, const pastix_spm_t *spm ) ...@@ -63,11 +63,9 @@ z_spmPrint( FILE *f, const pastix_spm_t *spm )
for(ii=0; ii<dofi; ii++, valptr++) for(ii=0; ii<dofi; ii++, valptr++)
{ {
if (row+ii >= col+jj) { if (row+ii >= col+jj) {
fprintf( f, "%ld %ld (%e, %e)\n", z_spmPrintElt( f, row + ii, col + jj, *valptr );
row + ii, col + jj, creal(*valptr), cimag(*valptr) );
if (row+ii > col+jj) { if (row+ii > col+jj) {
fprintf( f, "%ld %ld (%e, %e)\n", z_spmPrintElt( f, col + jj, row + ii, conj(*valptr) );
col + jj, row + ii, creal(conj(*valptr)), cimag(conj(*valptr)) );
} }
} }
} }
...@@ -79,11 +77,9 @@ z_spmPrint( FILE *f, const pastix_spm_t *spm ) ...@@ -79,11 +77,9 @@ z_spmPrint( FILE *f, const pastix_spm_t *spm )
for(jj=0; jj<dofj; jj++, valptr++) for(jj=0; jj<dofj; jj++, valptr++)
{ {
if (row+ii >= col+jj) { if (row+ii >= col+jj) {
fprintf( f, "%ld %ld (%e, %e)\n", z_spmPrintElt( f, row + ii, col + jj, *valptr );
row + ii, col + jj, creal(*valptr), cimag(*valptr) );
if (row+ii > col+jj) { if (row+ii > col+jj) {
fprintf( f, "%ld %ld (%e, %e)\n", z_spmPrintElt( f, col + jj, row + ii, conj(*valptr) );
col + jj, row + ii, creal(conj(*valptr)), cimag(conj(*valptr)) );
} }
} }
} }
...@@ -111,21 +107,10 @@ z_spmPrint( FILE *f, const pastix_spm_t *spm ) ...@@ -111,21 +107,10 @@ z_spmPrint( FILE *f, const pastix_spm_t *spm )
for(ii=0; ii<dofi; ii++, valptr++) for(ii=0; ii<dofi; ii++, valptr++)
{ {
if (row+ii >= col+jj) { if (row+ii >= col+jj) {
#if defined(PRECISION_z) || defined(PRECISION_c) z_spmPrintElt( f, row + ii, col + jj, *valptr );
fprintf( f, "%ld %ld (%e, %e)\n",
row + ii, col + jj, creal(*valptr), cimag(*valptr) );
if (row+ii > col+jj) {
fprintf( f, "%ld %ld (%e, %e)\n",
col + jj, row + ii, creal(*valptr), cimag(*valptr) );
}
#else
fprintf( f, "%ld %ld %e\n",
row + ii, col + jj, *valptr );
if (row+ii > col+jj) { if (row+ii > col+jj) {
fprintf( f, "%ld %ld %e\n", z_spmPrintElt( f, col + jj, row + ii, *valptr );
col + jj, row + ii, *valptr );
} }
#endif
} }
} }
} }
...@@ -136,21 +121,10 @@ z_spmPrint( FILE *f, const pastix_spm_t *spm ) ...@@ -136,21 +121,10 @@ z_spmPrint( FILE *f, const pastix_spm_t *spm )
for(jj=0; jj<dofj; jj++, valptr++) for(jj=0; jj<dofj; jj++, valptr++)
{ {
if (row+ii >= col+jj) { if (row+ii >= col+jj) {
#if defined(PRECISION_z) || defined(PRECISION_c) z_spmPrintElt( f, row + ii, col + jj, *valptr );
fprintf( f, "%ld %ld (%e, %e)\n",
row + ii, col + jj, creal(*valptr), cimag(*valptr) );
if (row+ii > col+jj) { if (row+ii > col+jj) {
fprintf( f, "%ld %ld (%e, %e)\n", z_spmPrintElt( f, col + jj, row + ii, *valptr );
col + jj, row + ii, creal(*valptr), cimag(*valptr) );
} }
#else
fprintf( f, "%ld %ld %e\n",
row + ii, col + jj, *valptr );
if (row+ii > col+jj) {
fprintf( f, "%ld %ld %e\n",
col + jj, row + ii, *valptr );
}
#endif
} }
} }
} }
...@@ -176,13 +150,113 @@ z_spmPrint( FILE *f, const pastix_spm_t *spm ) ...@@ -176,13 +150,113 @@ z_spmPrint( FILE *f, const pastix_spm_t *spm )
{ {
for(ii=0; ii<dofi; ii++, valptr++) for(ii=0; ii<dofi; ii++, valptr++)
{ {
z_spmPrintElt( f, row + ii, col + jj, *valptr );
}
}
}
else {
for(ii=0; ii<dofi; ii++)
{
for(jj=0; jj<dofj; jj++, valptr++)
{
z_spmPrintElt( f, row + ii, col + jj, *valptr );
}
}
}
}
}
}
return;
}
void
z_spmCSRPrint( FILE *f, const pastix_spm_t *spm )
{
pastix_int_t i, j, baseval;
pastix_int_t k, ii, jj, dofi, dofj, col, row;
pastix_complex64_t *valptr;
pastix_int_t *colptr, *rowptr, *dofs;
assert( spm->fmttype == PastixCSR );
assert( spm->flttype == PastixComplex64 );
baseval = spmFindBase( spm );
i = 0; j = 0;
colptr = spm->colptr;
rowptr = spm->rowptr;
valptr = (pastix_complex64_t*)(spm->values);
dofs = spm->dofs;
switch( spm->mtxtype ){
#if defined(PRECISION_z) || defined(PRECISION_c) #if defined(PRECISION_z) || defined(PRECISION_c)
fprintf( f, "%ld %ld (%e, %e)\n", case PastixHermitian:
row + ii, col + jj, creal(*valptr), cimag(*valptr) ); for(i=0; i<spm->n; i++, rowptr++)
#else {
fprintf( f, "%ld %ld %e\n", dofi = ( spm->dof > 0 ) ? spm->dof : dofs[i+1] - dofs[i];
row + ii, col + jj, *valptr ); row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i];
for(k=rowptr[0]; k<rowptr[1]; k++, colptr++)
{
j = (*colptr - baseval);
dofj = ( spm->dof > 0 ) ? spm->dof : dofs[j+1] - dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j];
if ( spm->layout == PastixColMajor ) {
for(jj=0; jj<dofj; jj++)
{
for(ii=0; ii<dofi; ii++, valptr++)
{
if (row+ii <= col+jj) {
z_spmPrintElt( f, row + ii, col + jj, *valptr );
if (row+ii < col+jj) {
z_spmPrintElt( f, col + jj, row + ii, conj(*valptr) );
}
}
}
}
}
else {
for(ii=0; ii<dofi; ii++)
{
for(jj=0; jj<dofj; jj++, valptr++)
{
if (row+ii <= col+jj) {
z_spmPrintElt( f, row + ii, col + jj, *valptr );
if (row+ii < col+jj) {
z_spmPrintElt( f, col + jj, row + ii, conj(*valptr) );
}
}
}
}
}
}
}
break;
#endif #endif
case PastixSymmetric:
for(i=0; i<spm->n; i++, rowptr++)
{
dofi = ( spm->dof > 0 ) ? spm->dof : dofs[i+1] - dofs[i];
row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i];
for(k=rowptr[0]; k<rowptr[1]; k++, colptr++)
{
j = (*colptr - baseval);
dofj = ( spm->dof > 0 ) ? spm->dof : dofs[j+1] - dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j];
if ( spm->layout == PastixColMajor ) {
for(jj=0; jj<dofj; jj++)
{
for(ii=0; ii<dofi; ii++, valptr++)
{
if (row+ii <= col+jj) {
z_spmPrintElt( f, row + ii, col + jj, *valptr );
if (row+ii < col+jj) {
z_spmPrintElt( f, col + jj, row + ii, *valptr );
}
}
} }
} }
} }
...@@ -191,19 +265,230 @@ z_spmPrint( FILE *f, const pastix_spm_t *spm ) ...@@ -191,19 +265,230 @@ z_spmPrint( FILE *f, const pastix_spm_t *spm )
{ {
for(jj=0; jj<dofj; jj++, valptr++) for(jj=0; jj<dofj; jj++, valptr++)
{ {
if (row+ii <= col+jj) {
z_spmPrintElt( f, row + ii, col + jj, *valptr );
if (row+ii < col+jj) {
z_spmPrintElt( f, col + jj, row + ii, *valptr );
}
}
}
}
}
}
}
break;
case PastixGeneral:
default:
for(i=0; i<spm->n; i++, rowptr++)
{
dofi = ( spm->dof > 0 ) ? spm->dof : dofs[i+1] - dofs[i];
row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i];
for(k=rowptr[0]; k<rowptr[1]; k++, colptr++)
{
j = (*colptr - baseval);
dofj = ( spm->dof > 0 ) ? spm->dof : dofs[j+1] - dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j];
if ( spm->layout == PastixColMajor ) {
for(jj=0; jj<dofj; jj++)
{
for(ii=0; ii<dofi; ii++, valptr++)
{
z_spmPrintElt( f, row + ii, col + jj, *valptr );
}
}
}
else {
for(ii=0; ii<dofi; ii++)
{
for(jj=0; jj<dofj; jj++, valptr++)
{
z_spmPrintElt( f, row + ii, col + jj, *valptr );
}
}
}
}
}
}
return;
}
void
z_spmIJVPrint( FILE *f, const pastix_spm_t *spm )
{
pastix_int_t i, j, baseval;
pastix_int_t k, ii, jj, dofi, dofj, col, row;
pastix_complex64_t *valptr;
pastix_int_t *colptr, *rowptr, *dofs;
assert( spm->fmttype == PastixIJV );
assert( spm->flttype == PastixComplex64 );
baseval = spmFindBase( spm );
i = 0; j = 0;
colptr = spm->colptr;
rowptr = spm->rowptr;
valptr = (pastix_complex64_t*)(spm->values);
dofs = spm->dofs;
switch( spm->mtxtype ){
#if defined(PRECISION_z) || defined(PRECISION_c) #if defined(PRECISION_z) || defined(PRECISION_c)
fprintf( f, "%ld %ld (%e, %e)\n", case PastixHermitian:
row + ii, col + jj, creal(*valptr), cimag(*valptr) ); for(k=0; k<spm->nnz; k++, rowptr++, colptr++)
#else {
fprintf( f, "%ld %ld %e\n", i = *rowptr - baseval;
row + ii, col + jj, *valptr ); j = *colptr - baseval;
if ( spm->dof > 0 ) {
dofi = spm->dof;
row = spm->dof * i;
dofj = spm->dof;
col = spm->dof * j;
}
else {
dofi = dofs[i+1] - dofs[i];
row = dofs[i];
dofj = dofs[j+1] - dofs[j];
col = dofs[j];
}
if ( spm->layout == PastixColMajor ) {
for(jj=0; jj<dofj; jj++)
{
for(ii=0; ii<dofi; ii++, valptr++)
{
if (row+ii >= col+jj) {
z_spmPrintElt( f, row + ii, col + jj, *valptr );
if (row+ii > col+jj) {
z_spmPrintElt( f, col + jj, row + ii, conj(*valptr) );
}
}
}
}
}
else {
for(ii=0; ii<dofi; ii++)
{
for(jj=0; jj<dofj; jj++, valptr++)
{
if (row+ii >= col+jj) {
z_spmPrintElt( f, row + ii, col + jj, *valptr );
if (row+ii > col+jj) {
z_spmPrintElt( f, col + jj, row + ii, conj(*valptr) );
}
}
}
}
}
}
break;
#endif #endif
case PastixSymmetric:
for(k=0; k<spm->nnz; k++, rowptr++, colptr++)
{
i = *rowptr - baseval;
j = *colptr - baseval;
if ( spm->dof > 0 ) {
dofi = spm->dof;
row = spm->dof * i;
dofj = spm->dof;
col = spm->dof * j;
}
else {
dofi = dofs[i+1] - dofs[i];
row = dofs[i];
dofj = dofs[j+1] - dofs[j];
col = dofs[j];
}
if ( spm->layout == PastixColMajor ) {
for(jj=0; jj<dofj; jj++)
{
for(ii=0; ii<dofi; ii++, valptr++)
{
if (row+ii >= col+jj) {
z_spmPrintElt( f, row + ii, col + jj, *valptr );
if (row+ii > col+jj) {
z_spmPrintElt( f, col + jj, row + ii, *valptr );
}
}
}
}
}
else {
for(ii=0; ii<dofi; ii++)
{
for(jj=0; jj<dofj; jj++, valptr++)
{
if (row+ii >= col+jj) {
z_spmPrintElt( f, row + ii, col + jj, *valptr );
if (row+ii > col+jj) {
z_spmPrintElt( f, col + jj, row + ii, *valptr );
}
} }
} }
} }
} }
} }
break;
case PastixGeneral:
default:
for(k=0; k<spm->nnz; k++, rowptr++, colptr++)
{
i = *rowptr - baseval;
j = *colptr - baseval;
if ( spm->dof > 0 ) {
dofi = spm->dof;
row = spm->dof * i;
dofj = spm->dof;
col = spm->dof * j;
}
else {
dofi = dofs[i+1] - dofs[i];
row = dofs[i];
dofj = dofs[j+1] - dofs[j];
col = dofs[j];
}
if ( spm->layout == PastixColMajor ) {
for(jj=0; jj<dofj; jj++)
{
for(ii=0; ii<dofi; ii++, valptr++)
{
z_spmPrintElt( f, row + ii, col + jj, *valptr );
}
}
}
else {
for(ii=0; ii<dofi; ii++)
{
for(jj=0; jj<dofj; jj++, valptr++)
{
z_spmPrintElt( f, row + ii, col + jj, *valptr );
}
}
}
}
} }
return; return;
} }
void
z_spmPrint( FILE *f, const pastix_spm_t *spm )
{
switch (spm->fmttype) {
case PastixCSC:
z_spmCSCPrint( f, spm );
break;
case PastixCSR:
z_spmCSRPrint( f, spm );
break;
case PastixIJV:
z_spmIJVPrint( f, spm );
}
return;
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment