Skip to content
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

add assigner app #15

Merged
merged 4 commits into from
Sep 17, 2024
Merged

add assigner app #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
daa9d2f
add assigner app
AndreyMlashkin Sep 16, 2024
5ff1126
clean cmake_policies
AndreyMlashkin Sep 13, 2024
69e7a3f
update flake
AndreyMlashkin Sep 16, 2024
27de01e
don't use default app
AndreyMlashkin Sep 17, 2024
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
2 changes: 1 addition & 1 deletion crypto3/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 3.21)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")

find_package(CM)
find_package(CM REQUIRED)
include(CMConfig)
include(CMSetupVersion)
cm_workspace(crypto3)
Expand Down
3 changes: 0 additions & 3 deletions crypto3/cmake/modules/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@

cmake_policy(SET CMP0057 NEW)

set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/tmp)

set(SKIP_TESTS)
Expand Down
2 changes: 1 addition & 1 deletion evm-assigner/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright 2019 The evmone Authors.
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.16...3.27)
cmake_minimum_required(VERSION 3.22 FATAL_ERROR)

option(BUILD_SHARED_LIBS "Build evmone as a shared library" ON)
option(EVMONE_TESTING "Build tests and test tools" OFF)
Expand Down
5 changes: 1 addition & 4 deletions evm-assigner/lib/assigner/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
cmake_minimum_required(VERSION 2.8.12)

cmake_policy(SET CMP0028 NEW)
cmake_policy(SET CMP0063 NEW)
cmake_minimum_required(VERSION 3.22 FATAL_ERROR)

option(BUILD_ASSIGNER_TESTS "Build unit tests" FALSE)

Expand Down
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
crypto3 = crypto3;
});

evm-assigner = (pkgs.callPackage ./evm-assigner/evm-assigner.nix {
evm-assigner = (pkgs.callPackage ./evm-assigner/evm-assigner.nix {
runTests = false;
enableDebug = false;
crypto3 = crypto3;
Expand Down Expand Up @@ -216,13 +216,17 @@
default = all-gcc;
};
apps = {
assigner = {
type = "app";
program = "${self.packages.${system}.zkevm-framework}/bin/assigner";
};
single-threaded = {
type = "app";
program = "${self.packages.${system}.proof-producer}/bin/proof-producer-single-threaded";
};
default = {
multi-threaded = {
type = "app";
program = "${self.packages.${system}.default}/bin/proof-producer-multi-threaded";
program = "${self.packages.${system}.proof-producer}/bin/proof-producer-multi-threaded";
};
};
}));
Expand Down
4 changes: 0 additions & 4 deletions proof-producer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
set(ZK_PLACEHOLDER_DEBUG_ENABLED TRUE)
endif()

cmake_policy(SET CMP0042 NEW)
cmake_policy(SET CMP0028 NEW)
cmake_policy(SET CMP0057 NEW)

find_package(CM REQUIRED)
include(CMConfig)
include(CMDeploy)
Expand Down
2 changes: 1 addition & 1 deletion proof-producer/tests/make_proof_for_pairs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ make_proof_for_pair() {
if [ "$use_nix" = true ]; then
proof_generator_binary="nix run ${script_dir}/..?submodules=1#single-threaded --"
if [ "$use_multithreaded" = true ]; then
proof_generator_binary="nix run ${script_dir}/..?submodules=1# --"
proof_generator_binary="nix run ${script_dir}/..?submodules=1#multi-threaded --"
fi
else
proof_generator_binary="${script_dir}/../build/bin/proof-generator/proof-generator-single-threaded"
Expand Down
10 changes: 2 additions & 8 deletions transpiler/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,9 @@
# http://www.boost.org/LICENSE_1_0.txt
#---------------------------------------------------------------------------#

cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.22 FATAL_ERROR)

cmake_policy(SET CMP0028 NEW)
cmake_policy(SET CMP0042 NEW)
cmake_policy(SET CMP0048 NEW)
cmake_policy(SET CMP0057 NEW)
cmake_policy(SET CMP0076 NEW)

find_package(CM)
find_package(CM REQUIRED)
include(CMConfig)
include(CMSetupVersion)

Expand Down
Loading