A complete test for LDA

audictheprogrammer · audictheprogrammer · commit aa6afe6e5d3e · 2023-07-16T20:54:39.000+02:00
diff --git a/src/data/Matrix_A.txt b/src/data/Matrix_A.txt
@@ -1,2 +1,2 @@
-1
-[ 51180069.000000 ]
+1
+[ 51180069.000000 ]
diff --git a/src/data/Matrix_A_1D.txt b/src/data/Matrix_A_1D.txt
@@ -1,4 +1,4 @@
-3
-[ 1, 2, 1 ]
-[ 3, 4, 1 ]
-[ 0, 0, 1 ]
+3
+[ 1, 2, 1 ]
+[ 3, 4, 1 ]
+[ 0, 0, 1 ]
diff --git a/src/data/Matrix_A_1D_2.txt b/src/data/Matrix_A_1D_2.txt
@@ -0,0 +1,4 @@
+3
+[ 1, 10, 100]
+[ 10, 10, 100]
+[ 100, 100, 100]
diff --git a/src/data/Matrix_B.txt b/src/data/Matrix_B.txt
@@ -1,2 +1,2 @@
-1
-[ 41088273.000000 ]
+1
+[ 41088273.000000 ]
diff --git a/src/data/Matrix_B_1D.txt b/src/data/Matrix_B_1D.txt
@@ -1,4 +1,4 @@
-3
-[ 0, 1, 3 ]
-[ 0, 0, 0 ]
-[ 3, 0, 3]
+3
+[ 0, 1, 3 ]
+[ 0, 0, 0 ]
+[ 3, 0, 3]
diff --git a/src/data/Matrix_B_1D_2.txt b/src/data/Matrix_B_1D_2.txt
@@ -0,0 +1,4 @@
+3
+[ 1, 0, 0 ]
+[ 0, 1, 0 ]
+[ 0, 0, 1 ]
diff --git a/src/data/Matrix_C.txt b/src/data/Matrix_C.txt
@@ -1,2 +1,2 @@
-1
-[ 57292320.000000 ]
+1
+[ 57292320.000000 ]
diff --git a/src/data/Matrix_D.txt b/src/data/Matrix_D.txt
@@ -1,2 +1,2 @@
-1
-[ 57292320.000000 ]
+1
+[ 57292320.000000 ]
diff --git a/src/data/Matrix_E.txt b/src/data/Matrix_E.txt
@@ -1,2 +1,2 @@
-1
-[ 57292320.000000 ]
+1
+[ 57292320.000000 ]
diff --git a/src/data/Matrix_F.txt b/src/data/Matrix_F.txt
@@ -1,2 +1,2 @@
-1
-[ 57292320.000000 ]
+1
+[ 57292320.000000 ]
diff --git a/src/data/Matrix_G.txt b/src/data/Matrix_G.txt
@@ -1,2 +1,2 @@
-1
-[ 57292320.000000 ]
+1
+[ 57292320.000000 ]
diff --git a/src/data/benchmark_modulo_Barrett.txt b/src/data/benchmark_modulo_Barrett.txt
@@ -1,12 +1,12 @@
-256 0.406682
-512 3.161513
-1024 28.813085
-256 0.360843 
-512 3.050652 
-1024 27.503507 
-256 0.221791 
-512 1.843640 
-1024 16.366830 
-256 0.216918 
-512 1.796933 
-1024 14.343204 
+256 0.406682
+512 3.161513
+1024 28.813085
+256 0.360843 
+512 3.050652 
+1024 27.503507 
+256 0.221791 
+512 1.843640 
+1024 16.366830 
+256 0.216918 
+512 1.796933 
+1024 14.343204 
diff --git a/src/data/benchmark_modulo_SIMD1.txt b/src/data/benchmark_modulo_SIMD1.txt
@@ -1,3 +1,3 @@
-256 0.209930 
-512 1.676433 
-1024 13.266996 
+256 0.209930 
+512 1.676433 
+1024 13.266996 
diff --git a/src/data/benchmark_modulo_SIMD2.txt b/src/data/benchmark_modulo_SIMD2.txt
@@ -1,3 +1,3 @@
-256 0.194404 
-512 1.580489 
-1024 12.600809 
+256 0.194404 
+512 1.580489 
+1024 12.600809 
diff --git a/src/data/benchmark_modulo_SIMD3.txt b/src/data/benchmark_modulo_SIMD3.txt
@@ -1,3 +1,3 @@
-256 0.209721 
-512 1.620673 
-1024 12.867291 
+256 0.209721 
+512 1.620673 
+1024 12.867291 
diff --git a/src/data/benchmark_modulo_naive.txt b/src/data/benchmark_modulo_naive.txt
@@ -1,3 +1,3 @@
-256 0.160717 
-512 1.262561 
-1024 10.392541 
+256 0.160717 
+512 1.262561 
+1024 10.392541 
diff --git a/src/data/benchmark_order_ijk.txt b/src/data/benchmark_order_ijk.txt
@@ -1,3 +1,3 @@
-256 0.120296 
-512 1.062440 
-1024 10.452757 
+256 0.120296 
+512 1.062440 
+1024 10.452757 
diff --git a/src/data/benchmark_order_ikj.txt b/src/data/benchmark_order_ikj.txt
@@ -1,3 +1,3 @@
-256 0.111407 
-512 0.900301 
-1024 7.632323 
+256 0.111407 
+512 0.900301 
+1024 7.632323 
diff --git a/src/data/benchmark_order_jik.txt b/src/data/benchmark_order_jik.txt
@@ -1,3 +1,3 @@
-256 0.116215 
-512 0.927812 
-1024 10.074881 
+256 0.116215 
+512 0.927812 
+1024 10.074881 
diff --git a/src/data/benchmark_order_jki.txt b/src/data/benchmark_order_jki.txt
@@ -1,3 +1,3 @@
-256 0.129568 
-512 1.156672 
-1024 29.783366 
+256 0.129568 
+512 1.156672 
+1024 29.783366 
diff --git a/src/data/benchmark_order_kij.txt b/src/data/benchmark_order_kij.txt
@@ -1,3 +1,3 @@
-256 0.111931 
-512 0.919294 
-1024 7.818451 
+256 0.111931 
+512 0.919294 
+1024 7.818451 
diff --git a/src/data/benchmark_order_kji.txt b/src/data/benchmark_order_kji.txt
@@ -1,3 +1,3 @@
-256 0.129981 
-512 1.088789 
-1024 29.408653 
+256 0.129981 
+512 1.088789 
+1024 29.408653 
diff --git a/src/main_test.c b/src/main_test.c
@@ -218,6 +218,7 @@ int main(int argc, char** argv){
         int blocksize = get_blocksize(bitsize_p, n);
         printf("blocksize = %d \n", blocksize);
         double** A = random_matrix_2D(n, p);
+
         double** B = random_matrix_2D(n, p);
 
         double* A_1D = convert_2D_to_1D(A, n);
@@ -252,33 +253,40 @@ int main(int argc, char** argv){
         // Testing cblas_dgemm's lda ldb and ldc parameters.
         int n;
 
-        double** A = read_matrix("data/Matrix_A_1D.txt", &n);
-        double** B = read_matrix("data/Matrix_B_1D.txt", &n);
+        double** A = read_matrix("data/Matrix_A_1D_2.txt", &n);
+        double** B = read_matrix("data/Matrix_B_1D_2.txt", &n);
         double* A_1D = convert_2D_to_1D(A, n);
-        double* B_1D = convert_2D_to_1D(A, n);
+        double* B_1D = convert_2D_to_1D(B, n);
         double* C = zero_matrix_1D(n*n);
         double* D = zero_matrix_1D(n*n);
-        double** E = zero_matrix_2D(n);
+        double* E = zero_matrix_1D(n*n);
+
+        printf("A[%d] = %f \n", n*n, A_1D[n*n]);
+        printf("A[%d] = %f \n", n*n+1, A_1D[n*n+1]);
+        A_1D[n*n] = -1;
+        print_matrix_1D(A_1D, n);
+        print_matrix_1D(B_1D, n);
 
-        cblas_dgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans,n,n,n, 1, A_1D, 900, B_1D, 3, 1, C,3);
-        cblas_dgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans,n,n,n, 1, A_1D, 6, B_1D, 3, 1, D,3);
-        mp_ijk(A, B, E, n);
+        cblas_dgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans,n,n,n, 1, A_1D, 1+n, B_1D, n, 1, C,n);
+        cblas_dgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans,n,n,n, 1, A_1D, 2*n, B_1D, n, 1, D,n);
+        cblas_dgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans,n,n,n, 1, A_1D, n, B_1D, n, 1, E,n);
 
+        printf("LDA = %d \n", n+1);
         print_matrix_1D(C, n);
-        printf("\n");
+        printf("LDA = %d \n", 2*n);
         print_matrix_1D(D, n);
-        printf("\n");
-        print_matrix_2D(E, n);
+        printf("LDA = %d \n", n);
+        print_matrix_1D(E, n);
 
 
         delete_matrix_2D(&A, n);
         delete_matrix_2D(&B, n);
-        delete_matrix_2D(&E, n);
 
         delete_matrix_1D(&A_1D, n);
         delete_matrix_1D(&B_1D, n);
         delete_matrix_1D(&C, n);
         delete_matrix_1D(&D, n);
+        delete_matrix_1D(&E, n);
 
     }
 

-Original file line number
+Diff line change
@@ @@ -1,2 +1,2 @@ @@
 -1
 -[ 51180069.000000 ]
 +1
 +[ 51180069.000000 ]