Skip to content

Commit 23f2fcc

Browse files
committed
revert: makefile changes
1 parent 68d9540 commit 23f2fcc

1 file changed

Lines changed: 12 additions & 24 deletions

File tree

Makefile

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -172,35 +172,23 @@ reset_last_aggregated_block:
172172
@echo "Resetting last aggregated block..."
173173
@echo '{"last_aggregated_block":0}' > config-files/proof-aggregator.last_aggregated_block.json
174174

175-
build_proof_aggregator_dev:
176-
@cd aggregation_mode && \
177-
cargo build --release --bin proof_aggregator
178-
179-
build_proof_aggregator_cpu:
180-
@cd aggregation_mode && \
181-
cargo build --release --bin proof_aggregator --features prove
182-
183-
build_proof_aggregator_gpu:
184-
@cd aggregation_mode && \
185-
cargo build --release --bin proof_aggregator --features prove,gpu
186-
187-
start_proof_aggregator_dev: is_aggregator_set reset_last_aggregated_block build_proof_aggregator_dev ## Starts proof aggregator with mock proofs (DEV mode)
188-
AGGREGATOR=$(AGGREGATOR) RISC0_DEV_MODE=1 ./aggregation_mode/target/release/proof_aggregator -- config-files/config-proof-aggregator-mock.yaml
175+
start_proof_aggregator_dev: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with mock proofs (DEV mode)
176+
AGGREGATOR=$(AGGREGATOR) RISC0_DEV_MODE=1 cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin proof_aggregator -- config-files/config-proof-aggregator-mock.yaml
189177

190-
start_proof_aggregator_cpu: is_aggregator_set reset_last_aggregated_block build_proof_aggregator_cpu ## Starts proof aggregator with proving activated
191-
AGGREGATOR=$(AGGREGATOR) ./aggregation_mode/target/release/proof_aggregator -- config-files/config-proof-aggregator-mock.yaml
178+
start_proof_aggregator: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with proving activated
179+
AGGREGATOR=$(AGGREGATOR) cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove --bin proof_aggregator -- config-files/config-proof-aggregator.yaml
192180

193-
start_proof_aggregator_gpu: is_aggregator_set reset_last_aggregated_block build_proof_aggregator_gpu ## Starts proof aggregator with proving + GPU acceleration (CUDA)
194-
AGGREGATOR=$(AGGREGATOR) SP1_PROVER=cuda ./aggregation_mode/target/release/proof_aggregator -- config-files/config-proof-aggregator.yaml
181+
start_proof_aggregator_dev_ethereum_package: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with mock proofs (DEV mode) in ethereum package
182+
AGGREGATOR=$(AGGREGATOR) RISC0_DEV_MODE=1 cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin proof_aggregator -- config-files/config-proof-aggregator-mock-ethereum-package.yaml
195183

196-
start_proof_aggregator_dev_ethereum_package: is_aggregator_set reset_last_aggregated_block build_proof_aggregator_dev ## Starts proof aggregator with mock proofs (DEV mode) in ethereum package
197-
AGGREGATOR=$(AGGREGATOR) RISC0_DEV_MODE=1 ./aggregation_mode/target/release/proof_aggregator -- config-files/config-proof-aggregator-mock-ethereum-package.yaml
184+
start_proof_aggregator_ethereum_package: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with proving activated in ethereum package
185+
AGGREGATOR=$(AGGREGATOR) cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove --bin proof_aggregator -- config-files/config-proof-aggregator-ethereum-package.yaml
198186

199-
start_proof_aggregator_cpu_ethereum_package: is_aggregator_set reset_last_aggregated_block build_proof_aggregator_cpu ## Starts proof aggregator with proving activated in ethereum package
200-
AGGREGATOR=$(AGGREGATOR) ./aggregation_mode/target/release/proof_aggregator -- config-files/config-proof-aggregator-ethereum-package.yaml
187+
start_proof_aggregator_gpu: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with proving + GPU acceleration (CUDA)
188+
AGGREGATOR=$(AGGREGATOR) SP1_PROVER=cuda cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove,gpu --bin proof_aggregator -- config-files/config-proof-aggregator.yaml
201189

202-
start_proof_aggregator_gpu_ethereum_package: is_aggregator_set reset_last_aggregated_block build_proof_aggregator_gpu ## Starts proof aggregator with proving activated in ethereum package
203-
AGGREGATOR=$(AGGREGATOR) SP1_PROVER=cuda ./aggregation_mode/target/release/proof_aggregator -- config-files/config-proof-aggregator-ethereum-package.yaml
190+
start_proof_aggregator_gpu_ethereum_package: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with proving activated in ethereum package
191+
AGGREGATOR=$(AGGREGATOR) SP1_PROVER=cuda cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove,gpu --bin proof_aggregator -- config-files/config-proof-aggregator-ethereum-package.yaml
204192

205193
verify_aggregated_proof_sp1_holesky_stage:
206194
@echo "Verifying SP1 in aggregated proofs on holesky..."

0 commit comments

Comments
 (0)