Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@Whiteknight
Whiteknight committed Aug 22, 2010
2 parents 6d20be9 + c171c07 commit d9c4555
Show file tree
Hide file tree
Showing 3 changed files with 99 additions and 24 deletions.
48 changes: 43 additions & 5 deletions src/pmc/complexmatrix2d.pmc
View file
Expand Up @@ -36,11 +36,44 @@ get_complex_value_from_pmc(PARROT_INTERP, PMC * value, FLOATVAL * real, FLOATVAL
}
}

/* If the matrix is lazily transposed, actually transpose the physical memory
layout. This is necessary for calculations, especially BLAS calculations,
which aren't lazy-transpose-aware. */
static void
normalize_lazy_transpose(PARROT_INTERP, PMC * self)
{
DECLATTRS(self, attrs);
if (IS_TRANSPOSED(attrs->flags)) {
const INTVAL rows_size = attrs->rows;
const INTVAL cols_size = attrs->cols;
const INTVAL size = rows_size * cols_size;
FLOATVAL * const new_s = ALLOCATE_STORAGE(size);
FLOATVAL * const old_s = attrs->storage;
INTVAL i, j;

for (i = 0; i < rows_size; ++i) {
for (j = 0; j < cols_size; ++j) {
R_ITEM_XY_COLMAJOR(new_s, rows_size, cols_size, i, j) =
R_ITEM_XY_ROWMAJOR(old_s, rows_size, cols_size, i, j);
I_ITEM_XY_COLMAJOR(new_s, rows_size, cols_size, i, j) =
I_ITEM_XY_ROWMAJOR(old_s, rows_size, cols_size, i, j);
}
}
attrs->storage = new_s;
mem_sys_free(old_s);
FLAG_CLEAR(attrs->flags, FLAG_TRANSPOSED);
}
}

static PMC *
convert_to_ComplexMatrix2D(PARROT_INTERP, PMC * p)
convert_to_ComplexMatrix2D(PARROT_INTERP, PMC * p, INTVAL forcecopy)
{
if (p->vtable->base_type == __PLA_Type_ComplexMatrix2D)
if (p->vtable->base_type == __PLA_Type_ComplexMatrix2D) {
normalize_lazy_transpose(interp, p);
if (forcecopy)
return VTABLE_clone(interp, p);
return p;
}
else if (!VTABLE_does(interp, p, CONST_STRING(interp, "matrix")))
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_OUT_OF_BOUNDS,
PLATYPENAME ": cannot convert unknown PMC type");
Expand All @@ -52,6 +85,7 @@ convert_to_ComplexMatrix2D(PARROT_INTERP, PMC * p)
}
}


/* Resize the matrix internal storage to be able to hold a point at position
(x, y). The matrix grows but does not shrink. New spaces in the matrix
are initialized to 0.0. Parameters x and y are the indices that are trying
Expand Down Expand Up @@ -198,6 +232,7 @@ call_gemm(PARROT_INTERP, FLOATVAL alpha_r, FLOATVAL alpha_i, PMC * A, PMC *B,
alpha_p[1] = alpha_i;
beta_p[0] = beta_r;
beta_p[1] = beta_i;
fprintf(stderr, "%f %f %f %f\n", alpha_r, alpha_i, beta_r, beta_i);
cblas_zgemm(CblasRowMajor,
IS_TRANSPOSED_BLAS(attrs_a->flags),
IS_TRANSPOSED_BLAS(attrs_b->flags),
Expand Down Expand Up @@ -1322,9 +1357,9 @@ Calculates the matrix equation:

METHOD gemm(PMC *alpha, PMC * A, PMC *B, PMC *beta, PMC *C) {
FLOATVAL alpha_r, alpha_i, beta_r, beta_i;
A = convert_to_ComplexMatrix2D(interp, A);
B = convert_to_ComplexMatrix2D(interp, B);
C = convert_to_ComplexMatrix2D(interp, C);
A = convert_to_ComplexMatrix2D(interp, A, 0);
B = convert_to_ComplexMatrix2D(interp, B, 0);
C = convert_to_ComplexMatrix2D(interp, C, 1);
get_complex_value_from_pmc(interp, alpha, &alpha_r, &alpha_i);
get_complex_value_from_pmc(interp, beta, &beta_r, &beta_i);
call_gemm(INTERP, alpha_r, alpha_i, A, B, beta_r, beta_i, C);
Expand Down Expand Up @@ -1430,6 +1465,7 @@ Get a PMCMatrix2D from the current matrix
PMC * const meth = VTABLE_find_method(INTERP, d, CONST_STRING(INTERP, "resize"));
INTVAL i;
Parrot_ext_call(INTERP, meth, "PiII->", d, attrs->rows, attrs->cols);
normalize_lazy_transpose(INTERP, SELF);
for (i = 0; i < totalsize; i++) {
const FLOATVAL f = VTABLE_get_number_keyed_int(INTERP, SELF, i);
VTABLE_set_number_keyed_int(INTERP, d, i, f);
Expand All @@ -1439,6 +1475,7 @@ Get a PMCMatrix2D from the current matrix

METHOD convert_to_complex_matrix() {
PMC * const d = VTABLE_clone(INTERP, SELF);
normalize_lazy_transpose(INTERP, d);
RETURN(PMC * d);
}

Expand All @@ -1449,6 +1486,7 @@ Get a PMCMatrix2D from the current matrix
PMC * const meth = VTABLE_find_method(INTERP, d, CONST_STRING(INTERP, "resize"));
INTVAL i;
Parrot_ext_call(INTERP, meth, "PiII->", d, attrs->rows, attrs->cols);
normalize_lazy_transpose(INTERP, SELF);
for (i = 0; i < totalsize; i++) {
PMC * const p = VTABLE_get_pmc_keyed_int(INTERP, SELF, i);
VTABLE_set_pmc_keyed_int(INTERP, d, i, p);
Expand Down
45 changes: 26 additions & 19 deletions src/pmc/nummatrix2d.pmc
View file
Expand Up @@ -18,22 +18,6 @@

INTVAL __PLA_Type_NumMatrix2D;

static PMC *
convert_to_NumMatrix2D(PARROT_INTERP, PMC * p)
{
if (p->vtable->base_type == __PLA_Type_NumMatrix2D)
return p;
else if (!VTABLE_does(interp, p, CONST_STRING(interp, "matrix")))
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_OUT_OF_BOUNDS,
PLATYPENAME ": cannot convert unknown PMC type");
else {
PMC * const meth = VTABLE_find_method(interp, p, CONST_STRING(interp, "convert_to_number_matrix"));
PMC * dest = PMCNULL;
Parrot_ext_call(interp, meth, "Pi->P", p, &dest);
return dest;
}
}

/* Resize the matrix internal storage to be able to hold a point at position
(x, y). The matrix grows but does not shrink. New spaces in the matrix
are initialized to 0.0. Parameters x and y are the indices that are trying
Expand Down Expand Up @@ -102,6 +86,26 @@ normalize_lazy_transpose(PARROT_INTERP, PMC * self)
}
}

static PMC *
convert_to_NumMatrix2D(PARROT_INTERP, PMC * p, INTVAL forcecopy)
{
if (p->vtable->base_type == __PLA_Type_NumMatrix2D) {
normalize_lazy_transpose(interp, p);
if (forcecopy)
return VTABLE_clone(interp, p);
return p;
}
else if (!VTABLE_does(interp, p, CONST_STRING(interp, "matrix")))
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_OUT_OF_BOUNDS,
PLATYPENAME ": cannot convert unknown PMC type");
else {
PMC * const meth = VTABLE_find_method(interp, p, CONST_STRING(interp, "convert_to_number_matrix"));
PMC * dest = PMCNULL;
Parrot_ext_call(interp, meth, "Pi->P", p, &dest);
return dest;
}
}

/* Initialize the PMC from an array, filling the matrix row-at-a-time */
static void
init_from_pmc_array(PARROT_INTERP, PMC * self, INTVAL rows_size,
Expand Down Expand Up @@ -1221,9 +1225,9 @@ Calculates the matrix equation:
*/

METHOD gemm(FLOATVAL alpha, PMC * A, PMC *B, FLOATVAL beta, PMC *C) {
A = convert_to_NumMatrix2D(interp, A);
B = convert_to_NumMatrix2D(interp, B);
C = convert_to_NumMatrix2D(interp, C);
A = convert_to_NumMatrix2D(interp, A, 0);
B = convert_to_NumMatrix2D(interp, B, 0);
C = convert_to_NumMatrix2D(interp, C, 1);
call_gemm(INTERP, alpha, A, B, beta, C);
RETURN(PMC* C);
}
Expand Down Expand Up @@ -1316,6 +1320,7 @@ Get a PMCMatrix2D from the current matrix

METHOD convert_to_number_matrix() {
PMC * const d = VTABLE_clone(INTERP, SELF);
normalize_lazy_transpose(INTERP, d);
RETURN(PMC * d);
}

Expand All @@ -1326,6 +1331,7 @@ Get a PMCMatrix2D from the current matrix
PMC * const meth = VTABLE_find_method(INTERP, d, CONST_STRING(INTERP, "resize"));
INTVAL i;
Parrot_ext_call(INTERP, meth, "PiII->", d, attrs->rows, attrs->cols);
normalize_lazy_transpose(INTERP, SELF);
for (i = 0; i < totalsize; i++) {
const FLOATVAL f = VTABLE_get_number_keyed_int(INTERP, SELF, i);
VTABLE_set_number_keyed_int(INTERP, d, i, f);
Expand All @@ -1340,6 +1346,7 @@ Get a PMCMatrix2D from the current matrix
PMC * const meth = VTABLE_find_method(INTERP, d, CONST_STRING(INTERP, "resize"));
INTVAL i;
Parrot_ext_call(INTERP, meth, "PiII->", d, attrs->rows, attrs->cols);
normalize_lazy_transpose(INTERP, SELF);
for (i = 0; i < totalsize; i++) {
const FLOATVAL f = VTABLE_get_number_keyed_int(INTERP, SELF, i);
VTABLE_set_number_keyed_int(INTERP, d, i, f);
Expand Down
30 changes: 30 additions & 0 deletions src/pmc/pmcmatrix2d.pmc
View file
Expand Up @@ -80,6 +80,33 @@ init_from_pmc_array(PARROT_INTERP, PMC * self, INTVAL rows_size, INTVAL cols_siz
}
}

/* If the matrix is lazily transposed, actually transpose the physical memory
layout. This is necessary for calculations, especially BLAS calculations,
which aren't lazy-transpose-aware. */
static void
normalize_lazy_transpose(PARROT_INTERP, PMC * self)
{
DECLATTRS(self, attrs);
if (IS_TRANSPOSED(attrs->flags)) {
const INTVAL rows_size = attrs->rows;
const INTVAL cols_size = attrs->cols;
const INTVAL size = rows_size * cols_size;
FLOATVAL * const new_s = ALLOCATE_STORAGE(size);
FLOATVAL * const old_s = attrs->storage;
INTVAL i, j;

for (i = 0; i < rows_size; ++i) {
for (j = 0; j < cols_size; ++j) {
ITEM_XY_COLMAJOR(new_s, rows_size, cols_size, i, j) =
ITEM_XY_ROWMAJOR(old_s, rows_size, cols_size, i, j);
}
}
attrs->storage = new_s;
mem_sys_free(old_s);
FLAG_CLEAR(attrs->flags, FLAG_TRANSPOSED);
}
}


pmclass PMCMatrix2D dynpmc auto_attrs provides matrix {
ATTR PMC ** storage;
Expand Down Expand Up @@ -699,6 +726,7 @@ Get a PMCMatrix2D from the current matrix
PMC * const meth = VTABLE_find_method(INTERP, d, CONST_STRING(INTERP, "resize"));
INTVAL i;
Parrot_ext_call(INTERP, meth, "PiII->", d, attrs->rows, attrs->cols);
normalize_lazy_transpose(INTERP, SELF);
for (i = 0; i < totalsize; i++) {
const FLOATVAL f = VTABLE_get_number_keyed_int(INTERP, SELF, i);
VTABLE_set_number_keyed_int(INTERP, d, i, f);
Expand All @@ -713,6 +741,7 @@ Get a PMCMatrix2D from the current matrix
PMC * const meth = VTABLE_find_method(INTERP, d, CONST_STRING(INTERP, "resize"));
INTVAL i;
Parrot_ext_call(INTERP, meth, "PiII->", d, attrs->rows, attrs->cols);
normalize_lazy_transpose(INTERP, SELF);
for (i = 0; i < totalsize; i++) {
PMC * const p = VTABLE_get_pmc_keyed_int(INTERP, SELF, i);
VTABLE_set_pmc_keyed_int(INTERP, d, i, p);
Expand All @@ -722,6 +751,7 @@ Get a PMCMatrix2D from the current matrix

METHOD convert_to_pmc_matrix() {
PMC * const d = VTABLE_clone(INTERP, SELF);
normalize_lazy_transpose(INTERP, d);
RETURN(PMC * d);
}

Expand Down

0 comments on commit d9c4555

Please sign in to comment.