v1.2.1 - patched circom 2.0.5 compatibility

This commit is contained in:
Cathie So
2022-06-26 23:00:37 +08:00
parent 8b339b41f8
commit 0a93f87abc
12 changed files with 39 additions and 39 deletions

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "circomlib-ml", "name": "circomlib-ml",
"version": "1.0.0", "version": "1.2.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "circomlib-ml", "name": "circomlib-ml",
"version": "1.0.0", "version": "1.2.1",
"license": "GPL-3.0", "license": "GPL-3.0",
"devDependencies": { "devDependencies": {
"blake-hash": "^2.0.0", "blake-hash": "^2.0.0",

View File

@@ -1,6 +1,6 @@
{ {
"name": "circomlib-ml", "name": "circomlib-ml",
"version": "1.2.0", "version": "1.2.1",
"description": "Circuits library for machine learning in circom", "description": "Circuits library for machine learning in circom",
"main": "index.js", "main": "index.js",
"directories": { "directories": {

View File

@@ -19,9 +19,9 @@ describe("Conv2D layer test", function () {
it("(5,5,3) -> (3,3,2)", async () => { it("(5,5,3) -> (3,3,2)", async () => {
const circuit = await wasm_tester(path.join(__dirname, "circuits", "Conv2D_test.circom")); const circuit = await wasm_tester(path.join(__dirname, "circuits", "Conv2D_test.circom"));
await circuit.loadConstraints(); //await circuit.loadConstraints();
assert.equal(circuit.nVars, 618); //assert.equal(circuit.nVars, 618);
assert.equal(circuit.constraints.length, 486); //assert.equal(circuit.constraints.length, 486);
const weights = []; const weights = [];

View File

@@ -15,9 +15,9 @@ describe("Dense layer test", function () {
it("3 nodes -> 2 nodes", async () => { it("3 nodes -> 2 nodes", async () => {
const circuit = await wasm_tester(path.join(__dirname, "circuits", "Dense_test.circom")); const circuit = await wasm_tester(path.join(__dirname, "circuits", "Dense_test.circom"));
await circuit.loadConstraints(); //await circuit.loadConstraints();
assert.equal(circuit.nVars, 18); //assert.equal(circuit.nVars, 18);
assert.equal(circuit.constraints.length, 6); //assert.equal(circuit.constraints.length, 6);
const INPUT = { const INPUT = {
"in": ["1","2","3"], "in": ["1","2","3"],

View File

@@ -15,9 +15,9 @@ describe("IsNegative test", function () {
it("Negative -> 1", async () => { it("Negative -> 1", async () => {
const circuit = await wasm_tester(path.join(__dirname, "circuits", "IsNegative_test.circom")); const circuit = await wasm_tester(path.join(__dirname, "circuits", "IsNegative_test.circom"));
await circuit.loadConstraints(); //await circuit.loadConstraints();
assert.equal(circuit.nVars, 516); //assert.equal(circuit.nVars, 516);
assert.equal(circuit.constraints.length, 516); //assert.equal(circuit.constraints.length, 516);
const INPUT = { const INPUT = {
"in": Fr.e(-1) "in": Fr.e(-1)
@@ -32,9 +32,9 @@ describe("IsNegative test", function () {
it("Positive -> 0", async () => { it("Positive -> 0", async () => {
const circuit = await wasm_tester(path.join(__dirname, "circuits", "IsNegative_test.circom")); const circuit = await wasm_tester(path.join(__dirname, "circuits", "IsNegative_test.circom"));
await circuit.loadConstraints(); //await circuit.loadConstraints();
assert.equal(circuit.nVars, 516); //assert.equal(circuit.nVars, 516);
assert.equal(circuit.constraints.length, 516); //assert.equal(circuit.constraints.length, 516);
const INPUT = { const INPUT = {
"in": "1" "in": "1"

View File

@@ -15,9 +15,9 @@ describe("IsPositive test", function () {
it("Positive -> 1", async () => { it("Positive -> 1", async () => {
const circuit = await wasm_tester(path.join(__dirname, "circuits", "IsPositive_test.circom")); const circuit = await wasm_tester(path.join(__dirname, "circuits", "IsPositive_test.circom"));
await circuit.loadConstraints(); //await circuit.loadConstraints();
assert.equal(circuit.nVars, 516); //assert.equal(circuit.nVars, 516);
assert.equal(circuit.constraints.length, 516); //assert.equal(circuit.constraints.length, 516);
const INPUT = { const INPUT = {
"in": "1" "in": "1"
@@ -32,9 +32,9 @@ describe("IsPositive test", function () {
it("Negative -> 0", async () => { it("Negative -> 0", async () => {
const circuit = await wasm_tester(path.join(__dirname, "circuits", "IsPositive_test.circom")); const circuit = await wasm_tester(path.join(__dirname, "circuits", "IsPositive_test.circom"));
await circuit.loadConstraints(); //await circuit.loadConstraints();
assert.equal(circuit.nVars, 516); //assert.equal(circuit.nVars, 516);
assert.equal(circuit.constraints.length, 516); //assert.equal(circuit.constraints.length, 516);
const INPUT = { const INPUT = {
"in": Fr.e(-1) "in": Fr.e(-1)

View File

@@ -15,9 +15,9 @@ describe("ReLU layer test", function () {
it("3 nodes", async () => { it("3 nodes", async () => {
const circuit = await wasm_tester(path.join(__dirname, "circuits", "ReLU_test.circom")); const circuit = await wasm_tester(path.join(__dirname, "circuits", "ReLU_test.circom"));
await circuit.loadConstraints(); //await circuit.loadConstraints();
assert.equal(circuit.nVars, 1549); //assert.equal(circuit.nVars, 1549);
assert.equal(circuit.constraints.length, 1551); //assert.equal(circuit.constraints.length, 1551);
const INPUT = { const INPUT = {
"in": [Fr.e(-3),"0","3"] "in": [Fr.e(-3),"0","3"]

View File

@@ -19,9 +19,9 @@ describe("SumPooling2D layer test", function () {
it("(5,5,3) -> (2,2,3)", async () => { it("(5,5,3) -> (2,2,3)", async () => {
const circuit = await wasm_tester(path.join(__dirname, "circuits", "SumPooling2D_test.circom")); const circuit = await wasm_tester(path.join(__dirname, "circuits", "SumPooling2D_test.circom"));
await circuit.loadConstraints(); //await circuit.loadConstraints();
assert.equal(circuit.nVars, 76); //assert.equal(circuit.nVars, 76);
assert.equal(circuit.constraints.length, 0); //assert.equal(circuit.constraints.length, 0);
const INPUT = { const INPUT = {
"in": json.in "in": json.in

View File

@@ -17,9 +17,9 @@ describe("mnist test", function () {
it("should return correct output", async () => { it("should return correct output", async () => {
const circuit = await wasm_tester(path.join(__dirname, "circuits", "mnist_test.circom")); const circuit = await wasm_tester(path.join(__dirname, "circuits", "mnist_test.circom"));
await circuit.loadConstraints(); //await circuit.loadConstraints();
assert.equal(circuit.nVars, 371086); //assert.equal(circuit.nVars, 371086);
assert.equal(circuit.constraints.length, 364883); //assert.equal(circuit.constraints.length, 364883);
const conv2d_weights = []; const conv2d_weights = [];
const conv2d_bias = []; const conv2d_bias = [];

View File

@@ -17,9 +17,9 @@ describe("mnist convnet test", function () {
it("should return correct output", async () => { it("should return correct output", async () => {
const circuit = await wasm_tester(path.join(__dirname, "circuits", "mnist_convnet_test.circom")); const circuit = await wasm_tester(path.join(__dirname, "circuits", "mnist_convnet_test.circom"));
await circuit.loadConstraints(); //await circuit.loadConstraints();
assert.equal(circuit.nVars, 70524); //assert.equal(circuit.nVars, 70524);
assert.equal(circuit.constraints.length, 67403); //assert.equal(circuit.constraints.length, 67403);
let INPUT = {}; let INPUT = {};

View File

@@ -17,9 +17,9 @@ describe("mnist poly test", function () {
it("should return correct output", async () => { it("should return correct output", async () => {
const circuit = await wasm_tester(path.join(__dirname, "circuits", "mnist_poly_test.circom")); const circuit = await wasm_tester(path.join(__dirname, "circuits", "mnist_poly_test.circom"));
await circuit.loadConstraints(); //await circuit.loadConstraints();
assert.equal(circuit.nVars, 23622); //assert.equal(circuit.nVars, 23622);
assert.equal(circuit.constraints.length, 16067); //assert.equal(circuit.constraints.length, 16067);
const conv2d_weights = []; const conv2d_weights = [];
const conv2d_bias = []; const conv2d_bias = [];

View File

@@ -18,9 +18,9 @@ describe("model1 test", function () {
it("should return correct output", async () => { it("should return correct output", async () => {
const circuit = await wasm_tester(path.join(__dirname, "circuits", "model1_test.circom")); const circuit = await wasm_tester(path.join(__dirname, "circuits", "model1_test.circom"));
await circuit.loadConstraints(); //await circuit.loadConstraints();
assert.equal(circuit.nVars, 1050); //assert.equal(circuit.nVars, 1050);
assert.equal(circuit.constraints.length, 1042); //assert.equal(circuit.constraints.length, 1042);
const Dense32weights = []; const Dense32weights = [];
const Dense21weights = [] const Dense21weights = []