From e764106f7dbf3a3a0921b9645f7e60930a6dca72 Mon Sep 17 00:00:00 2001
From: Mingchung Xia <mingchung.xia@gmail.com>
Date: Mon, 25 Mar 2024 23:57:06 -0400
Subject: [PATCH] Exclude Nifty due to fail retrofit
---
Package.resolved | 9 ---------
Package.swift | 4 ++--
.../HNSW/Metrics/CartesianDistanceMetric.swift | 4 +++-
.../HNSW/Metrics/CosineSimilarityMetric.swift | 4 +++-
4 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/Package.resolved b/Package.resolved
index 102feccf..5f2e68ff 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -27,15 +27,6 @@
"version" : "2.2.0"
}
},
- {
- "identity" : "nifty",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/mingchungx/nifty.git",
- "state" : {
- "branch" : "master",
- "revision" : "ac093ab6a67e4c6c5cfccbe67c65dac06111cf6a"
- }
- },
{
"identity" : "similarity-topology",
"kind" : "remoteSourceControl",
diff --git a/Package.swift b/Package.swift
index f830a216..91787361 100644
--- a/Package.swift
+++ b/Package.swift
@@ -22,7 +22,7 @@ let package = Package(
.package(url: "https://github.com/L1MeN9Yu/Elva", .upToNextMajor(from: "2.1.3")),
.package(url: "https://github.com/JadenGeller/similarity-topology", .exact("0.1.14")),
.package(url: "https://github.com/Jounce/Surge.git", .upToNextMajor(from: "2.0.0")),
- .package(url: "https://github.com/mingchungx/nifty.git", .branch("master"))
+// .package(url: "https://github.com/mingchungx/nifty.git", .branch("master"))
],
targets: [
.target(
@@ -32,7 +32,7 @@ let package = Package(
.product(name: "HNSWEphemeral", package: "similarity-topology"),
.product(name: "HNSWDurable", package: "similarity-topology", condition: .when(platforms: [.macOS])),
.product(name: "HNSWSample", package: "similarity-topology", condition: .when(platforms: [.macOS])),
- .product(name: "Nifty", package: "Nifty"),
+// .product(name: "Nifty", package: "Nifty"),
.product(name: "ZSTD", package: "Elva"),
.byName(name: "Surge", condition: .when(platforms: [.macOS])),
],
diff --git a/Sources/SwiftNLP/1. Data Collection/HNSW/Metrics/CartesianDistanceMetric.swift b/Sources/SwiftNLP/1. Data Collection/HNSW/Metrics/CartesianDistanceMetric.swift
index 8173b321..a66009fc 100644
--- a/Sources/SwiftNLP/1. Data Collection/HNSW/Metrics/CartesianDistanceMetric.swift
+++ b/Sources/SwiftNLP/1. Data Collection/HNSW/Metrics/CartesianDistanceMetric.swift
@@ -38,7 +38,9 @@ public struct CartesianDistanceMetric<Vector: Collection & Codable>: SimilarityM
}
#else
-import Nifty
+//import Nifty
+
+// MARK: Nifty is too outdated to retrofit our code, even after updating its swift-tools-version to 5.9.
/// This implementation may be less efficient on Linux
public struct CartesianDistanceMetric<Vector: Collection & Codable>: SimilarityMetric where Vector.Element: BinaryFloatingPoint {
diff --git a/Sources/SwiftNLP/1. Data Collection/HNSW/Metrics/CosineSimilarityMetric.swift b/Sources/SwiftNLP/1. Data Collection/HNSW/Metrics/CosineSimilarityMetric.swift
index e793d911..b1a35e2a 100644
--- a/Sources/SwiftNLP/1. Data Collection/HNSW/Metrics/CosineSimilarityMetric.swift
+++ b/Sources/SwiftNLP/1. Data Collection/HNSW/Metrics/CosineSimilarityMetric.swift
@@ -53,7 +53,9 @@ public struct CosineSimilarityMetric<Vector: Collection & Codable>: SimilarityMe
}
#else
-import Nifty
+//import Nifty
+
+// MARK: Nifty is too outdated to retrofit our code, even after updating its swift-tools-version to 5.9.
/// This implementation may be less efficient on Linux
public struct CosineSimilarityMetric<Vector: Collection & Codable>: SimilarityMetric where Vector.Element: BinaryFloatingPoint {
--
GitLab