From 48b488b3334675241c5b1728fb2837d48d205779 Mon Sep 17 00:00:00 2001 From: Hyerin Park Date: Thu, 25 Jul 2024 09:32:16 +0000 Subject: [PATCH] minor updates --- src/main/scala/fhetest/Checker/ExceptionMsgKeyword.scala | 9 ++++++++- src/main/scala/fhetest/Command.scala | 3 +-- src/main/scala/fhetest/Generate/ValidFilter.scala | 2 +- src/main/scala/fhetest/package.scala | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/scala/fhetest/Checker/ExceptionMsgKeyword.scala b/src/main/scala/fhetest/Checker/ExceptionMsgKeyword.scala index 76999f5..159514e 100644 --- a/src/main/scala/fhetest/Checker/ExceptionMsgKeyword.scala +++ b/src/main/scala/fhetest/Checker/ExceptionMsgKeyword.scala @@ -28,7 +28,14 @@ def mapLibConfigArgument2Keywords( argName: LibConfigArgumentName, ): Set[String] = { val commonKeywords = - Set(" parameters", "ring dimension", " ringdim", " primes", " overflow") + Set( + " parameters", + "ring dimension", + " ringdim", + " primes", + " overflow", + " transparent", + ) val modSizeKeywords = Set(" moduli", " bit_sizes", "bit length") val uniqueKeywords = argName match { case "Scheme" => Set("scheme") diff --git a/src/main/scala/fhetest/Command.scala b/src/main/scala/fhetest/Command.scala index a175318..7bc9df7 100644 --- a/src/main/scala/fhetest/Command.scala +++ b/src/main/scala/fhetest/Command.scala @@ -226,8 +226,7 @@ case object CmdTest extends BackendCommand("test") { val noFilterOpt = config.noFilterOpt val generator = Generate(encType, genStrategy, validFilter, noFilterOpt) val programs = generator(genCount) - // val backendList = List(Backend.SEAL, Backend.OpenFHE) // commented out for evaluation - val backendList = List(Backend.OpenFHE) // tmp: for evaluation + val backendList = List(Backend.SEAL, Backend.OpenFHE) val encParamsOpt = config.libConfigOpt.map(_.encParams) val toJson = config.toJson val sealVersion = config.sealVersion.getOrElse(SEAL_VERSIONS.head) diff --git a/src/main/scala/fhetest/Generate/ValidFilter.scala b/src/main/scala/fhetest/Generate/ValidFilter.scala index c6dace3..becb3cd 100644 --- a/src/main/scala/fhetest/Generate/ValidFilter.scala +++ b/src/main/scala/fhetest/Generate/ValidFilter.scala @@ -380,7 +380,7 @@ object ValidFilter { else if (scheme == Scheme.BFV) List(ScalingTechnique.NORESCALE) else List( - ScalingTechnique.NORESCALE, + // ScalingTechnique.NORESCALE, // v1.2.0 ScalingTechnique.FIXEDMANUAL, ScalingTechnique.FIXEDAUTO, ScalingTechnique.FLEXIBLEAUTO, diff --git a/src/main/scala/fhetest/package.scala b/src/main/scala/fhetest/package.scala index 1047047..9a1eda7 100644 --- a/src/main/scala/fhetest/package.scala +++ b/src/main/scala/fhetest/package.scala @@ -24,4 +24,4 @@ val OPENFHE_DIR = s"$WORKSPACE_DIR/OpenFHE" val SEAL_VERSIONS = List("4.1.1", "4.1.0", "4.0.0", "3.7.3", "3.7.2") val OPENFHE_VERSIONS = - List("1.1.4", "1.1.2", "1.0.4", "1.0.3", "1.0.2", "1.0.1") + List("1.2.0", "1.1.4", "1.1.2", "1.0.4", "1.0.3", "1.0.2", "1.0.1")