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

fix: cosine distance #231

Merged
merged 4 commits into from
Jan 6, 2024
Merged

fix: cosine distance #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0204f68
fix: cosine distance
kemingy Jan 5, 2024
d355b04
fix sq and pq
kemingy Jan 5, 2024
dd2a597
rebase
kemingy Jan 6, 2024
f3fb3ab
fix doc
kemingy Jan 6, 2024
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ We support three operators to calculate the distance between two vectors.

- `<->`: squared Euclidean distance, defined as $\Sigma (x_i - y_i) ^ 2$.
- `<#>`: negative dot product, defined as $- \Sigma x_iy_i$.
- `<=>`: negative cosine similarity, defined as $- \frac{\Sigma x_iy_i}{\sqrt{\Sigma x_i^2 \Sigma y_i^2}}$.
- `<=>`: cosine distance, defined as $1 - \frac{\Sigma x_iy_i}{\sqrt{\Sigma x_i^2 \Sigma y_i^2}}$.

```sql
-- call the distance function through operators
Expand All @@ -115,7 +115,7 @@ We support three operators to calculate the distance between two vectors.
SELECT '[1, 2, 3]'::vector <-> '[3, 2, 1]'::vector;
-- negative dot product
SELECT '[1, 2, 3]'::vector <#> '[3, 2, 1]'::vector;
-- negative cosine similarity
-- cosine distance
SELECT '[1, 2, 3]'::vector <=> '[3, 2, 1]'::vector;
```

Expand Down
2 changes: 1 addition & 1 deletion crates/service/src/instance/metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pub struct Metadata {
}

impl Metadata {
const VERSION: u64 = 2;
const VERSION: u64 = 3;
const SOFT_VERSION: u64 = 1;
}

Expand Down
12 changes: 6 additions & 6 deletions crates/service/src/prelude/global/f16_cos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ impl G for F16Cos {
type L2 = F16L2;

fn distance(lhs: &[F16], rhs: &[F16]) -> F32 {
super::f16::cosine(lhs, rhs) * (-1.0)
F32(1.0) - super::f16::cosine(lhs, rhs)
}

fn elkan_k_means_normalize(vector: &mut [F16]) {
Expand Down Expand Up @@ -47,7 +47,7 @@ impl G for F16Cos {
x2 += _x * _x;
y2 += _y * _y;
}
xy / (x2 * y2).sqrt() * (-1.0)
F32(1.0) - xy / (x2 * y2).sqrt()
}

#[multiversion::multiversion(targets(
Expand All @@ -73,7 +73,7 @@ impl G for F16Cos {
x2 += _x * _x;
y2 += _y * _y;
}
xy / (x2 * y2).sqrt() * (-1.0)
F32(1.0) - xy / (x2 * y2).sqrt()
}

#[multiversion::multiversion(targets(
Expand Down Expand Up @@ -103,7 +103,7 @@ impl G for F16Cos {
x2 += _x2;
y2 += _y2;
}
xy / (x2 * y2).sqrt() * (-1.0)
F32(1.0) - xy / (x2 * y2).sqrt()
}

#[multiversion::multiversion(targets(
Expand Down Expand Up @@ -134,7 +134,7 @@ impl G for F16Cos {
x2 += _x2;
y2 += _y2;
}
xy / (x2 * y2).sqrt() * (-1.0)
F32(1.0) - xy / (x2 * y2).sqrt()
}

#[multiversion::multiversion(targets(
Expand Down Expand Up @@ -166,7 +166,7 @@ impl G for F16Cos {
x2 += _x2;
y2 += _y2;
}
xy / (x2 * y2).sqrt() * (-1.0)
F32(1.0) - xy / (x2 * y2).sqrt()
}
}

Expand Down
12 changes: 6 additions & 6 deletions crates/service/src/prelude/global/f32_cos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ impl G for F32Cos {
type L2 = F32L2;

fn distance(lhs: &[F32], rhs: &[F32]) -> F32 {
cosine(lhs, rhs) * (-1.0)
F32(1.0) - cosine(lhs, rhs)
}

fn elkan_k_means_normalize(vector: &mut [F32]) {
Expand Down Expand Up @@ -47,7 +47,7 @@ impl G for F32Cos {
x2 += _x * _x;
y2 += _y * _y;
}
xy / (x2 * y2).sqrt() * (-1.0)
F32(1.0) - xy / (x2 * y2).sqrt()
}

#[multiversion::multiversion(targets(
Expand All @@ -73,7 +73,7 @@ impl G for F32Cos {
x2 += _x * _x;
y2 += _y * _y;
}
xy / (x2 * y2).sqrt() * (-1.0)
F32(1.0) - xy / (x2 * y2).sqrt()
}

#[multiversion::multiversion(targets(
Expand Down Expand Up @@ -103,7 +103,7 @@ impl G for F32Cos {
x2 += _x2;
y2 += _y2;
}
xy / (x2 * y2).sqrt() * (-1.0)
F32(1.0) - xy / (x2 * y2).sqrt()
}

#[multiversion::multiversion(targets(
Expand Down Expand Up @@ -134,7 +134,7 @@ impl G for F32Cos {
x2 += _x2;
y2 += _y2;
}
xy / (x2 * y2).sqrt() * (-1.0)
F32(1.0) - xy / (x2 * y2).sqrt()
}

#[multiversion::multiversion(targets(
Expand Down Expand Up @@ -166,7 +166,7 @@ impl G for F32Cos {
x2 += _x2;
y2 += _y2;
}
xy / (x2 * y2).sqrt() * (-1.0)
F32(1.0) - xy / (x2 * y2).sqrt()
}
}

Expand Down
Loading