diff --git a/onetensor/tesTensor.c b/onetensor/tesTensor.c index f1cb74d..449a095 100644 --- a/onetensor/tesTensor.c +++ b/onetensor/tesTensor.c @@ -60,7 +60,7 @@ void print_tensor_float(tensor_TYPE_FLOAT *M, char *msg){ } LOG("================= %s ===============\n",msg); - /*for(size_t i=0; idim->size;++i) + /*for(long i=0; idim->size;++i) LOG("[%ld]: %f ",i,M->x[i]); */ print_tensor_msg_TYPE_FLOAT(M,msg); @@ -72,7 +72,7 @@ void print_tensor_double(tensor_TYPE_DOUBLE *M, char *msg){ LOG("================= %s ===============\n",msg); #if VALGRIND_ /* - for(size_t i=0; idim->size;++i) + for(long i=0; idim->size;++i) LOG("[%ld]: %lf ",i,M->x[i]); */ print_tensor_msg_TYPE_DOUBLE(M,msg); @@ -94,10 +94,10 @@ TEST(tensorMinusSubhead_ ){ tensor_TYPE_FLOAT *M0 = create_tensor_TYPE_FLOAT(d0); LOG("M0->dim->size = %ld\n",M0->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; //littleEndian=false; - size_t rnkId = 1; + long rnkId = 1; tensor_TYPE_FLOAT *s2h = sub_copy_minus_tensor_head_TYPE_FLOAT(M0,1,rnkId); print_tensor_float(M0, "M0 for sub"); @@ -107,10 +107,10 @@ TEST(tensorMinusSubhead_ ){ printDebug_dimension(s2h->dim," s2h dimension "); //EXPECT_ARRAY_EQ_TYPE_FLOAT(M0->x,s2h->dim->size,s2h->x,s2h->dim->size); - for(size_t i1=0; i1shape[1];++i1){ - for(size_t i0=0; i0shape[0];++i0){ - printf("EXPECT_EQ_TYPE_FLOAT c0[%ld](%ld,%ld,%ld) : s[%ld](%ld,%ld) \n",LineFromCoord((size_t[]){i0,i1,rnkId},M0->dim),rnkId,i0,i1,LineFromCoord((size_t[]){i0,i1},s2h->dim),i0,i1); - EXPECT_EQ_TYPE_FLOAT(M0->x[LineFromCoord((size_t[]){i0,i1,rnkId},M0->dim)],s2h->x[LineFromCoord((size_t[]){i0,i1},s2h->dim)]); + for(long i1=0; i1shape[1];++i1){ + for(long i0=0; i0shape[0];++i0){ + printf("EXPECT_EQ_TYPE_FLOAT c0[%ld](%ld,%ld,%ld) : s[%ld](%ld,%ld) \n",LineFromCoord((long[]){i0,i1,rnkId},M0->dim),rnkId,i0,i1,LineFromCoord((long[]){i0,i1},s2h->dim),i0,i1); + EXPECT_EQ_TYPE_FLOAT(M0->x[LineFromCoord((long[]){i0,i1,rnkId},M0->dim)],s2h->x[LineFromCoord((long[]){i0,i1},s2h->dim)]); } } @@ -132,7 +132,7 @@ TEST(tensorMinusSubtail ){ tensor_TYPE_FLOAT *M0 = create_tensor_TYPE_FLOAT(d0); LOG("M0->dim->size = %ld\n",M0->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; tensor_TYPE_FLOAT *s1t = sub_copy_minus_tensor_tail_TYPE_FLOAT(M0,1,5); @@ -158,10 +158,10 @@ TEST(tensorMinusSubtail ){ tensor_TYPE_FLOAT *M0 = create_tensor_TYPE_FLOAT(d0); LOG("M0->dim->size = %ld\n",M0->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; //littleEndian=false; - size_t rnkId=3; + long rnkId=3; tensor_TYPE_FLOAT *s2t = sub_copy_minus_tensor_tail_TYPE_FLOAT(M0,1,rnkId); @@ -169,10 +169,10 @@ TEST(tensorMinusSubtail ){ print_tensor_float(M0, "M0 for sub"); print_tensor_float(s2t, "sub s2t of M0 from 3"); - for(size_t i1=0; i1shape[1];++i1){ - for(size_t i2=0; i2shape[2];++i2){ - printf("EXPECT_EQ_TYPE_FLOAT c0[%ld](%ld,%ld,%ld) : s[%ld](%ld,%ld) \n",LineFromCoord((size_t[]){rnkId,i1,i2},M0->dim),rnkId,i1,i2,LineFromCoord((size_t[]){i1,i2},s2t->dim),i1,i2); - EXPECT_EQ_TYPE_FLOAT(M0->x[LineFromCoord((size_t[]){rnkId,i1,i2},M0->dim)],s2t->x[LineFromCoord((size_t[]){i1,i2},s2t->dim)]); + for(long i1=0; i1shape[1];++i1){ + for(long i2=0; i2shape[2];++i2){ + printf("EXPECT_EQ_TYPE_FLOAT c0[%ld](%ld,%ld,%ld) : s[%ld](%ld,%ld) \n",LineFromCoord((long[]){rnkId,i1,i2},M0->dim),rnkId,i1,i2,LineFromCoord((long[]){i1,i2},s2t->dim),i1,i2); + EXPECT_EQ_TYPE_FLOAT(M0->x[LineFromCoord((long[]){rnkId,i1,i2},M0->dim)],s2t->x[LineFromCoord((long[]){i1,i2},s2t->dim)]); } } @@ -194,10 +194,10 @@ TEST(tensorSubhead_ ){ tensor_TYPE_FLOAT *M0 = create_tensor_TYPE_FLOAT(d0); LOG("M0->dim->size = %ld\n",M0->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; //littleEndian=false; - size_t rnkId = 1; + long rnkId = 1; tensor_TYPE_FLOAT *s2h = sub_copy_tensor_head_TYPE_FLOAT(M0,2,rnkId); print_tensor_float(M0, "M0 for sub"); @@ -207,10 +207,10 @@ TEST(tensorSubhead_ ){ printDebug_dimension(s2h->dim," s2h dimension "); //EXPECT_ARRAY_EQ_TYPE_FLOAT(M0->x,s2h->dim->size,s2h->x,s2h->dim->size); - for(size_t i1=0; i1shape[1];++i1){ - for(size_t i0=0; i0shape[0];++i0){ - printf("EXPECT_EQ_TYPE_FLOAT c0[%ld](%ld,%ld,%ld) : s[%ld](%ld,%ld) \n",LineFromCoord((size_t[]){i0,i1,rnkId},M0->dim),rnkId,i0,i1,LineFromCoord((size_t[]){i0,i1},s2h->dim),i0,i1); - EXPECT_EQ_TYPE_FLOAT(M0->x[LineFromCoord((size_t[]){i0,i1,rnkId},M0->dim)],s2h->x[LineFromCoord((size_t[]){i0,i1},s2h->dim)]); + for(long i1=0; i1shape[1];++i1){ + for(long i0=0; i0shape[0];++i0){ + printf("EXPECT_EQ_TYPE_FLOAT c0[%ld](%ld,%ld,%ld) : s[%ld](%ld,%ld) \n",LineFromCoord((long[]){i0,i1,rnkId},M0->dim),rnkId,i0,i1,LineFromCoord((long[]){i0,i1},s2h->dim),i0,i1); + EXPECT_EQ_TYPE_FLOAT(M0->x[LineFromCoord((long[]){i0,i1,rnkId},M0->dim)],s2h->x[LineFromCoord((long[]){i0,i1},s2h->dim)]); } } free_tensor_TYPE_FLOAT(M0); @@ -230,7 +230,7 @@ TEST(tensorSubtail ){ tensor_TYPE_FLOAT *M0 = create_tensor_TYPE_FLOAT(d0); LOG("M0->dim->size = %ld\n",M0->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; tensor_TYPE_FLOAT *s1t = sub_copy_tensor_tail_TYPE_FLOAT(M0,2,5); @@ -258,10 +258,10 @@ TEST(tensorSubtail ){ tensor_TYPE_FLOAT *M0 = create_tensor_TYPE_FLOAT(d0); LOG("M0->dim->size = %ld\n",M0->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; //littleEndian=false; - size_t rnkId=3; + long rnkId=3; tensor_TYPE_FLOAT *s2t = sub_copy_tensor_tail_TYPE_FLOAT(M0,2,rnkId); @@ -269,10 +269,10 @@ TEST(tensorSubtail ){ print_tensor_float(M0, "M0 for sub"); print_tensor_float(s2t, "sub s2t of M0 from 3"); - for(size_t i1=0; i1shape[1];++i1){ - for(size_t i2=0; i2shape[2];++i2){ - printf("EXPECT_EQ_TYPE_FLOAT c0[%ld](%ld,%ld,%ld) : s[%ld](%ld,%ld) \n",LineFromCoord((size_t[]){rnkId,i1,i2},M0->dim),rnkId,i1,i2,LineFromCoord((size_t[]){i1,i2},s2t->dim),i1,i2); - EXPECT_EQ_TYPE_FLOAT(M0->x[LineFromCoord((size_t[]){rnkId,i1,i2},M0->dim)],s2t->x[LineFromCoord((size_t[]){i1,i2},s2t->dim)]); + for(long i1=0; i1shape[1];++i1){ + for(long i2=0; i2shape[2];++i2){ + printf("EXPECT_EQ_TYPE_FLOAT c0[%ld](%ld,%ld,%ld) : s[%ld](%ld,%ld) \n",LineFromCoord((long[]){rnkId,i1,i2},M0->dim),rnkId,i1,i2,LineFromCoord((long[]){i1,i2},s2t->dim),i1,i2); + EXPECT_EQ_TYPE_FLOAT(M0->x[LineFromCoord((long[]){rnkId,i1,i2},M0->dim)],s2t->x[LineFromCoord((long[]){i1,i2},s2t->dim)]); } } @@ -317,7 +317,7 @@ TEST(printT_init_false){ LOG("M0->dim->size = %ld\n",M0->dim->size); //init_random_x_TYPE_FLOAT(M0,2,5,50); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; // print_tensor_float(M0, "M0 "); @@ -344,7 +344,7 @@ TEST(printT_Init_true){ LOG("M0->dim->size = %ld\n",M0->dim->size); //init_random_x_TYPE_FLOAT(M0,2,5,50); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; // print_tensor_float(M0, "M0 "); @@ -372,7 +372,7 @@ TEST(sprinttens){ //print_tensor_double(M0, "test print M0"); char *tensCont = NULL; - size_t nbChar = sprint_tensor_TYPE_DOUBLE(&tensCont, M0, false); + long nbChar = sprint_tensor_TYPE_DOUBLE(&tensCont, M0, false); LOG(" avec Sprint_tensor sans index, M0 est : \n%s \n, il y a %ld charactères\n",tensCont, nbChar); @@ -515,7 +515,7 @@ TEST(SplitOne_randomInit){ printDebug_dimension(Tpart2->dim,"dim part2 "); printDebug_dimension(M0->dim,"dim root "); - for(size_t i=0;i<(Tpart1->dim)->size;++i) Tpart1->x[i]=0; + for(long i=0;i<(Tpart1->dim)->size;++i) Tpart1->x[i]=0; print_tensor_float(Tpart1, "Tpart1 0"); print_tensor_float(M0, "M0 Tpart1 0"); @@ -554,8 +554,8 @@ TEST(tensorProdNoOpt){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; print_tensor_float(M0,"M0"); print_tensor_float(M1,"M1"); @@ -654,8 +654,8 @@ TEST(tensorProd ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; print_tensor_float(M0,"M0"); print_tensor_float(M1,"M1"); @@ -714,8 +714,8 @@ TEST(tensorContractnProd_TYPE_FLOATNoOpt ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; print_tensor_float(M0,"M0"); print_tensor_float(M1,"M1"); @@ -792,7 +792,7 @@ printDebug_dimension(MnO->dim, "dim Contr 1"); //print_tensor_float(M,"M"); print_tensor_float(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_FLOAT(M->x[i],MnO->x[i]); //EXPECT_ARRAY_EQ_TYPE_FLOAT(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -838,8 +838,8 @@ TEST(tensorContractnProd_TYPE_FLOATNoOpt2 ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; print_tensor_float(M0,"M0"); print_tensor_float(M1,"M1"); @@ -908,7 +908,7 @@ TEST(tensorContractnProd_TYPE_FLOATNoOpt2 ){ //print_tensor_float(M,"M"); print_tensor_float(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_FLOAT(M->x[i],MnO->x[i]); //EXPECT_ARRAY_EQ_TYPE_FLOAT(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -954,8 +954,8 @@ TEST(tensorContractnProd_TYPE_FLOATNoOpt3littleEndianFalse ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*2.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*1.3 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*2.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*1.3 + 2; print_tensor_float(M0,"M0"); print_tensor_float(M1,"M1"); @@ -972,7 +972,7 @@ TEST(tensorContractnProd_TYPE_FLOATNoOpt3littleEndianFalse ){ for(long int i1=0;i1shape[1];++i1){ for(long int i2=0;i2shape[2];++i2){ coord3[0]=i0; coord3[1]=i1; coord3[2]=i2; - size_t z=signedLineFromCoord(coord3, d0); + long z=signedLineFromCoord(coord3, d0); MMM0[i0][i1][i2]=M0->x[z]; //MMM0[i0][i1][i2]=M0->x[signedLineFromCoord(coord3, d0)]; printf("[[%ld]] M0[%ld][%ld][%ld] = %f \n",z,i0,i1,i2,MMM0[i0][i1][i2]); @@ -986,7 +986,7 @@ TEST(tensorContractnProd_TYPE_FLOATNoOpt3littleEndianFalse ){ for(long int j1=0;j1shape[1];++j1){ for(long int j2=0;j2shape[2];++j2){ coord23[0]=j0; coord23[1]=j1; coord23[2]=j2; - size_t z =signedLineFromCoord(coord23, d1); + long z =signedLineFromCoord(coord23, d1); MMM1[j0][j1][j2]=M1->x[z]; //MMM1[j0][j1][j2]=M1->x[signedLineFromCoord(coord23, d1)]; printf("[[%ld]] M1[%ld][%ld][%ld] = %f \n",z,j0,j1,j2,MMM1[j0][j1][j2]); @@ -1015,7 +1015,7 @@ TEST(tensorContractnProd_TYPE_FLOATNoOpt3littleEndianFalse ){ for(long int i0=0;i0shape[0];++i0){ for(long int j2=0;j2shape[2];++j2){ coord52[0]=i0; coord52[1]=j2; - size_t z = signedLineFromCoord(coord52, MnO->dim); + long z = signedLineFromCoord(coord52, MnO->dim); EXPECT_EQ_TYPE_FLOAT(MMMm[i0][j2], MnO->x[z] ); //EXPECT_EQ_TYPE_FLOAT(MMMm[i0][j2], MnO->x[signedLineFromCoord(coord52, MnO->dim)] ); @@ -1033,7 +1033,7 @@ TEST(tensorContractnProd_TYPE_FLOATNoOpt3littleEndianFalse ){ //print_tensor_float(M,"M"); print_tensor_float(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_FLOAT(M->x[i],MnO->x[i]); //EXPECT_ARRAY_EQ_TYPE_FLOAT(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1082,8 +1082,8 @@ TEST(tensorContractnProd_TYPE_FLOAT ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; print_tensor_float(M0,"M0"); print_tensor_float(M1,"M1"); @@ -1098,7 +1098,7 @@ TEST(tensorContractnProd_TYPE_FLOAT ){ print_tensor_float(M,"M"); print_tensor_float(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_FLOAT(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_FLOAT(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1143,8 +1143,8 @@ TEST(tensorContractnProd_TYPE_FLOAT2 ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; // print_tensor_float(M0,"M0"); // print_tensor_float(M1,"M1"); @@ -1159,7 +1159,7 @@ TEST(tensorContractnProd_TYPE_FLOAT2 ){ // print_tensor_float(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_FLOAT(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_FLOAT(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1204,8 +1204,8 @@ TEST(tensorContractnProdOpt0_TYPE_FLOAT2 ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; // print_tensor_float(M0,"M0"); // print_tensor_float(M1,"M1"); @@ -1220,7 +1220,7 @@ TEST(tensorContractnProdOpt0_TYPE_FLOAT2 ){ // print_tensor_float(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_FLOAT(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_FLOAT(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1269,8 +1269,8 @@ TEST(tensorContractnProdThreadOpt0_TYPE_FLOAT2 ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; // print_tensor_float(M0,"M0"); // print_tensor_float(M1,"M1"); @@ -1285,7 +1285,7 @@ TEST(tensorContractnProdThreadOpt0_TYPE_FLOAT2 ){ // print_tensor_float(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_FLOAT(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_FLOAT(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1332,8 +1332,8 @@ TEST(tensorContractnPro2dThreadOpt0_TYPE_FLOAT2 ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; // print_tensor_float(M0,"M0"); // print_tensor_float(M1,"M1"); @@ -1348,7 +1348,7 @@ TEST(tensorContractnPro2dThreadOpt0_TYPE_FLOAT2 ){ // print_tensor_float(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_FLOAT(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_FLOAT(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1393,8 +1393,8 @@ TEST(tensorContractnPro2dThread_TYPE_FLOAT2 ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; // print_tensor_float(M0,"M0"); // print_tensor_float(M1,"M1"); @@ -1409,7 +1409,7 @@ TEST(tensorContractnPro2dThread_TYPE_FLOAT2 ){ // print_tensor_float(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_FLOAT(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_FLOAT(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1456,8 +1456,8 @@ TEST(tensorContractnProdThread_TYPE_FLOAT2 ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; // print_tensor_float(M0,"M0"); // print_tensor_float(M1,"M1"); @@ -1472,7 +1472,7 @@ TEST(tensorContractnProdThread_TYPE_FLOAT2 ){ // print_tensor_float(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_FLOAT(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_FLOAT(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1509,8 +1509,8 @@ TEST(tensorContractnProd_TYPE_DOUBLE_2_1 ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; print_tensor_double(M0,"M0"); print_tensor_double(M1,"M1"); @@ -1525,7 +1525,7 @@ TEST(tensorContractnProd_TYPE_DOUBLE_2_1 ){ print_tensor_double(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_DOUBLE(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_DOUBLE(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1565,8 +1565,8 @@ TEST(tensorContractnProd_TYPE_DOUBLE_2_1 ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; print_tensor_double(M0,"M0"); print_tensor_double(M1,"M1"); @@ -1581,7 +1581,7 @@ TEST(tensorContractnProd_TYPE_DOUBLE_2_1 ){ print_tensor_double(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_DOUBLE(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_DOUBLE(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1622,8 +1622,8 @@ TEST(tensorContractnProd_TYPE_DOUBLE_2_2 ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; print_tensor_double(M0,"M0"); print_tensor_double(M1,"M1"); @@ -1638,7 +1638,7 @@ TEST(tensorContractnProd_TYPE_DOUBLE_2_2 ){ print_tensor_double(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_DOUBLE(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_DOUBLE(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1684,8 +1684,8 @@ TEST(tensorContractnProd_TYPE_DOUBLE2 ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; //print_tensor_double(M0,"M0"); //print_tensor_double(M1,"M1"); @@ -1700,7 +1700,7 @@ TEST(tensorContractnProd_TYPE_DOUBLE2 ){ //print_tensor_double(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_DOUBLE(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_DOUBLE(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1745,8 +1745,8 @@ TEST(VStensorContractnProd_TYPE_DOUBLE2 ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; //print_tensor_double(M0,"M0"); //print_tensor_double(M1,"M1"); @@ -1761,7 +1761,7 @@ TEST(VStensorContractnProd_TYPE_DOUBLE2 ){ //print_tensor_double(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_DOUBLE(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_DOUBLE(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1807,8 +1807,8 @@ TEST(Pthread_tensorContractnPro2d_TYPE_DOUBLE2 ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; //print_tensor_double(M0,"M0"); //print_tensor_double(M1,"M1"); @@ -1816,7 +1816,7 @@ TEST(Pthread_tensorContractnPro2d_TYPE_DOUBLE2 ){ tensor_TYPE_DOUBLE *M=NULL; tensor_TYPE_DOUBLE *MnO=NULL; - size_t nbthread = 5; + long nbthread = 5; tensorContractnProd_TYPE_DOUBLE(&M, M0,M1,2); //print_tensor_double(M,"M"); @@ -1825,7 +1825,7 @@ TEST(Pthread_tensorContractnPro2d_TYPE_DOUBLE2 ){ //print_tensor_double(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_DOUBLE(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_DOUBLE(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1866,8 +1866,8 @@ TEST(contract_dim1){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; print_tensor_double(M0,"M0"); print_tensor_double(M1,"M1"); @@ -1875,7 +1875,7 @@ TEST(contract_dim1){ tensor_TYPE_DOUBLE *M=NULL; tensor_TYPE_DOUBLE *MnO=NULL; - size_t nbthread = 5; + long nbthread = 5; tensorContractnProd_TYPE_DOUBLE(&M, M0,M1,1); //print_tensor_double(M,"M"); @@ -1889,7 +1889,7 @@ printDebug_dimension(M1->dim," M1 dimension "); printDebug_dimension(M->dim," M dimension "); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_DOUBLE(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_DOUBLE(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1934,8 +1934,8 @@ TEST(Pthread_tensorContractnProd_TYPE_DOUBLE2 ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; //print_tensor_double(M0,"M0"); //print_tensor_double(M1,"M1"); @@ -1943,7 +1943,7 @@ TEST(Pthread_tensorContractnProd_TYPE_DOUBLE2 ){ tensor_TYPE_DOUBLE *M=NULL; tensor_TYPE_DOUBLE *MnO=NULL; - size_t nbthread = 5; + long nbthread = 5; tensorContractnProd_TYPE_DOUBLE(&M, M0,M1,2); //print_tensor_double(M,"M"); @@ -1952,7 +1952,7 @@ TEST(Pthread_tensorContractnProd_TYPE_DOUBLE2 ){ //print_tensor_double(MnO,"MnO"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_DOUBLE(M->x[i],MnO->x[i]); EXPECT_ARRAY_EQ_TYPE_DOUBLE(M->x,M->dim->size,MnO->x,MnO->dim->size); @@ -1997,8 +1997,8 @@ TEST(tensorProd_vs ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; tensor_TYPE_FLOAT *M=NULL; @@ -2051,15 +2051,15 @@ TEST(tensorProd_vsThread ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.1 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.1 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; tensor_TYPE_FLOAT *M=NULL; tensor_TYPE_FLOAT *Mn=NULL; - size_t nbthread = 5; + long nbthread = 5; tensorProdThread_TYPE_FLOAT(&M,M0,M1,nbthread); //tensorProdNotOpt_TYPE_FLOAT(&Mn,M0,M1); @@ -2109,14 +2109,14 @@ TEST(tensorProd_vsThread2d ){ LOG("M0->dim->size = %ld\n",M0->dim->size); LOG("M1->dim->size = %ld\n",M1->dim->size); - for(size_t i=0; idim->size;++i) M0->x[i]=i*0.01 +1; - for(size_t i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; + for(long i=0; idim->size;++i) M0->x[i]=i*0.01 +1; + for(long i=0; idim->size;++i) M1->x[i]=i*0.003 + 2; tensor_TYPE_FLOAT *M=NULL; tensor_TYPE_FLOAT *Mn=NULL; - size_t nbthread = 5; + long nbthread = 5; tensorProdThrea2d_TYPE_FLOAT(&M,M0,M1,nbthread); //tensorProdNotOpt_TYPE_FLOAT(&Mn,M0,M1); @@ -2578,21 +2578,21 @@ TEST(array_from_parseInputOutput_file_knownpart1dimInput_1output_to_tensor){ tensor_TYPE_FLOAT **arrt1 = fromInput_to_array_tensor_TYPE_FLOAT(t1); - size_t sz0=(t0->dim)->shape[0]; - size_t sz1=(t1->dim)->shape[0]; + long sz0=(t0->dim)->shape[0]; + long sz1=(t1->dim)->shape[0]; char msg[256]; - for(size_t i=0; i< sz0; ++i){ + for(long i=0; i< sz0; ++i){ sprintf(msg," array t0 [%ld ] ",i); print_tensor_msg_TYPE_FLOAT(arrt0[i],msg); } - for(size_t i=0; i< sz1; ++i){ + for(long i=0; i< sz1; ++i){ sprintf(msg," array t1 [%ld ] ",i); print_tensor_msg_TYPE_FLOAT(arrt1[i],msg); } - for(size_t i=0; i< sz0; ++i) free_tensor_TYPE_FLOAT(arrt0[i]); - for(size_t i=0; i< sz1; ++i) free_tensor_TYPE_FLOAT(arrt1[i]); + for(long i=0; i< sz0; ++i) free_tensor_TYPE_FLOAT(arrt0[i]); + for(long i=0; i< sz1; ++i) free_tensor_TYPE_FLOAT(arrt1[i]); free(arrt0); free(arrt1); @@ -2714,8 +2714,8 @@ TEST(tensorContractnProd_TYPE_DOUBLE_2_2 ){ tensor_TYPE_DOUBLE *M0 = create_tensor_TYPE_DOUBLE(d0); tensor_TYPE_DOUBLE *M1 = create_tensor_TYPE_DOUBLE(d1); - for(size_t i=0; idim->size;++i) M0->x[i]=2 ; - for(size_t i=0; idim->size;++i) M1->x[i]=3; + for(long i=0; idim->size;++i) M0->x[i]=2 ; + for(long i=0; idim->size;++i) M1->x[i]=3; print_tensor_double(M0,"M0"); print_tensor_double(M1,"M1"); @@ -2726,7 +2726,7 @@ TEST(tensorContractnProd_TYPE_DOUBLE_2_2 ){ print_tensor_double(M,"M"); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_DOUBLE(M->x[i],MnO->x[i]); @@ -2770,11 +2770,11 @@ TEST(scalProduct){ tensor_TYPE_DOUBLE *M_0 = create_tensor_TYPE_DOUBLE(d_0); tensor_TYPE_DOUBLE *M_1 = create_tensor_TYPE_DOUBLE(d_1); - for(size_t i=0; idim->size;++i) { + for(long i=0; idim->size;++i) { M0->x[i]=2 ; M_0->x[i]=2 ; } - for(size_t i=0; idim->size;++i) { + for(long i=0; idim->size;++i) { M1->x[i]=3; M_1->x[i]=3; } @@ -2791,7 +2791,7 @@ TEST(scalProduct){ EXPECT_EQ_TYPE_DOUBLE(dotProd, M->x[0]); - // for(size_t i=0;idim->size;++i) + // for(long i=0;idim->size;++i) // EXPECT_EQ_TYPE_DOUBLE(M->x[i],MnO->x[i]); diff --git a/onetensor/testDimension.c b/onetensor/testDimension.c index 366304a..51da84c 100644 --- a/onetensor/testDimension.c +++ b/onetensor/testDimension.c @@ -162,10 +162,10 @@ TEST(Coord_linear){ updateDim(D); - size_t line=255; - size_t *coord = CoordFromLin(line,D); + long line=255; + long *coord = CoordFromLin(line,D); - for(size_t i=0; irank; ++i){ + for(long i=0; irank; ++i){ LOG("coo[%ld]=%ld\n",i,coord[i]); } @@ -186,7 +186,7 @@ TEST(signedCoord_linear){ long line=-255; long *coord = signedCoordFromLin(line,D); - for(size_t i=0; irank; ++i){ + for(long i=0; irank; ++i){ LOG("coo[%ld]=%ld\n",i,coord[i]); } @@ -206,7 +206,7 @@ TEST(signedCoord_linearSuccessif){ for(long line=-4; line < 4; ++line){ long *coord = signedCoordFromLin(line,D); - for(size_t i=0; irank; ++i){ + for(long i=0; irank; ++i){ LOG("coo[%ld]=%ld\n",i,coord[i]); } @@ -226,7 +226,7 @@ TEST(sprint_dim){ updateDim(D); char *dimSTR =NULL; - size_t nb=sprint_dimension(&dimSTR, D); + long nb=sprint_dimension(&dimSTR, D); LOG(" nb char : %ld\n, dim print:\n%s\n",nb, dimSTR); @@ -245,7 +245,7 @@ TEST(incrment_dim){ updateDim(D); char *dimSTR =NULL; - size_t nb=sprint_dimension(&dimSTR, D); + long nb=sprint_dimension(&dimSTR, D); LOG(" nb char : %ld\n, dim print:\n%s\n",nb, dimSTR); @@ -263,7 +263,7 @@ TEST(incrment_dim){ TEST(list_shape_in_dim){ list_shape_in_dim *l_p=NULL; - for(size_t i=1;i<5; ++i){ + for(long i=1;i<5; ++i){ append_in_list_shape(&l_p, i); }