Skip to content
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

Jump to bottom

Rename PNNSError -> PnnsError #65

Merged
merged 1 commit into from
Aug 19, 2024
Merged

Rename PNNSError -> PnnsError #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions Sources/PrivateNearestNeighborsSearch/CiphertextMatrix.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,22 @@ struct CiphertextMatrix<Scheme: HeScheme, Format: PolyFormat>: Equatable, Sendab
@inlinable
init(dimensions: Dimensions, packing: Packing, ciphertexts: [Ciphertext<Scheme, Format>]) throws {
guard let context = ciphertexts.first?.context else {
throw PNNSError.emptyCiphertextArray
throw PnnsError.emptyCiphertextArray
}
let encryptionParams = context.encryptionParameters
guard let simdDimensions = encryptionParams.simdDimensions else {
throw PNNSError.simdEncodingNotSupported(for: encryptionParams)
throw PnnsError.simdEncodingNotSupported(for: encryptionParams)
}
let expectedCiphertextCount = try PlaintextMatrix<Scheme, Format>.plaintextCount(
encryptionParameters: encryptionParams,
dimensions: dimensions,
packing: packing)
guard ciphertexts.count == expectedCiphertextCount else {
throw PNNSError.wrongCiphertextCount(got: ciphertexts.count, expected: expectedCiphertextCount)
throw PnnsError.wrongCiphertextCount(got: ciphertexts.count, expected: expectedCiphertextCount)
}
for ciphertext in ciphertexts {
guard ciphertext.context == context else {
throw PNNSError.wrongContext(got: ciphertext.context, expected: context)
throw PnnsError.wrongContext(got: ciphertext.context, expected: context)
}
}

Expand Down
8 changes: 4 additions & 4 deletions Sources/PrivateNearestNeighborsSearch/Error.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Foundation
import HomomorphicEncryption

/// Error type for ``PrivateNearestNeighborsSearch``.
enum PNNSError: Error, Equatable {
enum PnnsError: Error, Equatable {
case emptyCiphertextArray
case emptyPlaintextArray
case invalidMatrixDimensions(_ dimensions: MatrixDimensions)
Expand All @@ -30,19 +30,19 @@ enum PNNSError: Error, Equatable {
expected: PlaintextMatrixPacking)
}

extension PNNSError {
extension PnnsError {
@inlinable
static func simdEncodingNotSupported(for encryptionParameters: EncryptionParameters<some HeScheme>) -> Self {
.simdEncodingNotSupported(encryptionParameters.description)
}

@inlinable
static func wrongContext(got: Context<some HeScheme>, expected: Context<some HeScheme>) -> Self {
PNNSError.wrongContext(gotDescription: got.description, expectedDescription: expected.description)
PnnsError.wrongContext(gotDescription: got.description, expectedDescription: expected.description)
}
}

extension PNNSError: LocalizedError {
extension PnnsError: LocalizedError {
public var errorDescription: String? {
switch self {
case .emptyCiphertextArray:
Expand Down
36 changes: 18 additions & 18 deletions Sources/PrivateNearestNeighborsSearch/PlaintextMatrix.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ struct MatrixDimensions: Equatable, Sendable {
self.rowCount = rowCount
self.columnCount = columnCount
guard rowCount > 0, columnCount > 0 else {
throw PNNSError.invalidMatrixDimensions(self)
throw PnnsError.invalidMatrixDimensions(self)
}
}
}
Expand Down Expand Up @@ -109,23 +109,23 @@ struct PlaintextMatrix<Scheme: HeScheme, Format: PolyFormat>: Equatable, Sendabl
@inlinable
init(dimensions: Dimensions, packing: Packing, plaintexts: [Plaintext<Scheme, Format>]) throws {
guard !plaintexts.isEmpty else {
throw PNNSError.emptyPlaintextArray
throw PnnsError.emptyPlaintextArray
}
let context = plaintexts[0].context
let encryptionParams = context.encryptionParameters
guard let simdDimensions = encryptionParams.simdDimensions else {
throw PNNSError.simdEncodingNotSupported(for: encryptionParams)
throw PnnsError.simdEncodingNotSupported(for: encryptionParams)
}
let expectedPlaintextCount = try PlaintextMatrix.plaintextCount(
encryptionParameters: encryptionParams,
dimensions: dimensions,
packing: packing)
guard plaintexts.count == expectedPlaintextCount else {
throw PNNSError.wrongPlaintextCount(got: plaintexts.count, expected: expectedPlaintextCount)
throw PnnsError.wrongPlaintextCount(got: plaintexts.count, expected: expectedPlaintextCount)
}
for plaintext in plaintexts {
guard plaintext.context == context else {
throw PNNSError.wrongContext(got: plaintext.context, expected: context)
throw PnnsError.wrongContext(got: plaintext.context, expected: context)
}
}

Expand All @@ -147,7 +147,7 @@ struct PlaintextMatrix<Scheme: HeScheme, Format: PolyFormat>: Equatable, Sendabl
where Format == Coeff
{
guard values.count == dimensions.count, !values.isEmpty else {
throw PNNSError.wrongEncodingValuesCount(got: values.count, expected: values.count)
throw PnnsError.wrongEncodingValuesCount(got: values.count, expected: values.count)
}
switch packing {
case .denseColumn:
Expand Down Expand Up @@ -186,7 +186,7 @@ struct PlaintextMatrix<Scheme: HeScheme, Format: PolyFormat>: Equatable, Sendabl
packing: PlaintextMatrix.Packing) throws -> Int
{
guard let simdDimensions = encryptionParameters.simdDimensions else {
throw PNNSError.simdEncodingNotSupported(for: encryptionParameters)
throw PnnsError.simdEncodingNotSupported(for: encryptionParameters)
}
switch packing {
case .denseColumn:
Expand All @@ -198,7 +198,7 @@ struct PlaintextMatrix<Scheme: HeScheme, Format: PolyFormat>: Equatable, Sendabl
.dividingCeil(encryptionParameters.polyDegree, variableTime: true)
case .denseRow:
guard dimensions.columnCount <= simdDimensions.columnCount else {
throw PNNSError.invalidMatrixDimensions(dimensions)
throw PnnsError.invalidMatrixDimensions(dimensions)
}
let rowsPerPlaintextCount = simdDimensions.rowCount * (
simdDimensions.columnCount / dimensions.columnCount.nextPowerOfTwo)
Expand All @@ -224,7 +224,7 @@ struct PlaintextMatrix<Scheme: HeScheme, Format: PolyFormat>: Equatable, Sendabl
{
let degree = context.degree
guard let simdColumnCount = context.simdDimensions?.columnCount else {
throw PNNSError.simdEncodingNotSupported(for: context.encryptionParameters)
throw PnnsError.simdEncodingNotSupported(for: context.encryptionParameters)
}

let encryptionParams = context.encryptionParameters
Expand Down Expand Up @@ -282,12 +282,12 @@ struct PlaintextMatrix<Scheme: HeScheme, Format: PolyFormat>: Equatable, Sendabl
{
let encryptionParameters = context.encryptionParameters
guard let simdDimensions = context.simdDimensions else {
throw PNNSError.simdEncodingNotSupported(for: encryptionParameters)
throw PnnsError.simdEncodingNotSupported(for: encryptionParameters)
}
precondition(simdDimensions.rowCount == 2, "simdRowCount must be 2")
let simdColumnCount = simdDimensions.columnCount
guard dimensions.columnCount <= simdColumnCount else {
throw PNNSError.invalidMatrixDimensions(dimensions)
throw PnnsError.invalidMatrixDimensions(dimensions)
}

var plaintexts: [Plaintext<Scheme, Coeff>] = []
Expand Down Expand Up @@ -357,17 +357,17 @@ struct PlaintextMatrix<Scheme: HeScheme, Format: PolyFormat>: Equatable, Sendabl
{
let encryptionParameters = context.encryptionParameters
guard let simdDimensions = context.simdDimensions else {
throw PNNSError.simdEncodingNotSupported(for: encryptionParameters)
throw PnnsError.simdEncodingNotSupported(for: encryptionParameters)
}
let simdColumnCount = simdDimensions.columnCount
let simdRowCount = simdDimensions.rowCount
precondition(simdRowCount == 2, "simdRowCount must be 2")
guard dimensions.columnCount <= simdColumnCount else {
throw PNNSError.invalidMatrixDimensions(dimensions)
throw PnnsError.invalidMatrixDimensions(dimensions)
}
guard case let .diagonal(bsgs) = packing else {
let expectedBsgs = BabyStepGiantStep(vectorDimension: dimensions.columnCount)
throw PNNSError
throw PnnsError
.wrongPlaintextMatrixPacking(got: packing, expected: .diagonal(babyStepGiantStep: expectedBsgs))
}

Expand Down Expand Up @@ -439,7 +439,7 @@ struct PlaintextMatrix<Scheme: HeScheme, Format: PolyFormat>: Equatable, Sendabl
@inlinable
func unpackDenseColumn<V: ScalarType>() throws -> [V] where Format == Coeff {
guard case packing = .denseColumn else {
throw PNNSError.wrongPlaintextMatrixPacking(got: packing, expected: .denseColumn)
throw PnnsError.wrongPlaintextMatrixPacking(got: packing, expected: .denseColumn)
}
let simdColumnCount = simdDimensions.columnCount
let simdRowCount = simdDimensions.rowCount
Expand Down Expand Up @@ -467,7 +467,7 @@ struct PlaintextMatrix<Scheme: HeScheme, Format: PolyFormat>: Equatable, Sendabl
}
}
guard valuesColumnMajor.count == count else {
throw PNNSError.wrongEncodingValuesCount(got: valuesColumnMajor.count, expected: count)
throw PnnsError.wrongEncodingValuesCount(got: valuesColumnMajor.count, expected: count)
}
// transpose from column-major to row-major
let arrayColumnMajor = Array2d(
Expand All @@ -483,7 +483,7 @@ struct PlaintextMatrix<Scheme: HeScheme, Format: PolyFormat>: Equatable, Sendabl
@inlinable
func unpackDenseRow<V: ScalarType>() throws -> [V] where Format == Coeff {
guard case packing = .denseRow else {
throw PNNSError.wrongPlaintextMatrixPacking(got: packing, expected: Packing.denseRow)
throw PnnsError.wrongPlaintextMatrixPacking(got: packing, expected: Packing.denseRow)
}
let simdColumnCount = simdDimensions.columnCount

Expand All @@ -507,7 +507,7 @@ struct PlaintextMatrix<Scheme: HeScheme, Format: PolyFormat>: Equatable, Sendabl
}
}
guard values.count == count else {
throw PNNSError.wrongEncodingValuesCount(got: values.count, expected: count)
throw PnnsError.wrongEncodingValuesCount(got: values.count, expected: count)
}
return values
}
Expand Down
Loading