Skip to content

Commit a19caac

Browse files
committed
Merge branch 'main' into transport0
2 parents b02cb1a + 446942f commit a19caac

File tree

63 files changed

+1433
-290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1433
-290
lines changed

benchmarks/src/main/java/org/elasticsearch/benchmark/vector/OptimizedScalarQuantizerBenchmark.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public class OptimizedScalarQuantizerBenchmark {
4343

4444
float[] vector;
4545
float[] centroid;
46-
byte[] legacyDestination;
4746
int[] destination;
4847

4948
@Param({ "1", "4", "7" })
@@ -55,7 +54,6 @@ public class OptimizedScalarQuantizerBenchmark {
5554
public void init() {
5655
ThreadLocalRandom random = ThreadLocalRandom.current();
5756
// random byte arrays for binary methods
58-
legacyDestination = new byte[dims];
5957
destination = new int[dims];
6058
vector = new float[dims];
6159
centroid = new float[dims];
@@ -66,16 +64,9 @@ public void init() {
6664
}
6765

6866
@Benchmark
69-
public byte[] scalar() {
70-
osq.legacyScalarQuantize(vector, legacyDestination, bits, centroid);
71-
return legacyDestination;
72-
}
73-
74-
@Benchmark
75-
@Fork(jvmArgsPrepend = { "--add-modules=jdk.incubator.vector" })
76-
public byte[] legacyVector() {
77-
osq.legacyScalarQuantize(vector, legacyDestination, bits, centroid);
78-
return legacyDestination;
67+
public int[] scalar() {
68+
osq.scalarQuantize(vector, destination, bits, centroid);
69+
return destination;
7970
}
8071

8172
@Benchmark

docs/changelog/131599.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131599
2+
summary: Speed up `OptimizedScalarQuantizer`
3+
area: Vector Search
4+
type: enhancement
5+
issues: []

docs/changelog/131630.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131630
2+
summary: Fix memory usage estimation for ELSER models
3+
area: Machine Learning
4+
type: bug
5+
issues: []

docs/changelog/131677.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131677
2+
summary: Throw better exception if verifying empty repo
3+
area: Snapshot/Restore
4+
type: bug
5+
issues: []

docs/reference/query-languages/esql/_snippets/functions/description/v_cosine.md

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/description/v_dot_product.md

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/examples/v_cosine.md

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/examples/v_dot_product.md

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/layout/v_cosine.md

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/layout/v_dot_product.md

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)