From fd1d3c06930ed20a1cccfd30e140eb151cc8aee7 Mon Sep 17 00:00:00 2001 From: a252jain <a252jain@uwaterloo.ca> Date: Fri, 5 Apr 2024 12:50:10 -0400 Subject: [PATCH] attempting to add swiftannoy back --- Package.swift | 2 +- .../SwiftNLPTests/AllMiniLM_sampleTest.swift | 43 ++++++++++--------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/Package.swift b/Package.swift index 22c20410..be0eca81 100644 --- a/Package.swift +++ b/Package.swift @@ -32,7 +32,7 @@ let package = Package( .target( name: "SwiftNLP", dependencies: [ - //"SwiftAnnoy", + "SwiftAnnoy", "SwiftNLPGenericLLMMacros", .product(name: "HNSWAlgorithm", package: "similarity-topology"), .product(name: "HNSWEphemeral", package: "similarity-topology"), diff --git a/Tests/SwiftNLPTests/AllMiniLM_sampleTest.swift b/Tests/SwiftNLPTests/AllMiniLM_sampleTest.swift index 4c6be656..0cdb0ce8 100644 --- a/Tests/SwiftNLPTests/AllMiniLM_sampleTest.swift +++ b/Tests/SwiftNLPTests/AllMiniLM_sampleTest.swift @@ -4,7 +4,7 @@ import XCTest import Darwin @testable import SwiftNLP -// @testable import SwiftAnnoy +@testable import SwiftAnnoy final class BERT_test: XCTestCase { @@ -48,27 +48,28 @@ final class BERT_test: XCTestCase { fatalError("Error occurred!") } } + + let index = AnnoyIndex<Float>(itemLength: 384, metric: .euclidean) + + try? index.addItems(items: &database_embedding) + try? index.build(numTrees: 50) + + let results = index.getNNsForVector(vector: &query_embedding, neighbors: 8) + + if let finalresult = results { + let extractedIndeices = finalresult.indices + for index in extractedIndeices { + if index < docs.count { + print(docs[index]) + } else { + print("Index \(index) out of range.") + } + } + } + + print(results) + print(database_embedding) } - -// // let index = AnnoyIndex<Float>(itemLength: embedding_dim, metric: .euclidean) - -// // try? index.addItems(items: &database_embedding) -// // try? index.build(numTrees: 50) - -// // let results = index.getNNsForVector(vector: &query_embedding, neighbors: 8) - -// // // if let finalresult = results { -// // // let extractedIndeices = finalresult.indices -// // // for index in extractedIndeices { -// // // if index < docs.count { -// // // print(docs[index]) -// // // } else { -// // // print("Index \(index) out of range.") -// // // } -// // // } -// // // } -// // print(results) -// print(database_embedding) } } #endif -- GitLab