diff --git a/tensor_t/src/tensor_t/tensor_t.c b/tensor_t/src/tensor_t/tensor_t.c index f6ec069..c25f8e6 100644 --- a/tensor_t/src/tensor_t/tensor_t.c +++ b/tensor_t/src/tensor_t/tensor_t.c @@ -76,30 +76,30 @@ void tensorProd_##type(tensor_##type **MM, tensor_##type *M0, tensor_##type *M1) M[x0,x1,x3..xl x{l+1}...xn] X M[xn,x{n-1},x{n-2}...xl y{l+1} ..ym] = M[x0,x1..xly{l+1}...y{n+m-2l}] (deep = l > 0)\ M[[i][j]]=sum_{[k]}M0[[i][k]]*M[[k][j]]*/\ \ -void tensorContractnProd_##type(tensor_##type** MM, tensor_##type *M0, tensor_##type *M1, size_t nestingDepth) {\ - /* if (!checkMatchProdtensor(M0->dim, M1->dim, nestingDepth)) {\ - prsize_tf("Deep = %d\n", nestingDepth);\ +void tensorContractnProd_##type(tensor_##type** MM, tensor_##type *M0, tensor_##type *M1, size_t contractionNumber) {\ + /* if (!checkMatchProdtensor(M0->dim, M1->dim, contractionNumber)) {\ + prsize_tf("Deep = %d\n", contractionNumber);\ }*/\ \ - size_t len0 = M0->dim->size - nestingDepth;\ - size_t len1 = M1->dim->size - nestingDepth;\ + size_t len0 = M0->dim->size - contractionNumber;\ + size_t len1 = M1->dim->size - contractionNumber;\ \ size_t* tsub0 = malloc(sizeof(size_t) *len0);\ size_t* tsub1 = malloc(sizeof(size_t) *len1);\ - size_t* tDk1 = malloc(sizeof(size_t) *nestingDepth);\ - size_t* tDk0 = malloc(sizeof(size_t) *nestingDepth);\ + size_t* tDk1 = malloc(sizeof(size_t) *contractionNumber);\ + size_t* tDk0 = malloc(sizeof(size_t) *contractionNumber);\ subArray(tsub0, M0->dim->perm, 0, len0, 0);\ - subArray(tsub1, M1->dim->perm, 0, len1, nestingDepth);\ - subArray(tDk1, M1->dim->perm, 0, nestingDepth, 0);\ - subArray(tDk0, M0->dim->perm, 0, nestingDepth, len0);\ + subArray(tsub1, M1->dim->perm, 0, len1, contractionNumber);\ + subArray(tDk1, M1->dim->perm, 0, contractionNumber, 0);\ + subArray(tDk0, M0->dim->perm, 0, contractionNumber, len0);\ /*printArraySzt(tsub0,len0,"tsub0");\ printArraySzt(tsub1,len1,"tsub1");\ - printArraySzt(tDk0,nestingDepth,"tDk0");\ - printArraySzt(tDk1,nestingDepth,"tDk1");*/\ + printArraySzt(tDk0,contractionNumber,"tDk0");\ + printArraySzt(tDk1,contractionNumber,"tDk1");*/\ dimension *dSub0 = init_dim(tsub0, len0);\ dimension *dSub1 = init_dim(tsub1, len1);\ - dimension *dM1 = init_dim(tDk1, nestingDepth);\ - dimension *dM0 = init_dim(tDk0, nestingDepth);\ + dimension *dM1 = init_dim(tDk1, contractionNumber);\ + dimension *dM0 = init_dim(tDk0, contractionNumber);\ /*printDebug_dimension(dSub0,"dSub0");\ printDebug_dimension(dSub1,"dSub1");\ printDebug_dimension(dM0,"dM0");\ @@ -129,7 +129,7 @@ void tensorContractnProd_##type(tensor_##type** MM, tensor_##type *M0, tensor_## coordM1 = malloc(sizeof(size_t)* M1->dim->size);\ \ size_t* Koord ;\ - Koord = malloc(sizeof(size_t)* nestingDepth);*/\ + Koord = malloc(sizeof(size_t)* contractionNumber);*/\ \ size_t a0_id, a1_id, n0_id, n1_id;\ for (size_t i = 0; i < M->dim->rank; i++) {\ @@ -146,8 +146,8 @@ void tensorContractnProd_##type(tensor_##type** MM, tensor_##type *M0, tensor_## n1_id= a1_id + dSub1->rank * k;\ M->x[i] += M0->x[n0_id] * M1->x[n1_id];\ /*vCoordFromLin(Koord, k, dM);\ - concatArray(coordM0, coord0, Koord, 0, 0, len0, 0, nestingDepth);\ - concatArray(coordM1, Koord, coord1, 0, 0, nestingDepth, 0, len1);\ + concatArray(coordM0, coord0, Koord, 0, 0, len0, 0, contractionNumber);\ + concatArray(coordM1, Koord, coord1, 0, 0, contractionNumber, 0, len1);\ lin0 = LineFromCoord(coordM0, M0->dim);\ lin1 = LineFromCoord(coordM1, M1->dim);\ printf("k:%ld, lin0:%ld, vs n0: %ld\n",k,lin0,n0_id);\ @@ -159,30 +159,30 @@ void tensorContractnProd_##type(tensor_##type** MM, tensor_##type *M0, tensor_## /*printf("\n");*/\ }\ }\ -void tensorContractnProdNotOpt_##type(tensor_##type** MM, tensor_##type *M0, tensor_##type *M1, size_t nestingDepth) {\ - /* if (!checkMatchProdtensor(M0->dim, M1->dim, nestingDepth)) {\ - prsize_tf("Deep = %d\n", nestingDepth);\ +void tensorContractnProdNotOpt_##type(tensor_##type** MM, tensor_##type *M0, tensor_##type *M1, size_t contractionNumber) {\ + /* if (!checkMatchProdtensor(M0->dim, M1->dim, contractionNumber)) {\ + prsize_tf("Deep = %d\n", contractionNumber);\ }*/\ \ - size_t len0 = M0->dim->size - nestingDepth;\ - size_t len1 = M1->dim->size - nestingDepth;\ + size_t len0 = M0->dim->size - contractionNumber;\ + size_t len1 = M1->dim->size - contractionNumber;\ \ size_t* tsub0 = malloc(sizeof(size_t) *len0);\ size_t* tsub1 = malloc(sizeof(size_t) *len1);\ - size_t* tDk1 = malloc(sizeof(size_t) *nestingDepth);\ - size_t* tDk0 = malloc(sizeof(size_t) *nestingDepth);\ + size_t* tDk1 = malloc(sizeof(size_t) *contractionNumber);\ + size_t* tDk0 = malloc(sizeof(size_t) *contractionNumber);\ subArray(tsub0, M0->dim->perm, 0, len0, 0);\ - subArray(tsub1, M1->dim->perm, 0, len1, nestingDepth);\ - subArray(tDk1, M1->dim->perm, 0, nestingDepth, 0);\ - subArray(tDk0, M0->dim->perm, 0, nestingDepth, len0);\ + subArray(tsub1, M1->dim->perm, 0, len1, contractionNumber);\ + subArray(tDk1, M1->dim->perm, 0, contractionNumber, 0);\ + subArray(tDk0, M0->dim->perm, 0, contractionNumber, len0);\ /*printArraySzt(tsub0,len0,"tsub0");\ printArraySzt(tsub1,len1,"tsub1");\ - printArraySzt(tDk0,nestingDepth,"tDk0");\ - printArraySzt(tDk1,nestingDepth,"tDk1");*/\ + printArraySzt(tDk0,contractionNumber,"tDk0");\ + printArraySzt(tDk1,contractionNumber,"tDk1");*/\ dimension *dSub0 = init_dim(tsub0, len0);\ dimension *dSub1 = init_dim(tsub1, len1);\ - dimension *dM1 = init_dim(tDk1, nestingDepth);\ - dimension *dM0 = init_dim(tDk0, nestingDepth);\ + dimension *dM1 = init_dim(tDk1, contractionNumber);\ + dimension *dM0 = init_dim(tDk0, contractionNumber);\ /*printDebug_dimension(dSub0,"dSub0");\ printDebug_dimension(dSub1,"dSub1");\ printDebug_dimension(dM0,"dM0");\ @@ -212,7 +212,7 @@ void tensorContractnProdNotOpt_##type(tensor_##type** MM, tensor_##type *M0, ten coordM1 = malloc(sizeof(size_t)* M1->dim->size);\ \ size_t* Koord ;\ - Koord = malloc(sizeof(size_t)* nestingDepth);\ + Koord = malloc(sizeof(size_t)* contractionNumber);\ \ for (size_t i = 0; i < M->dim->rank; i++) {\ vCoordFromLin(coord, i, M->dim);\ @@ -221,8 +221,8 @@ void tensorContractnProdNotOpt_##type(tensor_##type** MM, tensor_##type *M0, ten M->x[i] = 0;\ for (size_t k = 0; k < dM->rank; k++) {\ vCoordFromLin(Koord, k, dM);\ - concatArray(coordM0, coord0, Koord, 0, 0, len0, 0, nestingDepth);\ - concatArray(coordM1, Koord, coord1, 0, 0, nestingDepth, 0, len1);\ + concatArray(coordM0, coord0, Koord, 0, 0, len0, 0, contractionNumber);\ + concatArray(coordM1, Koord, coord1, 0, 0, contractionNumber, 0, len1);\ lin0 = LineFromCoord(coordM0, M0->dim);\ lin1 = LineFromCoord(coordM1, M1->dim);\ M->x[i] += M0->x[lin0] * M1->x[lin1];\ diff --git a/tensor_t/src/tensor_t/tensor_t.h b/tensor_t/src/tensor_t/tensor_t.h index 860ecd7..f9b1007 100644 --- a/tensor_t/src/tensor_t/tensor_t.h +++ b/tensor_t/src/tensor_t/tensor_t.h @@ -12,8 +12,8 @@ typedef struct tensor_##type tensor_##type;\ tensor_##type * CREATE_TENSOR_##type(dimension *dim); \ void tensorProdNotOpt_##type(tensor_##type **MM, tensor_##type *M0, tensor_##type *M1); \ void tensorProd_##type(tensor_##type **MM, tensor_##type *M0, tensor_##type *M1); \ -void tensorContractnProd_##type(tensor_##type **MM, tensor_##type *M0, tensor_##type *M1, size_t nestingDepth); \ -void tensorContractnProdNotOpt_##type(tensor_##type **MM, tensor_##type *M0, tensor_##type *M1, size_t nestingDepth); \ +void tensorContractnProd_##type(tensor_##type **MM, tensor_##type *M0, tensor_##type *M1, size_t contractionNumber); \ +void tensorContractnProdNotOpt_##type(tensor_##type **MM, tensor_##type *M0, tensor_##type *M1, size_t contractionNumber); \ GENERATE_TENSOR_TYPE(TYPE_FLOAT);