[feature] zmq config ON

Author: hobo0cn

CMakeLists.txt

@@ -162,7 +162,7 @@ FetchContent_MakeAvailable(Kuku)
     # else()
     message(STATUS "Flatbuffers: found")
     # get_target_property(FLATBUFFERS_FLATC_PATH flatbuffers::flatc IMPORTED_LOCATION_RELEASE)
-    set(FLATBUFFERS_FLATC_PATH "/usr/local/bin/flatc")
+    set(FLATBUFFERS_FLATC_PATH "/opt/homebrew/bin/flatc")
     message(STATUS "flatc path: ${FLATBUFFERS_FLATC_PATH}")
     include(CompileSchemaCXX)
 # endif()
@@ -196,9 +196,10 @@ endif()
 
 # [Option] APSI_USE_ZMQ (default: ON)
 set(APSI_USE_ZMQ_OPTION_STR "Use ZeroMQ for networking")
-option(APSI_USE_ZMQ ${APSI_USE_ZMQ_OPTION_STR} OFF)
-set(APSI_USE_ZMQ OFF)
+option(APSI_USE_ZMQ ${APSI_USE_ZMQ_OPTION_STR} ON)
+# set(APSI_USE_ZMQ OFF)
 if(APSI_USE_ZMQ)
+    list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
     # ZeroMQ base
     find_package(ZeroMQ REQUIRED)
     if(NOT ZeroMQ_FOUND)
@@ -231,7 +232,7 @@ endif()
 # [Option] APSI_BUILD_CLI (default: OFF)
 set(APSI_BUILD_CLI_OPTION_STR "Build example command line interface applications")
 cmake_dependent_option(APSI_BUILD_CLI ${APSI_BUILD_CLI_OPTION_STR} OFF "APSI_USE_ZMQ;APSI_USE_LOG4CPLUS" OFF)
-set(APSI_BUILD_CLI OFF)
+set(APSI_BUILD_CLI ON)
 if (APSI_BUILD_CLI)
     # TCLAP
     find_path(TCLAP_INCLUDE_DIRS "tclap/Arg.h")
@@ -268,7 +269,8 @@ apsi_set_version_filename(apsi)
 apsi_set_language(apsi)
 target_include_directories(apsi PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/common>
-    $<INSTALL_INTERFACE:${APSI_INCLUDES_INSTALL_DIR}>)
+    $<INSTALL_INTERFACE:${APSI_INCLUDES_INSTALL_DIR}>
+    /opt/homebrew/Cellar/flatbuffers/2.0.6/include/)
 target_include_directories(apsi PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/sender>
     $<INSTALL_INTERFACE:${APSI_INCLUDES_INSTALL_DIR}>)
@@ -298,7 +300,7 @@ if(APSI_USE_LOG4CPLUS)
     target_link_libraries(apsi PUBLIC log4cplus::log4cplus)
 endif()
 if(APSI_USE_ZMQ)
-    target_link_libraries(apsi PUBLIC libzmq-static cppzmq-static)
+    target_link_libraries(apsi PUBLIC libzmq cppzmq)
 endif()
 
 # Configurations for FourQlib: system, arch, SIMD, and assembler
@@ -432,6 +434,9 @@ endif()
 ##########################
 
 if(APSI_BUILD_CLI)
+    link_directories(
+        /opt/homebrew/Cellar/flatbuffers/2.0.6/lib
+        /Users/chb/Projects/deps/APSI/build/lib)
     add_library(common_cli OBJECT)
     add_subdirectory(cli/common)
     target_include_directories(common_cli PUBLIC cli)
@@ -451,14 +456,14 @@ if(APSI_BUILD_CLI)
 
     add_executable(sender_cli)
     add_subdirectory(cli/sender)
-    target_link_libraries(sender_cli PUBLIC common_cli apsi)
+    target_link_libraries(sender_cli PUBLIC common_cli apsi flatbuffers jsoncpp)
     if (APPLE)
         target_compile_options(common_cli PUBLIC -DHAVE_LONG_LONG)
     endif()
 
     add_executable(receiver_cli)
     add_subdirectory(cli/receiver)
-    target_link_libraries(receiver_cli PUBLIC common_cli apsi)
+    target_link_libraries(receiver_cli PUBLIC common_cli apsi flatbuffers jsoncpp)
 
     add_executable(pd_tool)
     add_subdirectory(cli/pd_tool)

FIndZeroMQ.cmake

@@ -0,0 +1,34 @@
+set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)
+find_package(PkgConfig)
+pkg_check_modules(PC_LIBZMQ QUIET libzmq)
+
+set(ZeroMQ_VERSION ${PC_LIBZMQ_VERSION})
+
+find_path(ZeroMQ_INCLUDE_DIR zmq.h
+        PATHS ${ZeroMQ_DIR}/include
+        ${PC_LIBZMQ_INCLUDE_DIRS})
+
+find_library(ZeroMQ_LIBRARY
+        NAMES zmq
+        PATHS ${ZeroMQ_DIR}/lib
+        ${PC_LIBZMQ_LIBDIR}
+        ${PC_LIBZMQ_LIBRARY_DIRS})
+
+if(ZeroMQ_LIBRARY)
+    set(ZeroMQ_FOUND ON)
+endif()
+
+set ( ZeroMQ_LIBRARIES ${ZeroMQ_LIBRARY} )
+set ( ZeroMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR} )
+
+if(NOT TARGET libzmq)
+    add_library(libzmq UNKNOWN IMPORTED)
+    set_target_properties(libzmq PROPERTIES
+            IMPORTED_LOCATION ${ZeroMQ_LIBRARIES}
+            INTERFACE_INCLUDE_DIRECTORIES ${ZeroMQ_INCLUDE_DIRS})
+endif()
+
+include ( FindPackageHandleStandardArgs )
+# handle the QUIETLY and REQUIRED arguments and set ZMQ_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARIES ZeroMQ_INCLUDE_DIRS )

README.md

@@ -1,30 +1,76 @@
 # APSI: C++ library for Asymmetric PSI
 
-- [Introduction](#introduction)
-  - [(Unlabeled) PSI and Labeled PSI](#(unlabeled)-psi-and-labeled-psi)
-  - [Sender and Receiver](#sender-and-receiver)
-- [How APSI Works](#how-apsi-works)
-  - [Homomorphic Encryption](#homomorphic-encryption)
-  - [Theory](#theory)
-  - [Practice](#practice)
-  - [Labeled Mode](#labeled-mode)
-- [Using APSI](#using-apsi)
-  - [Receiver](#receiver)
-  - [Request, Response, and ResultPart](#request--response--and-resultpart)
-  - [Sender](#sender)
-  - [SenderDB](#senderdb)
-  - [PSIParams](#psiparams)
-  - [Query Powers](#query-powers)
-  - [Thread Control](#thread-control)
-  - [Logging](#logging)
-- [Building APSI](#building-apsi)
-- [Command-Line Interface (CLI)](#command-line-interface-(cli))
-  - [Common Arguments](#common-arguments)
-  - [Receiver](#receiver-1)
-  - [Sender](#sender-1)
-  - [Test Data](#test-data)
-- [Acknowledgments](#acknowledgments)
-- [Questions](#questions)
+## 编译注意
+安装以下依赖
+1. 安装zmq，macOS为例：
+   ```bash
+   brew install cppzmq zeromq
+   ```
+2. flatbuffers
+   ```bash
+   brew install flatbuffers
+   ```
+   然后手工修改CMakefile中与flatbuffers相关的Include 和library路径
+   
+3. cmake & make
+   ```bash
+   mkdir build && cd build
+   cmake ..
+   make all -j
+   ```
+
+- [APSI: C++ library for Asymmetric PSI](#apsi-c-library-for-asymmetric-psi)
+  - [编译注意](#编译注意)
+  - [Introduction](#introduction)
+    - [(Unlabeled) PSI and Labeled PSI](#unlabeled-psi-and-labeled-psi)
+    - [Sender and Receiver](#sender-and-receiver)
+  - [How APSI Works](#how-apsi-works)
+    - [Homomorphic Encryption](#homomorphic-encryption)
+      - [Computation on Encrypted Data](#computation-on-encrypted-data)
+      - [Noise Budget](#noise-budget)
+      - [Encryption Parameters](#encryption-parameters)
+    - [Theory](#theory)
+      - [Naive Idea](#naive-idea)
+      - [Lowering the Depth](#lowering-the-depth)
+      - [Cuckoo Hashing](#cuckoo-hashing)
+      - [Large Items](#large-items)
+      - [OPRF](#oprf)
+      - [Paterson-Stockmeyer](#paterson-stockmeyer)
+      - [False Positives](#false-positives)
+    - [Practice](#practice)
+    - [Labeled Mode](#labeled-mode)
+      - [Basic Idea](#basic-idea)
+      - [Large Labels](#large-labels)
+      - [Label Encryption](#label-encryption)
+      - [Partial Item Collisions](#partial-item-collisions)
+  - [Using APSI](#using-apsi)
+    - [Receiver](#receiver)
+    - [Request, Response, and ResultPart](#request-response-and-resultpart)
+    - [Sender](#sender)
+    - [SenderDB](#senderdb)
+    - [PSIParams](#psiparams)
+      - [SEALParams](#sealparams)
+      - [ItemParams](#itemparams)
+      - [TableParams](#tableparams)
+      - [QueryParams](#queryparams)
+      - [PSIParams Constructor](#psiparams-constructor)
+      - [Loading from JSON](#loading-from-json)
+      - [False Positives](#false-positives-1)
+    - [Query Powers](#query-powers)
+    - [Thread Control](#thread-control)
+    - [Logging](#logging)
+  - [Building APSI](#building-apsi)
+    - [Requirements](#requirements)
+    - [Building and Installing APSI with vcpkg](#building-and-installing-apsi-with-vcpkg)
+    - [Building and Installing APSI Manually](#building-and-installing-apsi-manually)
+      - [Note on Microsoft SEAL and Intel HEXL](#note-on-microsoft-seal-and-intel-hexl)
+  - [Command-Line Interface (CLI)](#command-line-interface-cli)
+    - [Common Arguments](#common-arguments)
+    - [Receiver](#receiver-1)
+    - [Sender](#sender-1)
+    - [Test Data](#test-data)
+  - [Acknowledgments](#acknowledgments)
+  - [Contributing](#contributing)
 
 ## Introduction
 

cli/sender/CMakeLists.txt

@@ -1,8 +1,10 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT license.
+# link_directories(/opt/homebrew/Cellar/flatbuffers/2.0.6/lib)
 
 target_sources(sender_cli
     PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}/sender.cpp
         ${CMAKE_CURRENT_LIST_DIR}/sender_utils.cpp
 )
+# target_link_libraries(sender_cli flatbuffers)

common/apsi/CMakeLists.txt

@@ -1,6 +1,10 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT license.
 
+# include_directories(
+#     SYSTEM /opt/homebrew/Cellar/flatbuffers/2.0.6/include/
+# )
+
 # Source files in this directory
 set(APSI_SOURCE_FILES ${APSI_SOURCE_FILES}
     ${CMAKE_CURRENT_LIST_DIR}/item.cpp