From 7e73281c4beb96ea04d946e390cf36a0c0e19269 Mon Sep 17 00:00:00 2001
From: Jim Wallace <james.wallace@uwaterloo.ca>
Date: Thu, 21 Dec 2023 21:23:04 -0500
Subject: [PATCH] Cleaning up Package.swift
---
Package.resolved | 27 ----------------
Package.swift | 12 +++----
.../3. Dimensionality Reduction/Matrix.swift | 32 +++++++++----------
3 files changed, 22 insertions(+), 49 deletions(-)
diff --git a/Package.resolved b/Package.resolved
index 147f9b26..a06bb941 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -27,24 +27,6 @@
"version" : "1.4.1"
}
},
- {
- "identity" : "nifty",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/ryan-lam/nifty",
- "state" : {
- "branch" : "master",
- "revision" : "e7f78723f36898476f884874ea757a57f80d868a"
- }
- },
- {
- "identity" : "plinth",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/dclelland/Plinth.git",
- "state" : {
- "revision" : "2eeda6c520a56ee5a35300a28b6353f343a3d5c4",
- "version" : "2.4.7"
- }
- },
{
"identity" : "surge",
"kind" : "remoteSourceControl",
@@ -72,15 +54,6 @@
"version" : "1.0.4"
}
},
- {
- "identity" : "swift-numerics",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/apple/swift-numerics",
- "state" : {
- "revision" : "0a5bc04095a675662cf24757cc0640aa2204253b",
- "version" : "1.0.2"
- }
- },
{
"identity" : "swiftannoy",
"kind" : "remoteSourceControl",
diff --git a/Package.swift b/Package.swift
index 282702ff..e5c3ed79 100644
--- a/Package.swift
+++ b/Package.swift
@@ -21,9 +21,9 @@ let package = Package(
.package(url: "https://github.com/swiftcsv/SwiftCSV.git", from: "0.8.0"),
.package(url: "https://github.com/Bersaelor/KDTree", .upToNextMajor(from: "1.4.1")),
.package(url: "https://github.com/apple/swift-collections", .upToNextMinor(from: "1.0.0")),
- .package(url: "https://github.com/dclelland/Plinth", from: "2.0.0"),
- .package(url: "https://github.com/ryan-lam/nifty", branch: "master"),
- .package(url: "https://github.com/nifty-swift/Nifty-libs.git", from: "1.0.0"),
+ //.package(url: "https://github.com/dclelland/Plinth", from: "2.0.0"),
+ //.package(url: "https://github.com/ryan-lam/nifty", branch: "master"),
+ //.package(url: "https://github.com/nifty-swift/Nifty-libs.git", from: "1.0.0"),
//.package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.0.0")),
//.package(url: "https://github.com/jjjkkkjjj/Matft", from: "0.3.3"),
],
@@ -38,9 +38,9 @@ let package = Package(
"SwiftCSV",
"KDTree",
.product(name: "Collections", package: "swift-collections"),
- "Plinth",
- .product(name: "CLapacke", package: "Nifty-libs"),
- .product(name: "CBlas", package: "Nifty-libs"),
+ //"Plinth",
+ //.product(name: "CLapacke", package: "Nifty-libs"),
+ //.product(name: "CBlas", package: "Nifty-libs"),
//"Matft"
],
resources: [.process("Resources")]
diff --git a/Sources/SwiftNLP/3. Dimensionality Reduction/Matrix.swift b/Sources/SwiftNLP/3. Dimensionality Reduction/Matrix.swift
index b2e057da..f359eaed 100644
--- a/Sources/SwiftNLP/3. Dimensionality Reduction/Matrix.swift
+++ b/Sources/SwiftNLP/3. Dimensionality Reduction/Matrix.swift
@@ -1,4 +1,4 @@
-import Plinth
+//import Plinth
////
//// matrix.swift
@@ -110,21 +110,21 @@ import Plinth
//}
//
// Covariance Matrix
-extension Matrix where Scalar == Float {
-
- func covarianceMatrix(inputMatrix: Matrix) -> Matrix {
- let t = inputMatrix.transposed()
- return inputMatrix <*> t
- }
-}
-
-extension Matrix where Scalar == Double {
-
- func covarianceMatrix(inputMatrix: Matrix) -> Matrix {
- let t = inputMatrix.transposed()
- return inputMatrix <*> t
- }
-}
+//extension Matrix where Scalar == Float {
+//
+// func covarianceMatrix(inputMatrix: Matrix) -> Matrix {
+// let t = inputMatrix.transposed()
+// return inputMatrix <*> t
+// }
+//}
+//
+//extension Matrix where Scalar == Double {
+//
+// func covarianceMatrix(inputMatrix: Matrix) -> Matrix {
+// let t = inputMatrix.transposed()
+// return inputMatrix <*> t
+// }
+//}
--
GitLab