Skip to content

Commit 85a8f63

Browse files
authored
Merge pull request #866 from openfheorg/dev
Updates main to v1.2.1
2 parents 13bf46f + d22b0e9 commit 85a8f63

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+393
-866
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
make
7878
7979
- name: deploy_docs
80-
uses: peaceiris/actions-gh-pages@v3
80+
uses: peaceiris/actions-gh-pages@v4
8181
with:
8282
github_token: ${{ secrets.GITHUB_TOKEN }}
8383
publish_dir: ./docs

.github/workflows/manual.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
description: 'Compiler type'
1515
type: string
1616
required: true
17-
default: 'CLANG-14'
17+
default: 'CLANG-18'
1818
native_backend:
1919
description: 'Size of NativeInteger'
2020
type: string
@@ -35,11 +35,11 @@ on:
3535
type: string
3636
required: true
3737
default: 'none'
38-
38+
3939
workflow_dispatch:
4040
inputs:
41-
# # Selects the compiler to use, this choice will be used in the COMPILERS_MAP as the key to
42-
# # retrieve the corresponding cmake compiler options to pass to the action
41+
# Selects the compiler to use, this choice will be used in the COMPILERS_MAP as the key to
42+
# retrieve the corresponding cmake compiler options to pass to the action
4343
compiler:
4444
description: 'Compiler type'
4545
type: choice
@@ -48,12 +48,15 @@ on:
4848
- 'GCC-10'
4949
- 'GCC-11'
5050
- 'GCC-12'
51-
- 'CLANG-12 (WITH_OPENMP=OFF)'
52-
- 'CLANG-13 (WITH_OPENMP=OFF)'
53-
- 'CLANG-14'
51+
- 'GCC-13'
52+
- 'GCC-14'
53+
- 'CLANG-14 (WITH_OPENMP=OFF)'
5454
- 'CLANG-15 (WITH_OPENMP=OFF)'
55+
- 'CLANG-16 (WITH_OPENMP=OFF)'
56+
- 'CLANG-17 (WITH_OPENMP=OFF)'
57+
- 'CLANG-18'
5558
required: true
56-
default: 'CLANG-14'
59+
default: 'CLANG-18'
5760
native_backend:
5861
description: 'Size of NativeInteger'
5962
type: choice
@@ -122,5 +125,3 @@ jobs:
122125
"mb6_ntl_tcm" : "-DBUILD_EXTRAS=ON -DMATHBACKEND=6 -DWITH_NTL=ON -DWITH_TCM=ON",
123126
"mb6_ntl_debug_tcm" : "-DBUILD_EXTRAS=ON -DMATHBACKEND=6 -DWITH_NTL=ON -DWITH_TCM=ON -DCMAKE_BUILD_TYPE=Debug",
124127
}'
125-
126-

CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ project (OpenFHE C CXX)
2727

2828
set(OPENFHE_VERSION_MAJOR 1)
2929
set(OPENFHE_VERSION_MINOR 2)
30-
set(OPENFHE_VERSION_PATCH 0)
30+
set(OPENFHE_VERSION_PATCH 1)
3131
set(OPENFHE_VERSION ${OPENFHE_VERSION_MAJOR}.${OPENFHE_VERSION_MINOR}.${OPENFHE_VERSION_PATCH})
3232

3333
set(CMAKE_CXX_STANDARD 17)
@@ -154,10 +154,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
154154
message (STATUS "BUILTIN_INFO_AVAILABLE is defined")
155155
endif()
156156

157-
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
158-
set(IGNORE_WARNINGS "${IGNORE_WARNINGS} -Wno-unused-private-field -Wno-shift-op-parentheses")
159-
endif()
160-
161157
if( WITH_NATIVEOPT )
162158
set (NATIVE_OPT "-march=native")
163159
else()

benchmark/src/bfv-mult-method-benchmark.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#define _USE_MATH_DEFINES
3939
#include "scheme/bfvrns/gen-cryptocontext-bfvrns.h"
4040
#include "gen-cryptocontext.h"
41+
#include "cryptocontext.h"
4142

4243
#include "benchmark/benchmark.h"
4344

benchmark/src/compare-bfv-hps-leveled-vs-behz.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#define _USE_MATH_DEFINES
3939
#include "scheme/bfvrns/gen-cryptocontext-bfvrns.h"
4040
#include "gen-cryptocontext.h"
41+
#include "cryptocontext.h"
4142

4243
#include "benchmark/benchmark.h"
4344

benchmark/src/compare-bfvrns-vs-bgvrns.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include "scheme/bfvrns/gen-cryptocontext-bfvrns.h"
4040
#include "scheme/bgvrns/gen-cryptocontext-bgvrns.h"
4141
#include "gen-cryptocontext.h"
42+
#include "cryptocontext.h"
4243

4344
#include "benchmark/benchmark.h"
4445

benchmark/src/lib-benchmark.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
#include "scheme/bfvrns/gen-cryptocontext-bfvrns.h"
4343
#include "scheme/bgvrns/gen-cryptocontext-bgvrns.h"
4444
#include "gen-cryptocontext.h"
45+
#include "cryptocontext.h"
4546

4647
#include <fstream>
4748
#include <iostream>

benchmark/src/mult-vs-square.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include "scheme/bgvrns/gen-cryptocontext-bgvrns.h"
3939
#include "scheme/ckksrns/gen-cryptocontext-ckksrns.h"
4040
#include "gen-cryptocontext.h"
41+
#include "cryptocontext.h"
4142

4243
#include "benchmark/benchmark.h"
4344

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ sphinxcontrib-mermaid==0.7.1
2626
sphinxcontrib-qthelp==1.0.3
2727
sphinxcontrib-serializinghtml==1.1.5
2828
urllib3>=1.26.18
29-
zipp==3.7.0
29+
zipp>=3.19.1

docs/static_docs/Release_Notes.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
09/10/2024: OpenFHE 1.2.1 (stable) is released
2+
3+
* Fixes compilation issues with g++ 14 and clang++ 18 (#822, #835)
4+
* Fixes the parameter estimation bug for HRA-secure PRE when ring dimension is not set by the user (#827)
5+
* Includes several other bug fixes
6+
7+
The detailed list of changes is available at https://github.com/openfheorg/openfhe-development/issues?q=is%3Aissue+milestone%3A%22Release+1.2.1%22
8+
19
06/25/2024: OpenFHE 1.2.0 (stable) is released
210

311
* Updates the lattice parameters tables to support the ring dimension of 2^{16} and 2^{17} for ternary and Gaussian secrets (#806)

0 commit comments

Comments
 (0)