Skip to content
This repository was archived by the owner on Jun 30, 2025. It is now read-only.

Add ipcl.hpp public header & ipcl/CMakeLists.txt clean #22

Merged
merged 3 commits into from
Sep 21, 2022
Merged

Add ipcl.hpp public header & ipcl/CMakeLists.txt clean #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75ebe44
ipcl/CMakeLists.txt clean
justalittlenoob Sep 20, 2022
fd7e100
keygen.hpp: rename it with ipcl.hpp, use it as public header
justalittlenoob Sep 20, 2022
7405030
Unit test & benchmark: replace header files with ipcl.hpp
justalittlenoob Sep 20, 2022
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 benchmark/bench_cryptography.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <vector>

#include "ipcl/keygen.hpp"
#include "ipcl/ipcl.hpp"

#define ADD_SAMPLE_KEY_LENGTH_ARGS Args({1024})->Args({2048})
#define ADD_SAMPLE_VECTOR_SIZE_ARGS \
Expand Down
2 changes: 1 addition & 1 deletion benchmark/bench_ops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <iostream>
#include <vector>

#include "ipcl/keygen.hpp"
#include "ipcl/ipcl.hpp"

#define ADD_SAMPLE_KEY_LENGTH_ARGS Args({1024})->Args({2048})
#define ADD_SAMPLE_VECTOR_SIZE_ARGS \
Expand Down
12 changes: 2 additions & 10 deletions ipcl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ target_include_directories(ipcl
)

install(DIRECTORY ${IPCL_INC_DIR}/
DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/
DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}
FILES_MATCHING
PATTERN "*.hpp"
PATTERN "*.h")

install(DIRECTORY ${IPPCRYPTO_INC_DIR}/
DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/
DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}
FILES_MATCHING
PATTERN "*.hpp"
PATTERN "*.h")
Expand Down Expand Up @@ -71,14 +71,6 @@ else()
set_target_properties(ipcl PROPERTIES OUTPUT_NAME "ipcl")
endif()


install(DIRECTORY ${IPCL_INC_DIR}/
DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/
FILES_MATCHING
PATTERN "*.hpp"
PATTERN "*.h"
)

install(TARGETS ipcl DESTINATION ${CMAKE_INSTALL_LIBDIR})

# config cmake config and target file
Expand Down
8 changes: 4 additions & 4 deletions ipcl/include/ipcl/keygen.hpp → ipcl/include/ipcl/ipcl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright (C) 2021 Intel Corporation
// Copyright (C) 2022 Intel Corporation
// SPDX-License-Identifier: Apache-2.0

#ifndef IPCL_INCLUDE_IPCL_KEYGEN_HPP_
#define IPCL_INCLUDE_IPCL_KEYGEN_HPP_
#ifndef IPCL_INCLUDE_IPCL_IPCL_HPP_
#define IPCL_INCLUDE_IPCL_IPCL_HPP_

#include "ipcl/pri_key.hpp"

Expand Down Expand Up @@ -34,4 +34,4 @@ BigNumber getPrimeBN(int maxBitSize);
keyPair generateKeypair(int64_t n_length, bool enable_DJN = true);

} // namespace ipcl
#endif // IPCL_INCLUDE_IPCL_KEYGEN_HPP_
#endif // IPCL_INCLUDE_IPCL_IPCL_HPP_
4 changes: 1 addition & 3 deletions ipcl/keygen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
// Copyright (C) 2021 Intel Corporation
// SPDX-License-Identifier: Apache-2.0

#include "ipcl/keygen.hpp"

#include <vector>

#include "ipcl/util.hpp"
#include "ipcl/ipcl.hpp"

namespace ipcl {

Expand Down
4 changes: 1 addition & 3 deletions test/test_cryptography.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
#include <vector>

#include "gtest/gtest.h"
#include "ipcl/ciphertext.hpp"
#include "ipcl/keygen.hpp"
#include "ipcl/plaintext.hpp"
#include "ipcl/ipcl.hpp"

constexpr int SELF_DEF_NUM_VALUES = 9;

Expand Down
4 changes: 1 addition & 3 deletions test/test_ops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
#include <vector>

#include "gtest/gtest.h"
#include "ipcl/ciphertext.hpp"
#include "ipcl/keygen.hpp"
#include "ipcl/plaintext.hpp"
#include "ipcl/ipcl.hpp"

constexpr int SELF_DEF_NUM_VALUES = 7;

Expand Down