fanasina/y_project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add some functions to convert input char to dimension and tensor

Browse Source
This commit is contained in:
fanasina
2024-02-25 00:53:57 +01:00
parent ef107c11db
commit c1409546ef
18 changed files with 688 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tensor_t/src/tensor_t/tensor_t.c
+127 -5
View File
@@ -343,11 +343,11 @@ void print_tensor_msg_##type(tensor_##type *T,char *msg) {\
if (endian ) {\
begin = (T->dim->size) - 1; end = 0;\
iter = decr; cond = isGreatEqThan; \
printf("endian(=true): the bigest index varies first, e.g: [x0,x1,x2,...,xn] xn is the bigest index \n");\
/*printf("endian(=true): the bigest index varies first, e.g: [x0,x1,x2,...,xn] xn is the bigest index \n");*/\
}else{\
begin = 0 ; end = (T->dim->size) - 1; \
iter = incr; cond = isLessEqThan; \
printf("endian(=false): the lowest index varies first, e.g: [x0,x1,x2,...,xn] x0 is the lowest index \n");\
/*printf("endian(=false): the lowest index varies first, e.g: [x0,x1,x2,...,xn] x0 is the lowest index \n");*/\
}\
for(long int i=0;i<(T->dim)->rank;++i){\
vCoordFromLin(coord,i,T->dim);\
@@ -357,10 +357,10 @@ void print_tensor_msg_##type(tensor_##type *T,char *msg) {\
else break;\
}\
}\
printf(" [{");\
printf(" [");\
for(size_t k=0; k<(T->dim)->size;++k) printf(" %ld,",coord[k]);\
val=type##_TO_STR(T->x[i]);\
printf("}#%ld] %s, ",i,val);\
printf(" |#%ld]: %s, ",i,val);\
free(val); val=NULL;\
if(coord[begin]==(T->dim)->perm[begin]-1){\
for(long int j=begin; cond(j,end); j = iter(j)){\
@@ -617,7 +617,7 @@ void* runProd_thread_##type(void *arg){\
a0_id=i % arg_t->MRank;\
a1_id=i / arg_t->MRank;\
}\
arg_t->Mx[i] += arg_t->M0x[a0_id] * arg_t->M1x[a1_id];\
arg_t->Mx[i] = arg_t->M0x[a0_id] * arg_t->M1x[a1_id];\
}\
}\
\
@@ -984,6 +984,128 @@ void tensorContractnProdNotOpt_##type(tensor_##type** MM, tensor_##type *M0, ten
FREE_dM_S_ ; \
}\
\
\
/*format_file: [dim]((x,x,a)(a,x,a)) | example:[2,3,4](((a0,b0,c0,d0)(a1,b1,c1,d1)(a2,b2,c2,d2))((e0,f0,g0,h0)(e1,f1,g1,h1)(e2,f2,g2,h2)))*/\
tensor_##type * parseInput_withDim_to_tensor_##type(char *input){\
tensor_##type *tens ;\
size_t len = strlen(input);\
list_perm_in_dim *l_p=NULL;\
size_t ss;\
char *ttmp=input;\
char *ppEnd="[";\
bool size_unknown=false; \
for(size_t i=0; i<len ; ++i){\
if(input[i]==']') break;\
if((input[i]=='*') ||(input[i]=='_')){ size_unknown =true; break;}\
}\
while(ppEnd && (ppEnd[0] !=']') ){\
ss = strtoul(ttmp, &ppEnd, 10);\
while(ttmp == ppEnd && ppEnd[0] !=']'){\
ttmp++;\
ss = strtoul(ttmp, &ppEnd, 10);\
}\
if(ppEnd !=ttmp )\
append_in_list_perm(&l_p,ss);\
/*printf("ss: %ld\n",ss);*/\
ttmp=ppEnd;\
}\
dimension *dim=create_dim_from_list_perm(l_p);\
/*printf("ppEnd = %s\n",ppEnd);*/\
\
ttmp++; ppEnd++;\
\
if(size_unknown == false){\
tens = CREATE_TENSOR_##type(dim);\
\
size_t i=0;\
type x;\
while(ppEnd && (ppEnd[0] !='\0') && i<dim->rank){\
x = strto_##type(ttmp, &ppEnd);\
while(ttmp == ppEnd && ppEnd[0] !='\0'){\
ttmp++;\
x = strto_##type(ttmp, &ppEnd);\
}\
if(ppEnd[0]!='\0')\
(tens)->x[i] = x;\
/*printf("d: %lf\n",d);*/\
ttmp=ppEnd;\
++i;\
}\
}\
else{\
array_chainlist_##type *l_a=NULL;\
type x;\
while(ppEnd && (ppEnd[0] !='\0')){\
x = strto_##type(ttmp, &ppEnd);\
while(ttmp == ppEnd && ppEnd[0] !='\0'){\
ttmp++;\
x = strto_##type(ttmp, &ppEnd);\
}\
/*if(ppEnd[0]!='\0')*/ \
if(ppEnd != ttmp)\
append_array_chainlist_##type(&l_a, x);\
/*printf("-- x: %f\n",x);*/\
ttmp=ppEnd;\
}\
\
tens = create_tensor_from_list_array_##type(l_a,dim);\
}\
return tens;\
}\
void append_array_chainlist_##type(array_chainlist_##type **list_a, type x){\
array_chainlist_##type *lis=malloc(sizeof(array_chainlist_##type));\
lis->x=x;\
lis->next=NULL;\
if(*list_a == NULL){\
lis->index=0;\
*list_a = lis;\
}\
else{\
array_chainlist_##type *tmp =*list_a;\
while(tmp->next) tmp=tmp->next;\
lis->index = tmp->index +1;\
tmp->next=lis;\
}\
}\
\
tensor_##type * create_tensor_from_list_array_##type( array_chainlist_##type *l_a, dimension *part_dim){\
if(l_a){\
array_chainlist_##type *tmp =l_a;\
while(tmp->next) tmp=tmp->next;\
size_t miss_part_d=(tmp->index + 1)/part_dim->rank;\
dimension *dim=create_dim(part_dim->size + 1);\
if(endian){\
dim->perm[0]=miss_part_d;\
for(size_t i=0; i<part_dim->size;++i) dim->perm[i+1]=part_dim->perm[i];\
}else{\
size_t i=0;\
for(i=0; i<part_dim->size;++i) dim->perm[i]=part_dim->perm[i];\
dim->perm[i]=miss_part_d;\
\
}\
updateRankDim(dim);\
tensor_##type *tens= CREATE_TENSOR_##type(dim);\
tmp=l_a;\
while(tmp){\
(tens)->x[tmp->index]=tmp->x;\
tmp=tmp->next;\
}\
return tens;\
}\
return NULL;\
}\
\
void free_array_chainlist_##type(array_chainlist_##type *l_a){\
array_chainlist_##type *tmp=l_a, *ttmp;\
while(tmp){\
ttmp = tmp;\
tmp = ttmp->next;\
free(ttmp);\
}\
}\
\
GEN_FUNC_TENSOR(TYPE_FLOAT);
GEN_FUNC_TENSOR(TYPE_DOUBLE);
tensor_t/src/tensor_t/tensor_t.h
+11
View File
@@ -38,6 +38,17 @@ void tensorContractnProdThread_##type(tensor_##type **MM, tensor_##type *M0, ten
void tensorContractnPro2dThread_##type(tensor_##type **MM, tensor_##type *M0, tensor_##type *M1, size_t contractionNumber, size_t nbthread); \
void tensorContractnProdNotOpt_##type(tensor_##type **MM, tensor_##type *M0, tensor_##type *M1, size_t contractionNumber); \
void init_random_x_##type(tensor_##type *M, type minR, type maxR, int randomRange);\
tensor_##type * parseInput_withDim_to_tensor_##type(char *input);\
struct array_chainlist_##type{\
size_t index;\
type x;\
struct array_chainlist_##type *next;\
};\
typedef struct array_chainlist_##type array_chainlist_##type;\
void append_array_chainlist_##type(array_chainlist_##type **list_a, type x);\
tensor_##type * create_tensor_from_list_array_##type( array_chainlist_##type *l_a, dimension *part_dim);\
void free_array_chainlist_##type(array_chainlist_##type *l_a);\
GENERATE_TENSOR_TYPE(TYPE_FLOAT);
tensor_t/test/is_good.c
+162 -3
View File
@@ -423,7 +423,7 @@ TEST(Split_randomInit){
#if 1
TEST(Split_randomInit){
endian=false;
//endian=false;
dimension *d0=create_dim(3);
d0->perm[0]=4;
@@ -444,8 +444,8 @@ TEST(Split_randomInit){
tensor_TYPE_FLOAT *Tpart1=NULL, *Tpart2=NULL;
split_tensor_TYPE_FLOAT(M0,&Tpart1,&Tpart2, 2, 4);
//split_tensor_TYPE_FLOAT(M0,&Tpart1,&Tpart2, 0, 1);
//split_tensor_TYPE_FLOAT(M0,&Tpart1,&Tpart2, 2, 4);
split_tensor_TYPE_FLOAT(M0,&Tpart1,&Tpart2, 0, 1);
//split_tensor_TYPE_FLOAT(M0,&Tpart1,&Tpart2, 2, 1);
print_tensor_float(Tpart1, " Tpart1 1");
@@ -685,6 +685,118 @@ TEST(tensorContractnProd_TYPE_FLOAT2 ){
free_tensor_TYPE_FLOAT(M1);
}
TEST(tensorContractnProd_TYPE_DOUBLE_2_1 ){
dimension *d0=create_dim(2);
dimension *d1=create_dim(1);
#if VALGRIND_
d0->perm[0]=4;
d0->perm[1]=2; //3;
d1->perm[0]=2;
#else
d0->perm[0]=125;
d0->perm[1]=52; //3;
d1->perm[0]=52;
#endif
updateRankDim(d0);
updateRankDim(d1);
tensor_TYPE_DOUBLE *M0 = CREATE_TENSOR_TYPE_DOUBLE(d0);
tensor_TYPE_DOUBLE *M1 = CREATE_TENSOR_TYPE_DOUBLE(d1);
LOG("M0->dim->rank = %ld\n",M0->dim->rank);
LOG("M1->dim->rank = %ld\n",M1->dim->rank);
for(size_t i=0; i<M0->dim->rank;++i) M0->x[i]=i*0.1 +1;
for(size_t i=0; i<M1->dim->rank;++i) M1->x[i]=i*0.003 + 2;
print_tensor_double(M0,"M0");
print_tensor_double(M1,"M1");
tensor_TYPE_DOUBLE *M;
tensor_TYPE_DOUBLE *MnO;
tensorContractnProd_TYPE_DOUBLE(&M, M0,M1,1);
//print_tensor_double(M,"M");
//cl_tensorContractnProd_TYPE_DOUBLE(&MnO, M0,M1,2);
tensorContractnProdNotOpt_TYPE_DOUBLE(&MnO, M0,M1,1);
print_tensor_double(MnO,"MnO");
// for(size_t i=0;i<M->dim->rank;++i)
// EXPECT_EQ_TYPE_DOUBLE(M->x[i],MnO->x[i]);
EXPECT_ARRAY_EQ_TYPE_DOUBLE(M->x,M->dim->rank,MnO->x,MnO->dim->rank);
free_tensor_TYPE_DOUBLE(M);
free_tensor_TYPE_DOUBLE(MnO);
free_tensor_TYPE_DOUBLE(M0);
free_tensor_TYPE_DOUBLE(M1);
}
TEST(tensorContractnProd_TYPE_DOUBLE_2_2 ){
dimension *d0=create_dim(2);
dimension *d1=create_dim(2);
#if VALGRIND_
d0->perm[0]=4;
d0->perm[1]=2; //3;
d1->perm[0]=2;
d1->perm[1]=1;
#else
d0->perm[0]=125;
d0->perm[1]=52; //3;
d1->perm[0]=52;
d1->perm[1]=1;
#endif
updateRankDim(d0);
updateRankDim(d1);
tensor_TYPE_DOUBLE *M0 = CREATE_TENSOR_TYPE_DOUBLE(d0);
tensor_TYPE_DOUBLE *M1 = CREATE_TENSOR_TYPE_DOUBLE(d1);
LOG("M0->dim->rank = %ld\n",M0->dim->rank);
LOG("M1->dim->rank = %ld\n",M1->dim->rank);
for(size_t i=0; i<M0->dim->rank;++i) M0->x[i]=i*0.1 +1;
for(size_t i=0; i<M1->dim->rank;++i) M1->x[i]=i*0.003 + 2;
print_tensor_double(M0,"M0");
print_tensor_double(M1,"M1");
tensor_TYPE_DOUBLE *M;
tensor_TYPE_DOUBLE *MnO;
tensorContractnProd_TYPE_DOUBLE(&M, M0,M1,1);
//print_tensor_double(M,"M");
//cl_tensorContractnProd_TYPE_DOUBLE(&MnO, M0,M1,2);
tensorContractnProdNotOpt_TYPE_DOUBLE(&MnO, M0,M1,1);
print_tensor_double(MnO,"MnO");
// for(size_t i=0;i<M->dim->rank;++i)
// EXPECT_EQ_TYPE_DOUBLE(M->x[i],MnO->x[i]);
EXPECT_ARRAY_EQ_TYPE_DOUBLE(M->x,M->dim->rank,MnO->x,MnO->dim->rank);
free_tensor_TYPE_DOUBLE(M);
free_tensor_TYPE_DOUBLE(MnO);
free_tensor_TYPE_DOUBLE(M0);
free_tensor_TYPE_DOUBLE(M1);
}
TEST(tensorContractnProd_TYPE_DOUBLE2 ){
dimension *d0=create_dim(3);
@@ -1166,6 +1278,53 @@ TEST(tensorProd_vsThread2d ){
free_tensor_TYPE_FLOAT(M1);
}
TEST(parseInput_withDim_to_tensor){
endian=true;
char *input="[2,3]"\
"((1.21,10,0.23)"\
"(.56,124,22.5)) ";
tensor_TYPE_FLOAT *t=parseInput_withDim_to_tensor_TYPE_FLOAT(input);
print_tensor_msg_TYPE_FLOAT(t," tensor from input" );
free_tensor_TYPE_FLOAT(t);
}
TEST(parseInput_unknownpart_to_tensor){
//endian=true;
endian=true;
char *input="[*,3]"\
"((1.21,10,0.23)"\
"((1.21,10,0.23)"\
"((1.21,10,0.23)"\
"((1.21,10,0.23)"\
"((1.21,10,0.23)"\
"((1.21,10,0.23)"\
"(.56,124,22.5)) ";
tensor_TYPE_FLOAT *t=parseInput_withDim_to_tensor_TYPE_FLOAT(input);
print_tensor_msg_TYPE_FLOAT(t," tensor from input" );
free_tensor_TYPE_FLOAT(t);
}
TEST(parseInput_unknownpart_to_tensorendfalse){
endian=false;
char *input="[3,_]"\
"((1.21,10,0.23,21)"\
"((1.21,10,0.23,.1)"\
"(.56,124,22.5,1.44))";
tensor_TYPE_FLOAT *t=parseInput_withDim_to_tensor_TYPE_FLOAT(input);
print_tensor_msg_TYPE_FLOAT(t," tensor from input" );
free_tensor_TYPE_FLOAT(t);
}
int main(int argc, char **argv){