From 25b13e2de85206f054ab6f3e93bed8221d465d19 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Thu, 2 Mar 2023 14:00:47 -0700 Subject: [PATCH 1/4] chore: Add Ninja generator for wasm & document Ninja requirement for presets --- README.md | 1 + cpp/CMakePresets.json | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 382a0bc0a4..0e510f7f7d 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ ### Dependencies - cmake >= 3.24 +- Ninja (used by the presets as the default generator) - clang >= 10 or gcc >= 10 - clang-format - libomp (if multithreading is required. Multithreading can be disabled using the compiler flag `-DMULTITHREADING 0`) diff --git a/cpp/CMakePresets.json b/cpp/CMakePresets.json index 0f249a00d7..3b036a8883 100644 --- a/cpp/CMakePresets.json +++ b/cpp/CMakePresets.json @@ -93,6 +93,7 @@ "displayName": "Build for WASM", "description": "Build with a specific wasm-sdk to create wasm", "binaryDir": "build-wasm", + "generator": "Ninja", "toolchainFile": "cmake/toolchains/wasm32-wasi.cmake", "environment": { "WASI_SDK_PREFIX": "${sourceDir}/src/wasi-sdk-12.0", From f4664a6268f0d2c43c85085f78554c884a88ab2c Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Tue, 7 Mar 2023 13:47:51 -0600 Subject: [PATCH 2/4] chore: Add ninja to wasm docker builder --- cpp/dockerfiles/Dockerfile.wasm-linux-clang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/dockerfiles/Dockerfile.wasm-linux-clang b/cpp/dockerfiles/Dockerfile.wasm-linux-clang index 3282702b98..9954931604 100644 --- a/cpp/dockerfiles/Dockerfile.wasm-linux-clang +++ b/cpp/dockerfiles/Dockerfile.wasm-linux-clang @@ -1,5 +1,5 @@ FROM ubuntu:kinetic AS builder -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential wget git libssl-dev cmake curl binaryen +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential wget git libssl-dev cmake ninja curl binaryen RUN curl https://wasmtime.dev/install.sh -sSf | bash /dev/stdin --version v3.0.1 WORKDIR /usr/src/barretenberg/cpp/src RUN curl -s -L https://github.com/CraneStation/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz | tar zxfv - From d45adf592187fd677fa41fc816f0ee5ccc5ea172 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Tue, 7 Mar 2023 14:07:02 -0600 Subject: [PATCH 3/4] Ubuntu calls it ninja-build --- cpp/dockerfiles/Dockerfile.wasm-linux-clang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/dockerfiles/Dockerfile.wasm-linux-clang b/cpp/dockerfiles/Dockerfile.wasm-linux-clang index 9954931604..f4a19bba53 100644 --- a/cpp/dockerfiles/Dockerfile.wasm-linux-clang +++ b/cpp/dockerfiles/Dockerfile.wasm-linux-clang @@ -1,5 +1,5 @@ FROM ubuntu:kinetic AS builder -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential wget git libssl-dev cmake ninja curl binaryen +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential wget git libssl-dev cmake ninja-build curl binaryen RUN curl https://wasmtime.dev/install.sh -sSf | bash /dev/stdin --version v3.0.1 WORKDIR /usr/src/barretenberg/cpp/src RUN curl -s -L https://github.com/CraneStation/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz | tar zxfv - From a6a0385b885b90e95e4ec1ab1f42cfffd07f0657 Mon Sep 17 00:00:00 2001 From: Kevaundray Wedderburn Date: Tue, 7 Mar 2023 20:47:05 +0000 Subject: [PATCH 4/4] fix typo to trigger CI --- cpp/src/aztec/plonk/proof_system/prover/prover.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/src/aztec/plonk/proof_system/prover/prover.hpp b/cpp/src/aztec/plonk/proof_system/prover/prover.hpp index 61e6b4356b..50d303c81a 100644 --- a/cpp/src/aztec/plonk/proof_system/prover/prover.hpp +++ b/cpp/src/aztec/plonk/proof_system/prover/prover.hpp @@ -106,7 +106,7 @@ extern template class ProverBase; typedef ProverBase Prover; typedef ProverBase TurboProver; typedef ProverBase UltraProver; // TODO(Mike): maybe just return a templated proverbase so that I don't - // need separate casees for ultra vs ultra_to_standard...??? + // need separate cases for ultra vs ultra_to_standard...??? // TODO(Cody): Make this into an issue? typedef ProverBase UltraToStandardProver;