Skip to content

Corrected exception handling for COMPOSITESCALING* #1205

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

Merged
yspolyakov merged 2 commits into from
Jun 11, 2026
Merged

Corrected exception handling for COMPOSITESCALING* #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46c3cf9
Corrected exception handling for COMPOSITESCALING*
dsuponitskiy-duality Jun 9, 2026
f041137
Corrected unittests
dsuponitskiy-duality Jun 10, 2026
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
4 changes: 2 additions & 2 deletions src/pke/lib/scheme/ckksrns/ckksrns-parametergeneration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ bool ParameterGenerationCKKSRNS::ParamsGenCKKSRNSInternal(std::shared_ptr<Crypto
errorMsg += " Also, you can use COMPOSITESCALINGMANUAL at your own risk.";
OPENFHE_THROW(errorMsg);
}
else if (compositeDegree == 1 && registerWordSize < 64) {
else if (compositeDegree == 1 && registerWordSize <= 64) {
OPENFHE_THROW(
"This COMPOSITESCALING* version does not support composite degree == 1 with register size < 64.");
"This COMPOSITESCALING* version does not support composite degree == 1 with register size <= 64.");
}
else if (compositeDegree < 1) {
OPENFHE_THROW("Composite degree must be greater than or equal to 1.");
Expand Down
20 changes: 10 additions & 10 deletions src/pke/unittest/UnitTestMultiparty.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,16 +190,16 @@ static std::vector<TEST_CASE_UTGENERAL_MULTIPARTY> testCases = {
{ CKKSRNS_TEST, "75", {CKKSRNS_SCHEME, 2048, 2, 50, 3, BATCH, DFLT, DFLT, DFLT, HEStd_NotSet, BV, FLEXIBLEAUTOEXT, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT}, true, 1024, "NA"},
{ CKKSRNS_TEST, "76", {CKKSRNS_SCHEME, 2048, 2, 50, 3, BATCH, DFLT, DFLT, DFLT, HEStd_NotSet, HYBRID, FLEXIBLEAUTOEXT, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT}, true, 1024, "NA"},
// TestType, Descr, Scheme, RDim, MultDepth, SModSize, DSize,BatchSz, SecKeyDist, MaxRelinSkDeg, FModSize, SecLvl, KSTech, ScalTech, LDigits, PtMod, StdDev, EvalAddCt, KSCt, MultTech, EncTech, PREMode, Star, Slots, sharingScheme
{ CKKSRNS_TEST, "77", {CKKSRNS_SCHEME, 2048, 2, 50, 3, BATCH, DFLT, DFLT, 60, HEStd_NotSet, HYBRID, COMPOSITESCALINGAUTO, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT}, false, 1024, "NA"},
{ CKKSRNS_TEST, "78", {CKKSRNS_SCHEME, 2048, 2, 50, 3, BATCH, DFLT, DFLT, 60, HEStd_NotSet, HYBRID, COMPOSITESCALINGAUTO, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT}, true, 1024, "NA"},
{ CKKSRNS_TEST, "79", {CKKSRNS_SCHEME, 2048, 2, 50, 3, BATCH, DFLT, DFLT, 60, HEStd_NotSet, HYBRID, COMPOSITESCALINGMANUAL, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT}, false, 1024, "NA"},
{ CKKSRNS_TEST, "80", {CKKSRNS_SCHEME, 2048, 2, 50, 3, BATCH, DFLT, DFLT, 60, HEStd_NotSet, HYBRID, COMPOSITESCALINGMANUAL, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT}, true, 1024, "NA"},
{ CKKSRNS_TEST, "81", {CKKSRNS_SCHEME, 2048, 2, 118, 3, BATCH, DFLT, DFLT, 120, HEStd_NotSet, HYBRID, COMPOSITESCALINGAUTO, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT}, false, 1024, "NA"},
{ CKKSRNS_TEST, "82", {CKKSRNS_SCHEME, 2048, 2, 118, 3, BATCH, DFLT, DFLT, 120, HEStd_NotSet, HYBRID, COMPOSITESCALINGAUTO, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT}, true, 1024, "NA"},
{ CKKSRNS_TEST, "83", {CKKSRNS_SCHEME, 2048, 2, 118, 3, BATCH, DFLT, DFLT, 120, HEStd_NotSet, HYBRID, COMPOSITESCALINGMANUAL, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, 64, 2}, false, 512, "NA"},
{ CKKSRNS_TEST, "84", {CKKSRNS_SCHEME, 2048, 2, 118, 3, BATCH, DFLT, DFLT, 120, HEStd_NotSet, HYBRID, COMPOSITESCALINGMANUAL, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, 64, 2}, true, 512, "NA"},
{ CKKSRNS_TEST, "85", {CKKSRNS_SCHEME, 2048, 2, 118, 3, BATCH, DFLT, DFLT, 120, HEStd_NotSet, HYBRID, COMPOSITESCALINGMANUAL, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, 32, 4}, false, 512, "NA"},
{ CKKSRNS_TEST, "86", {CKKSRNS_SCHEME, 2048, 2, 118, 3, BATCH, DFLT, DFLT, 120, HEStd_NotSet, HYBRID, COMPOSITESCALINGMANUAL, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, 32, 4}, true, 512, "NA"},
{ CKKSRNS_TEST, "77", {CKKSRNS_SCHEME, 2048, 2, 118, 3, BATCH, DFLT, DFLT, 120, HEStd_NotSet, HYBRID, COMPOSITESCALINGAUTO, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT}, false, 1024, "NA"},
{ CKKSRNS_TEST, "78", {CKKSRNS_SCHEME, 2048, 2, 118, 3, BATCH, DFLT, DFLT, 120, HEStd_NotSet, HYBRID, COMPOSITESCALINGAUTO, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT}, true, 1024, "NA"},
{ CKKSRNS_TEST, "79", {CKKSRNS_SCHEME, 2048, 2, 118, 3, BATCH, DFLT, DFLT, 120, HEStd_NotSet, HYBRID, COMPOSITESCALINGMANUAL, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, 64, 2}, false, 1024, "NA"},
{ CKKSRNS_TEST, "80", {CKKSRNS_SCHEME, 2048, 2, 118, 3, BATCH, DFLT, DFLT, 120, HEStd_NotSet, HYBRID, COMPOSITESCALINGMANUAL, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, 64, 2}, true, 1024, "NA"},
{ CKKSRNS_TEST, "81", {CKKSRNS_SCHEME, 2048, 2, 50, 3, BATCH, DFLT, DFLT, 60, HEStd_NotSet, HYBRID, COMPOSITESCALINGAUTO, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, 32}, false, 1024, "NA"},
{ CKKSRNS_TEST, "82", {CKKSRNS_SCHEME, 2048, 2, 50, 3, BATCH, DFLT, DFLT, 60, HEStd_NotSet, HYBRID, COMPOSITESCALINGAUTO, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, 32}, true, 1024, "NA"},
{ CKKSRNS_TEST, "83", {CKKSRNS_SCHEME, 2048, 2, 118, 3, BATCH, DFLT, DFLT, 120, HEStd_NotSet, HYBRID, COMPOSITESCALINGMANUAL, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, 64, 2}, false, 512, "NA"},
{ CKKSRNS_TEST, "84", {CKKSRNS_SCHEME, 2048, 2, 118, 3, BATCH, DFLT, DFLT, 120, HEStd_NotSet, HYBRID, COMPOSITESCALINGMANUAL, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, 64, 2}, true, 512, "NA"},
{ CKKSRNS_TEST, "85", {CKKSRNS_SCHEME, 2048, 2, 118, 3, BATCH, DFLT, DFLT, 120, HEStd_NotSet, HYBRID, COMPOSITESCALINGMANUAL, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, 32, 4}, false, 512, "NA"},
{ CKKSRNS_TEST, "86", {CKKSRNS_SCHEME, 2048, 2, 118, 3, BATCH, DFLT, DFLT, 120, HEStd_NotSet, HYBRID, COMPOSITESCALINGMANUAL, DFLT, DFLT, DFLT, 0, 0, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, DFLT, 32, 4}, true, 512, "NA"},
#endif
// ==========================================
// TestType, Descr, Scheme, RDim, MultDepth, SModSize, DSize, BatchSz, SecKeyDist, MaxRelinSkDeg, FModSize, SecLvl, KSTech, ScalTech, LDigits, PtMod, StdDev, EvalAddCt, KSCt, MultTech, EncTech, PREMode, MultipartyMode, Star, Slots, sharingScheme
Expand Down