Merge pull request #21 from edin-dal/hotfix/plus-equal-in-computation

bug fixed: make the computation always use += instead of =
edin-dal · Jul 16, 2024 · 690f24a · 690f24a
2 parents 5eba1c9 + 97537ca
commit 690f24a
Show file tree

Hide file tree

Showing 88 changed files with 192 additions and 192 deletions.
diff --git a/src/main/scala/uk/ac/ed/dal/structtensor/codegen/Codegen.scala b/src/main/scala/uk/ac/ed/dal/structtensor/codegen/Codegen.scala
@@ -598,7 +598,7 @@ object Codegen {
             accesses,
             symbols,
             codeLang,
-            if (ind > 0) kind else RedundancyMap
+            kind
           )
         }
       }

diff --git a/src/test/resources/correct_test_outputs/LRA_w_body.cpp b/src/test/resources/correct_test_outputs/LRA_w_body.cpp
@@ -61,21 +61,21 @@ for (int i = 0; i < N; ++i) {
 
 for (int j = max({i, 0}); j < N; ++j) {
 
-A[i][j] = (f[i] * f[j]);
+A[i][j] += (f[i] * f[j]);
 }
 }
 for (int i = 0; i < N; ++i) {
 
 for (int j = max({i, 0}); j < N; ++j) {
 
-B[i][j] = (g[i] * g[j]);
+B[i][j] += (g[i] * g[j]);
 }
 }
 for (int i = 0; i < N; ++i) {
 
 for (int j = max({i, 0}); j < N; ++j) {
 
-C[i][j] = (f[i] * f[j]);
+C[i][j] += (f[i] * f[j]);
 }
 }
 for (int i = 0; i < N; ++i) {

diff --git a/src/test/resources/correct_test_outputs/LRA_wo_body.cpp b/src/test/resources/correct_test_outputs/LRA_wo_body.cpp
@@ -17,21 +17,21 @@ for (int i = 0; i < N; ++i) {
 
 for (int j = max({i, 0}); j < N; ++j) {
 
-A[i][j] = (f[i] * f[j]);
+A[i][j] += (f[i] * f[j]);
 }
 }
 for (int i = 0; i < N; ++i) {
 
 for (int j = max({i, 0}); j < N; ++j) {
 
-B[i][j] = (g[i] * g[j]);
+B[i][j] += (g[i] * g[j]);
 }
 }
 for (int i = 0; i < N; ++i) {
 
 for (int j = max({i, 0}); j < N; ++j) {
 
-C[i][j] = (f[i] * f[j]);
+C[i][j] += (f[i] * f[j]);
 }
 }
 for (int i = 0; i < N; ++i) {

diff --git a/src/test/resources/correct_test_outputs/LRC_w_body.cpp b/src/test/resources/correct_test_outputs/LRC_w_body.cpp
@@ -36,7 +36,7 @@ for (int i = 0; i < N; ++i) {
 
 for (int j = max({i, 0}); j < N; ++j) {
 
-A[i][j] = (f[i] * f[j]);
+A[i][j] += (f[i] * f[j]);
 }
 }
 end_computation = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();

diff --git a/src/test/resources/correct_test_outputs/LRC_wo_body.cpp b/src/test/resources/correct_test_outputs/LRC_wo_body.cpp
@@ -17,7 +17,7 @@ for (int i = 0; i < N; ++i) {
 
 for (int j = max({i, 0}); j < N; ++j) {
 
-A[i][j] = (f[i] * f[j]);
+A[i][j] += (f[i] * f[j]);
 }
 }
 end_computation = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();

diff --git a/src/test/resources/correct_test_outputs/MTTKRP_IJ_w_body.cpp b/src/test/resources/correct_test_outputs/MTTKRP_IJ_w_body.cpp
@@ -79,7 +79,7 @@ for (int k = 0; k < N; ++k) {
 
 for (int l = 0; l < P; ++l) {
 
-A[i][j] = (B[i][k][l] * C[k][j] * D[l][j]);
+A[i][j] += (B[i][k][l] * C[k][j] * D[l][j]);
 }
 }
 }

diff --git a/src/test/resources/correct_test_outputs/MTTKRP_IJ_w_body_DataLayout.cpp b/src/test/resources/correct_test_outputs/MTTKRP_IJ_w_body_DataLayout.cpp
@@ -84,7 +84,7 @@ for (int l = 0; l < P; ++l) {
 
 int j = J;
 if (j >= 0 && j < Q) {
-D2[l] = D[l][j];
+D2[l] += D[l][j];
 }
 }
 for (int k = 0; k < N; ++k) {
@@ -93,7 +93,7 @@ for (int l = 0; l < P; ++l) {
 
 int i = I;
 if (i >= 0 && i < M) {
-B2[k][l] = B[i][k][l];
+B2[k][l] += B[i][k][l];
 }
 }
 }
@@ -106,7 +106,7 @@ for (int k = 0; k < N; ++k) {
 
 for (int l = 0; l < P; ++l) {
 
-A[i][j] = (B2[k][l] * C[k][j] * D2[l]);
+A[i][j] += (B2[k][l] * C[k][j] * D2[l]);
 }
 }
 }

diff --git a/src/test/resources/correct_test_outputs/MTTKRP_IJ_wo_body.cpp b/src/test/resources/correct_test_outputs/MTTKRP_IJ_wo_body.cpp
@@ -21,7 +21,7 @@ for (int k = 0; k < N; ++k) {
 
 for (int l = 0; l < P; ++l) {
 
-A[i][j] = (B[i][k][l] * C[k][j] * D[l][j]);
+A[i][j] += (B[i][k][l] * C[k][j] * D[l][j]);
 }
 }
 }

diff --git a/src/test/resources/correct_test_outputs/MTTKRP_IJ_wo_body_DataLayout.cpp b/src/test/resources/correct_test_outputs/MTTKRP_IJ_wo_body_DataLayout.cpp
@@ -14,7 +14,7 @@ for (int l = 0; l < P; ++l) {
 
 int j = J;
 if (j >= 0 && j < Q) {
-D2[l] = D[l][j];
+D2[l] += D[l][j];
 }
 }
 for (int k = 0; k < N; ++k) {
@@ -23,7 +23,7 @@ for (int l = 0; l < P; ++l) {
 
 int i = I;
 if (i >= 0 && i < M) {
-B2[k][l] = B[i][k][l];
+B2[k][l] += B[i][k][l];
 }
 }
 }
@@ -36,7 +36,7 @@ for (int k = 0; k < N; ++k) {
 
 for (int l = 0; l < P; ++l) {
 
-A[i][j] = (B2[k][l] * C[k][j] * D2[l]);
+A[i][j] += (B2[k][l] * C[k][j] * D2[l]);
 }
 }
 }

diff --git a/src/test/resources/correct_test_outputs/MTTKRP_I_w_body.cpp b/src/test/resources/correct_test_outputs/MTTKRP_I_w_body.cpp
@@ -78,7 +78,7 @@ for (int k = 0; k < N; ++k) {
 
 for (int l = 0; l < P; ++l) {
 
-A[i][j] = (B[i][k][l] * C[k][j] * D[l][j]);
+A[i][j] += (B[i][k][l] * C[k][j] * D[l][j]);
 }
 }
 }

diff --git a/src/test/resources/correct_test_outputs/MTTKRP_I_w_body_DataLayout.cpp b/src/test/resources/correct_test_outputs/MTTKRP_I_w_body_DataLayout.cpp
@@ -81,7 +81,7 @@ for (int l = 0; l < P; ++l) {
 
 int i = I;
 if (i >= 0 && i < M) {
-B2[k][l] = B[i][k][l];
+B2[k][l] += B[i][k][l];
 }
 }
 }
@@ -94,7 +94,7 @@ for (int k = 0; k < N; ++k) {
 
 for (int l = 0; l < P; ++l) {
 
-A[i][j] = (B2[k][l] * C[k][j] * D[l][j]);
+A[i][j] += (B2[k][l] * C[k][j] * D[l][j]);
 }
 }
 }

diff --git a/src/test/resources/correct_test_outputs/MTTKRP_I_wo_body.cpp b/src/test/resources/correct_test_outputs/MTTKRP_I_wo_body.cpp
@@ -21,7 +21,7 @@ for (int k = 0; k < N; ++k) {
 
 for (int l = 0; l < P; ++l) {
 
-A[i][j] = (B[i][k][l] * C[k][j] * D[l][j]);
+A[i][j] += (B[i][k][l] * C[k][j] * D[l][j]);
 }
 }
 }

diff --git a/src/test/resources/correct_test_outputs/MTTKRP_I_wo_body_DataLayout.cpp b/src/test/resources/correct_test_outputs/MTTKRP_I_wo_body_DataLayout.cpp
@@ -16,7 +16,7 @@ for (int l = 0; l < P; ++l) {
 
 int i = I;
 if (i >= 0 && i < M) {
-B2[k][l] = B[i][k][l];
+B2[k][l] += B[i][k][l];
 }
 }
 }
@@ -29,7 +29,7 @@ for (int k = 0; k < N; ++k) {
 
 for (int l = 0; l < P; ++l) {
 
-A[i][j] = (B2[k][l] * C[k][j] * D[l][j]);
+A[i][j] += (B2[k][l] * C[k][j] * D[l][j]);
 }
 }
 }

diff --git a/src/test/resources/correct_test_outputs/MTTKRP_J_w_body.cpp b/src/test/resources/correct_test_outputs/MTTKRP_J_w_body.cpp
@@ -78,7 +78,7 @@ for (int k = 0; k < N; ++k) {
 
 for (int l = 0; l < P; ++l) {
 
-A[i][j] = (B[i][k][l] * C[k][j] * D[l][j]);
+A[i][j] += (B[i][k][l] * C[k][j] * D[l][j]);
 }
 }
 }

diff --git a/src/test/resources/correct_test_outputs/MTTKRP_J_w_body_DataLayout.cpp b/src/test/resources/correct_test_outputs/MTTKRP_J_w_body_DataLayout.cpp
@@ -75,7 +75,7 @@ for (int l = 0; l < P; ++l) {
 
 int j = J;
 if (j >= 0 && j < Q) {
-D2[l] = D[l][j];
+D2[l] += D[l][j];
 }
 }
 long time_computation = 0, start_computation, end_computation;
@@ -88,7 +88,7 @@ for (int k = 0; k < N; ++k) {
 
 for (int l = 0; l < P; ++l) {
 
-A[i][j] = (B[i][k][l] * C[k][j] * D2[l]);
+A[i][j] += (B[i][k][l] * C[k][j] * D2[l]);
 }
 }
 }

diff --git a/src/test/resources/correct_test_outputs/MTTKRP_J_wo_body.cpp b/src/test/resources/correct_test_outputs/MTTKRP_J_wo_body.cpp
@@ -21,7 +21,7 @@ for (int k = 0; k < N; ++k) {
 
 for (int l = 0; l < P; ++l) {
 
-A[i][j] = (B[i][k][l] * C[k][j] * D[l][j]);
+A[i][j] += (B[i][k][l] * C[k][j] * D[l][j]);
 }
 }
 }

diff --git a/src/test/resources/correct_test_outputs/MTTKRP_J_wo_body_DataLayout.cpp b/src/test/resources/correct_test_outputs/MTTKRP_J_wo_body_DataLayout.cpp
@@ -14,7 +14,7 @@ for (int l = 0; l < P; ++l) {
 
 int j = J;
 if (j >= 0 && j < Q) {
-D2[l] = D[l][j];
+D2[l] += D[l][j];
 }
 }
 long time_computation = 0, start_computation, end_computation;
@@ -27,7 +27,7 @@ for (int k = 0; k < N; ++k) {
 
 for (int l = 0; l < P; ++l) {
 
-A[i][j] = (B[i][k][l] * C[k][j] * D2[l]);
+A[i][j] += (B[i][k][l] * C[k][j] * D2[l]);
 }
 }
 }

diff --git a/src/test/resources/correct_test_outputs/PGLM_w_body.cpp b/src/test/resources/correct_test_outputs/PGLM_w_body.cpp
@@ -45,7 +45,7 @@ int i = 0;
 if (i >= 0 && i < W) {
 for (int j = 0; j < W; ++j) {
 
-A[i] = (B[i][j] * C[j]);
+A[i] += (B[i][j] * C[j]);
 }
 }
 for (int i = max({0, 1}); i < W; ++i) {

diff --git a/src/test/resources/correct_test_outputs/PGLM_w_body_DataLayout.cpp b/src/test/resources/correct_test_outputs/PGLM_w_body_DataLayout.cpp
@@ -50,22 +50,22 @@ for (int j = 0; j < W; ++j) {
 
 int i = 0;
 if (i >= 0 && i < W) {
-B1[j] = B[i][j];
+B1[j] += B[i][j];
 }
 }
 for (int i = max({1, 0}); i < W; ++i) {
 
 int j = (i - 1);
 if (j >= 0 && j < W) {
-B2[j] = B[i][j];
+B2[j] += B[i][j];
 }
 }
 long time_computation = 0, start_computation, end_computation;
 start_computation = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();
 int i = 0;
 for (int i30 = 0; i30 < W; ++i30) {
 
-A[i] = (B1[i30] * C[i30]);
+A[i] += (B1[i30] * C[i30]);
 }
 for (int i = 1; i < W; ++i) {
 

diff --git a/src/test/resources/correct_test_outputs/PGLM_wo_body.cpp b/src/test/resources/correct_test_outputs/PGLM_wo_body.cpp
@@ -17,7 +17,7 @@ int i = 0;
 if (i >= 0 && i < W) {
 for (int j = 0; j < W; ++j) {
 
-A[i] = (B[i][j] * C[j]);
+A[i] += (B[i][j] * C[j]);
 }
 }
 for (int i = max({0, 1}); i < W; ++i) {

diff --git a/src/test/resources/correct_test_outputs/PGLM_wo_body_DataLayout.cpp b/src/test/resources/correct_test_outputs/PGLM_wo_body_DataLayout.cpp
@@ -14,22 +14,22 @@ for (int j = 0; j < W; ++j) {
 
 int i = 0;
 if (i >= 0 && i < W) {
-B1[j] = B[i][j];
+B1[j] += B[i][j];
 }
 }
 for (int i = max({1, 0}); i < W; ++i) {
 
 int j = (i - 1);
 if (j >= 0 && j < W) {
-B2[j] = B[i][j];
+B2[j] += B[i][j];
 }
 }
 long time_computation = 0, start_computation, end_computation;
 start_computation = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();
 int i = 0;
 for (int i28 = 0; i28 < W; ++i28) {
 
-A[i] = (B1[i28] * C[i28]);
+A[i] += (B1[i28] * C[i28]);
 }
 for (int i = 1; i < W; ++i) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,7 +79,7 @@ for (int k = 0; k < N; ++k) { @@
     for (int l = 0; l < P; ++l) {
-    A[i][j] = (B[i][k][l] * C[k][j] * D[l][j]);
+    A[i][j] += (B[i][k][l] * C[k][j] * D[l][j]);
     }
     }
     }
@@ Expand Down @@