Convert from submodules to subtrees

.gitmodules

@@ -1,9 +0,0 @@
-[submodule "circ_blocks"]
-	path = circ_blocks
-	url = git@github.com:Jiangkm3/circ_blocks.git
-[submodule "spartan_parallel"]
-	path = spartan_parallel
-	url = git@github.com:Jiangkm3/spartan_parallel.git
-[submodule "ff"]
-	path = ff
-	url = git@github.com:Jiangkm3/ff.git

README.md

@@ -10,7 +10,7 @@ A modified Spartan proof system that supports data-parallelism and additional pr
 
 ## Running the recursive verifier for ceno
 * Requires `rustc 1.74.0-nightly`
-* First set up git submodules and all compilers: `bash setup.sh`
+* First set up all compilers: `bash setup.sh`
 * Then run the ceno verifier: `bash encode_ceno.sh`
 * Note that `spartan_parallel` currently does not support Goldilocks fields and cannot verify the circuit generated by `circ_blocks`
 * Finally run `bash verify_ceno.sh`, which emits size & number of execution for each block before throwing out a verifier error due to wrong field size.

circ_blocks/.github/workflows/ci.yml

@@ -0,0 +1,36 @@
+name: Build & Test
+
+on:
+    push:
+        branches: [master, ci]
+    pull_request:
+        branches: [master, ci]
+
+env:
+    CARGO_TERM_COLOR: always
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v3
+            - name: Install dependencies
+              if: runner.os == 'Linux'
+              run: sudo apt-get update; sudo apt-get install zsh cvc4 libboost-all-dev libssl-dev coinor-cbc coinor-libcbc-dev
+            - uses: actions-rs/toolchain@v1
+              with:
+                  toolchain: stable
+            - uses: Swatinem/rust-cache@v2
+            - name: Set all features on
+              run: python3 driver.py --all_features
+            - name: Install python reqs
+              run: python3 driver.py --install
+            - name: Check
+              run: python3 driver.py --check
+            - name: Format
+              run: cargo fmt -- --check
+            - name: Lint
+              run: python3 driver.py --lint
+            - name: Build, then Test
+              run: python3 driver.py --test

circ_blocks/.gitignore

@@ -0,0 +1,19 @@
+.DS_Store
+/target
+/pf
+/assignment.txt
+/params
+__pycache__
+/P
+/V
+/pi
+/x
+/perf.data*
+/heaptrack.*
+/flamegraph.*
+/.gdb_history
+.features.txt
+.mode.txt
+scripts/aby_tests/tests
+/flamegraph*.svg
+.vscode/

circ_blocks/COPYING

@@ -0,0 +1 @@
+CirC is dual-licensed under Apache 2.0 and MIT terms.