Improve naming due to codemod (#4070)

Summary:
Pull Request resolved: #4070

rename `d_2` to `d` from codemod

Reviewed By: junjieqi

Differential Revision: D66823543

fbshipit-source-id: d1b4c702a31127cba105d4d4f1514f5e33925a50

Author: mengdilin

faiss/utils/NeuralNet.cpp

@@ -212,19 +212,23 @@ nn::Int32Tensor2D QINCoStep::encode(
     // repeated codebook
     Tensor2D zqs_r(n * K, d);  // size n, K, d
     Tensor2D cc(n * K, d * 2); // size n, K, d * 2
-    size_t d_2 = this->d;
 
-    auto copy_row = [d_2](Tensor2D& t, size_t i, size_t j, const float* data) {
-        assert(i <= t.shape[0] && j <= t.shape[1]);
-        memcpy(t.data() + i * t.shape[1] + j, data, sizeof(float) * d_2);
-    };
+    size_t local_d = this->d;
+
+    auto copy_row =
+            [local_d](Tensor2D& t, size_t i, size_t j, const float* data) {
+                assert(i <= t.shape[0] && j <= t.shape[1]);
+                memcpy(t.data() + i * t.shape[1] + j,
+                       data,
+                       sizeof(float) * local_d);
+            };
 
     // manual broadcasting
     for (size_t i = 0; i < n; i++) {
         for (size_t j = 0; j < K; j++) {
-            copy_row(zqs_r, i * K + j, 0, codebook.data() + j * d_2);
-            copy_row(cc, i * K + j, 0, codebook.data() + j * d_2);
-            copy_row(cc, i * K + j, d_2, xhat.data() + i * d_2);
+            copy_row(zqs_r, i * K + j, 0, codebook.data() + j * d);
+            copy_row(cc, i * K + j, 0, codebook.data() + j * d);
+            copy_row(cc, i * K + j, d, xhat.data() + i * d);
         }
     }
 
@@ -237,13 +241,13 @@ nn::Int32Tensor2D QINCoStep::encode(
 
     // add the xhat
     for (size_t i = 0; i < n; i++) {
-        float* zqs_r_row = zqs_r.data() + i * K * d_2;
-        const float* xhat_row = xhat.data() + i * d_2;
+        float* zqs_r_row = zqs_r.data() + i * K * d;
+        const float* xhat_row = xhat.data() + i * d;
         for (size_t l = 0; l < K; l++) {
-            for (size_t j = 0; j < d_2; j++) {
+            for (size_t j = 0; j < d; j++) {
                 zqs_r_row[j] += xhat_row[j];
             }
-            zqs_r_row += d_2;
+            zqs_r_row += d;
         }
     }
 
@@ -252,31 +256,31 @@ nn::Int32Tensor2D QINCoStep::encode(
     float* res = nullptr;
     if (residuals) {
         FAISS_THROW_IF_NOT(
-                residuals->shape[0] == n && residuals->shape[1] == d_2);
+                residuals->shape[0] == n && residuals->shape[1] == d);
         res = residuals->data();
     }
 
     for (size_t i = 0; i < n; i++) {
-        const float* q = x.data() + i * d_2;
-        const float* db = zqs_r.data() + i * K * d_2;
+        const float* q = x.data() + i * d;
+        const float* db = zqs_r.data() + i * K * d;
         float dis_min = HUGE_VALF;
         int64_t idx = -1;
         for (size_t j = 0; j < K; j++) {
-            float dis = fvec_L2sqr(q, db, d_2);
+            float dis = fvec_L2sqr(q, db, d);
             if (dis < dis_min) {
                 dis_min = dis;
                 idx = j;
             }
-            db += d_2;
+            db += d;
         }
         codes.v[i] = idx;
         if (res) {
-            const float* xhat_row = xhat.data() + i * d_2;
-            const float* xhat_next_row = zqs_r.data() + (i * K + idx) * d_2;
-            for (size_t j = 0; j < d_2; j++) {
+            const float* xhat_row = xhat.data() + i * d;
+            const float* xhat_next_row = zqs_r.data() + (i * K + idx) * d;
+            for (size_t j = 0; j < d; j++) {
                 res[j] = xhat_next_row[j] - xhat_row[j];
             }
-            res += d_2;
+            res += d;
         }
     }
     return codes;