Skip to content

chore: Add Ninja generator for wasm & document Ninja requirement for presets #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevaundray merged 5 commits into from
Mar 7, 2023
Merged

chore: Add Ninja generator for wasm & document Ninja requirement for presets #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25b13e2
chore: Add Ninja generator for wasm & document Ninja requirement for …
phated Mar 2, 2023
76c6dd0
Merge branch 'master' into phated/wasm-ninja
kevaundray Mar 7, 2023
f4664a6
chore: Add ninja to wasm docker builder
phated Mar 7, 2023
d45adf5
Ubuntu calls it ninja-build
phated Mar 7, 2023
a6a0385
fix typo to trigger CI
kevaundray Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`)
Expand Down
1 change: 1 addition & 0 deletions cpp/CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion cpp/dockerfiles/Dockerfile.wasm-linux-clang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Comment thread
kevaundray marked this conversation as resolved.
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 -
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/aztec/plonk/proof_system/prover/prover.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ extern template class ProverBase<ultra_to_standard_settings>;
typedef ProverBase<standard_settings> Prover;
typedef ProverBase<turbo_settings> TurboProver;
typedef ProverBase<ultra_settings> 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<ultra_to_standard_settings> UltraToStandardProver;

Expand Down