compile mem reduce and new cryptoTools

osu-crypto · Apr 25, 2023 · 3caddad · 3caddad
1 parent 7878333
commit 3caddad
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 87 deletions.
diff --git a/cmake/buildOptions.cmake b/cmake/buildOptions.cmake
@@ -114,10 +114,7 @@ EVAL(FETCH_BITPOLYMUL_IMPL
 	((NOT DEFINED FETCH_BITPOLYMUL) AND (FETCH_AUTO AND ENABLE_BITPOLYMUL)))
 
 
-#option(FETCH_BITPOLYMUL		"download and build bitpolymul" OFF))
-EVAL(FETCH_LIBDIVIDE_IMPL 
-	(DEFINED FETCH_LIBDIVIDE AND FETCH_LIBDIVIDE) OR
-	((NOT DEFINED FETCH_LIBDIVIDE) AND (FETCH_AUTO)))
+
 
 
 option(VERBOSE_FETCH        "Print build info for fetched libraries" ON)
@@ -126,8 +123,7 @@ option(VERBOSE_FETCH        "Print build info for fetched libraries" ON)
 message(STATUS "General Options\n=======================================================")
 
 message(STATUS "Option: VERBOSE_FETCH         = ${VERBOSE_FETCH}")
-message(STATUS "Option: FETCH_BITPOLYMUL      = ${FETCH_BITPOLYMUL_IMPL}")
-message(STATUS "Option: FETCH_LIBDIVIDE       = ${FETCH_LIBDIVIDE_IMPL}\n")
+message(STATUS "Option: FETCH_BITPOLYMUL      = ${FETCH_BITPOLYMUL_IMPL}\n")
 
 message(STATUS "Option: ENABLE_ALL_OT         = ON/OFF")
 message(STATUS "Option: ENABLE_BITPOLYMUL     = ${ENABLE_BITPOLYMUL}")

diff --git a/cmake/libOTeDepHelper.cmake b/cmake/libOTeDepHelper.cmake
@@ -58,46 +58,6 @@ endif()
 
 
 
-#######################################
-# libDivide
-
-macro(FIND_LIBDIVIDE)
-    set(ARGS ${ARGN})
-
-    #explicitly asked to fetch libdivide
-    if(FETCH_LIBDIVIDE)
-        list(APPEND ARGS NO_DEFAULT_PATH PATHS ${VOLEPSI_THIRDPARTY_DIR})
-    endif()
-
-    find_path(LIBDIVIDE_INCLUDE_DIRS "libdivide.h" PATH_SUFFIXES "include" ${ARGS})
-    if(EXISTS "${LIBDIVIDE_INCLUDE_DIRS}/libdivide.h")
-        set(LIBDIVIDE_FOUND ON)
-    else()
-        set(LIBDIVIDE_FOUND OFF)
-    endif()
-
-endmacro()
-
-if(FETCH_LIBDIVIDE_IMPL)
-    FIND_LIBDIVIDE(QUIET)
-    include(${CMAKE_CURRENT_LIST_DIR}/../thirdparty/getLibDivide.cmake)
-endif()
-
-FIND_LIBDIVIDE(REQUIRED)
-
-if(NOT TARGET libdivide)
-    add_library(libdivide INTERFACE IMPORTED)
-
-    target_include_directories(libdivide INTERFACE 
-                    $<BUILD_INTERFACE:${LIBDIVIDE_INCLUDE_DIRS}>
-                    $<INSTALL_INTERFACE:>)
-endif()
-
-message(STATUS "LIBDIVIDE_INCLUDE_DIRS:  ${LIBDIVIDE_INCLUDE_DIRS}")
-
-
-
-
 # resort the previous prefix path
 set(CMAKE_PREFIX_PATH ${PUSHED_CMAKE_PREFIX_PATH})
 cmake_policy(POP)
diff --git a/cryptoTools b/cryptoTools
diff --git a/libOTe/Tools/EACode/EACode.cpp b/libOTe/Tools/EACode/EACode.cpp
diff --git a/libOTe/Tools/EACode/EACode.h b/libOTe/Tools/EACode/EACode.h
@@ -371,12 +371,9 @@ namespace osuCrypto
 
                 switch (mExpanderWeight)
                 {
-                    CASE(5);
                     CASE(7);
-                    CASE(9);
                     CASE(11);
                     CASE(21);
-                    CASE(40);
                 default:
                     for (u64 jj = 0; jj < 8; ++jj)
                     {

diff --git a/thirdparty/getLibDivide.cmake b/thirdparty/getLibDivide.cmake
+10 −1		CMakeLists.txt
+22 −3		CMakePresets.json
+42 −0		cmake/cryptoToolsDepHelper.cmake
+1 −1		cryptoTools/Common/BitVector.h
+689 −192		cryptoTools/Common/CuckooIndex.cpp
+251 −99		cryptoTools/Common/CuckooIndex.h
+467 −0		frontend_cryptoTools/cuckoo/SimpleCuckoo.cpp
+137 −0		frontend_cryptoTools/cuckoo/SimpleCuckoo.h
+ −		frontend_cryptoTools/cuckoo/bounds.xlsx
+ −		frontend_cryptoTools/cuckoo/bounds2.xlsx
+777 −0		frontend_cryptoTools/cuckoo/cuckooTests.cpp
+16 −0		frontend_cryptoTools/cuckoo/cuckooTests.h
+295 −0		frontend_cryptoTools/cuckoo/stashSize_2h.txt
+6 −1		frontend_cryptoTools/main.cpp
+10 −8		tests_cryptoTools/Cuckoo_Tests.cpp
+3 −3		tests_cryptoTools/SimpleCuckoo.cpp
+1 −1		tests_cryptoTools/SimpleCuckoo.h
+1 −1		thirdparty/getCoproto.cmake
+36 −0		thirdparty/getLibDivide.cmake