Minor fixes gpu setup

0xPolygonHermez · Jul 4, 2024 · b8accd8 · b8accd8
1 parent ffceb07
commit b8accd8
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 14 deletions.
diff --git a/src/pil_info/imPolsCalculation/imPolynomials.js b/src/pil_info/imPolsCalculation/imPolynomials.js
@@ -24,16 +24,27 @@ module.exports.addIntermediatePolynomials = function addIntermediatePolynomials(
     res.nImPols = res.imExpsList.length;
     res.nConstraints += res.nImPols;
 
+    let nImPolsDim1 = 0;
+    let nImPolsDim3 = 0;
     console.log("Checking that intermediate polynomials have degree less than qDeg + 1");
     for (let i=0; i<imExps.length; i++) {
         const expId = imExps[i];
 
+        if(expressions[expId].dim === 3) {
+            nImPolsDim3 += 1;
+        } else {
+            nImPolsDim1 += 1;
+        }
         const imPolDeg = module.exports.calculateExpDeg(expressions, expressions[expId], imExps);
         if(imPolDeg > qDeg + 1) {
             throw new Error(`Intermediate polynomial with id: ${expId} has a higher degree (${imPolDeg}) than the maximum allowed degree (${qDeg + 1})`);
         }
     }
 
+    console.log(`nImPols in the basefield: ${nImPolsDim1}`)
+    console.log(`nImPols in the extended field: ${nImPolsDim3}`)
+    console.log(`Total imPols columns in the base field: ${nImPolsDim1 + 3*nImPolsDim3}`);
+
     console.log("Adding intermediate polynomials to the expressions and constraints.");
     for (let i=0; i<imExps.length; i++) {
         res.imExp2cm[res.imExpsList[i]] = res.nCommitments++;

diff --git a/src/pil_info/libs/grandProductConnection.js b/src/pil_info/libs/grandProductConnection.js
@@ -83,13 +83,13 @@ module.exports.grandProductConnection = function grandProductConnection(res, pil
         const c1 = E.mul(l1,  E.sub(z, E.number(1)));
         c1.deg=2;
         ciCtx.c1Id = pil.expressions.length;
-        c1.stage = 3;
+        c1.stage = 4;
         pil.expressions.push(c1);
         pil.polIdentities.push({e: ciCtx.c1Id});
 
         const c2 = E.sub(  E.mul(zp,  E.exp( ciCtx.denId )), E.mul(z, E.exp( ciCtx.numId )));
         c2.deg=2;
-        c2.stage = 3;
+        c2.stage = 4;
         ciCtx.c2Id = pil.expressions.length;
         pil.expressions.push(c2);
         pil.polIdentities.push({e: ciCtx.c2Id});

diff --git a/src/pil_info/libs/grandProductPermutation.js b/src/pil_info/libs/grandProductPermutation.js
@@ -86,7 +86,7 @@ module.exports.grandProductPermutation = function grandProductPermutation(res,pi
 
         const c2 = E.sub(  E.mul(zp,  E.exp( peCtx.denId )), E.mul(z, E.exp( peCtx.numId )));
         c2.deg=2;
-        c2.stage = 3;
+        c2.stage = 4;
         peCtx.c2Id = pil.expressions.length;
         pil.expressions.push(c2);
         pil.polIdentities.push({e: peCtx.c2Id});

diff --git a/src/pil_info/libs/grandProductPlookup.js b/src/pil_info/libs/grandProductPlookup.js
@@ -86,7 +86,7 @@ module.exports.grandProductPlookup = function grandProductPlookup(res, pil) {
 
         const c1 = E.mul(l1,  E.sub(z, E.number(1)));
         c1.deg=2;
-        c1.stage = 3;
+        c1.stage = 4;
         puCtx.c1Id = pil.expressions.length;
         pil.expressions.push(c1);
         pil.polIdentities.push({e: puCtx.c1Id});
@@ -144,7 +144,7 @@ module.exports.grandProductPlookup = function grandProductPlookup(res, pil) {
 
         const c2 = E.sub(  E.mul(zp, den), E.mul(z, num)  );
         c2.deg=2;
-        c2.stage = 3;
+        c2.stage = 4;
         puCtx.c2Id = pil.expressions.length;
         pil.expressions.push(c2);
         pil.polIdentities.push({e: puCtx.c2Id});

diff --git a/src/pil_info/map.js b/src/pil_info/map.js
@@ -335,18 +335,22 @@ module.exports = function map(res, expressions) {
 function mapSections(res) {
     Object.keys(res.mapSections).forEach((s) => {
         let p = 0;
-        for (let e of [1,3]) {
-            for (let i=0; i<res.varPolMap.length; i++) {
-                const pp = res.varPolMap[i];
-                if ((pp.section == s) && (pp.dim==e)) {
-                    pp.sectionPos = p;
-                    p += e;
+        res.mapSectionsN1[s] = 0;
+        res.mapSectionsN3[s] = 0
+        for (let i=0; i<res.varPolMap.length; i++) {
+            const pp = res.varPolMap[i];
+            if(pp.section === s) {
+                pp.sectionPos = p;
+                if(pp.dim == 1) {
+                    res.mapSectionsN1[s] += 1;
+                    p += 1;
+                } else {
+                    res.mapSectionsN3[s] += 3;
+                    p += 3;
                 }
             }
-            if (e==1) res.mapSectionsN1[s] = p;
-            if (e==3) res.mapSectionsN[s] = p;
         }
-        res.mapSectionsN3[s] = (res.mapSectionsN[s] - res.mapSectionsN1[s] ) / 3;
+        res.mapSectionsN[s] = p;
     });
 }