Skip to content

Revert "[DiskBBQ] Add bulk scoring for int7 centroid scoring (#138204)" #138309

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

Merged
merged 1 commit into from
Nov 19, 2025
+5 −67
Merged

Revert "[DiskBBQ] Add bulk scoring for int7 centroid scoring (#138204)" #138309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions docs/changelog/138204.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion libs/native/libraries/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ configurations {
}

var zstdVersion = "1.5.5"
var vecVersion = "1.0.14"
var vecVersion = "1.0.13"

repositories {
exclusiveContent {
Expand Down
2 changes: 0 additions & 2 deletions libs/native/src/main/java/org/elasticsearch/nativeaccess/VectorSimilarityFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ public interface VectorSimilarityFunctions {
*/
MethodHandle dotProductHandle7u();

MethodHandle dotProductHandle7uBulk();

/**
* Produces a method handle returning the square distance of byte (unsigned int7) vectors.
*
Expand Down
35 changes: 0 additions & 35 deletions libs/native/src/main/java/org/elasticsearch/nativeaccess/jdk/JdkVectorLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ public final class JdkVectorLibrary implements VectorLibrary {
static final Logger logger = LogManager.getLogger(JdkVectorLibrary.class);

static final MethodHandle dot7u$mh;
static final MethodHandle dot7uBulk$mh;
static final MethodHandle sqr7u$mh;
static final MethodHandle cosf32$mh;
static final MethodHandle dotf32$mh;
Expand All @@ -54,11 +53,6 @@ public final class JdkVectorLibrary implements VectorLibrary {
FunctionDescriptor.of(JAVA_INT, ADDRESS, ADDRESS, JAVA_INT),
LinkerHelperUtil.critical()
);
dot7uBulk$mh = downcallHandle(
"dot7u_bulk_2",
FunctionDescriptor.ofVoid(ADDRESS, ADDRESS, JAVA_INT, JAVA_INT, ADDRESS),
LinkerHelperUtil.critical()
);
sqr7u$mh = downcallHandle(
"sqr7u_2",
FunctionDescriptor.of(JAVA_INT, ADDRESS, ADDRESS, JAVA_INT),
Expand All @@ -85,11 +79,6 @@ public final class JdkVectorLibrary implements VectorLibrary {
FunctionDescriptor.of(JAVA_INT, ADDRESS, ADDRESS, JAVA_INT),
LinkerHelperUtil.critical()
);
dot7uBulk$mh = downcallHandle(
"dot7u_bulk",
FunctionDescriptor.ofVoid(ADDRESS, ADDRESS, JAVA_INT, JAVA_INT, ADDRESS),
LinkerHelperUtil.critical()
);
sqr7u$mh = downcallHandle(
"sqr7u",
FunctionDescriptor.of(JAVA_INT, ADDRESS, ADDRESS, JAVA_INT),
Expand Down Expand Up @@ -119,7 +108,6 @@ public final class JdkVectorLibrary implements VectorLibrary {
enable them in your OS/Hypervisor/VM/container""");
}
dot7u$mh = null;
dot7uBulk$mh = null;
sqr7u$mh = null;
cosf32$mh = null;
dotf32$mh = null;
Expand Down Expand Up @@ -154,10 +142,6 @@ static int dotProduct7u(MemorySegment a, MemorySegment b, int length) {
return dot7u(a, b, length);
}

static void dotProduct7uBulk(MemorySegment a, MemorySegment b, int length, int count, MemorySegment result) {
dot7uBulk(a, b, length, count, result);
}

/**
* Computes the square distance of given unsigned int7 byte vectors.
*
Expand Down Expand Up @@ -226,14 +210,6 @@ private static int dot7u(MemorySegment a, MemorySegment b, int length) {
}
}

private static void dot7uBulk(MemorySegment a, MemorySegment b, int length, int count, MemorySegment result) {
try {
JdkVectorLibrary.dot7uBulk$mh.invokeExact(a, b, length, count, result);
} catch (Throwable t) {
throw new AssertionError(t);
}
}

private static int sqr7u(MemorySegment a, MemorySegment b, int length) {
try {
return (int) JdkVectorLibrary.sqr7u$mh.invokeExact(a, b, length);
Expand Down Expand Up @@ -267,7 +243,6 @@ private static float sqrf32(MemorySegment a, MemorySegment b, int length) {
}

static final MethodHandle DOT_HANDLE_7U;
static final MethodHandle DOT_HANDLE_7U_BULK;
static final MethodHandle SQR_HANDLE_7U;
static final MethodHandle COS_HANDLE_FLOAT32;
static final MethodHandle DOT_HANDLE_FLOAT32;
Expand All @@ -278,11 +253,6 @@ private static float sqrf32(MemorySegment a, MemorySegment b, int length) {
var lookup = MethodHandles.lookup();
var mt = MethodType.methodType(int.class, MemorySegment.class, MemorySegment.class, int.class);
DOT_HANDLE_7U = lookup.findStatic(JdkVectorSimilarityFunctions.class, "dotProduct7u", mt);
DOT_HANDLE_7U_BULK = lookup.findStatic(
JdkVectorSimilarityFunctions.class,
"dotProduct7uBulk",
MethodType.methodType(void.class, MemorySegment.class, MemorySegment.class, int.class, int.class, MemorySegment.class)
);
SQR_HANDLE_7U = lookup.findStatic(JdkVectorSimilarityFunctions.class, "squareDistance7u", mt);

mt = MethodType.methodType(float.class, MemorySegment.class, MemorySegment.class, int.class);
Expand All @@ -299,11 +269,6 @@ public MethodHandle dotProductHandle7u() {
return DOT_HANDLE_7U;
}

@Override
public MethodHandle dotProductHandle7uBulk() {
return DOT_HANDLE_7U_BULK;
}

@Override
public MethodHandle squareDistanceHandle7u() {
return SQR_HANDLE_7U;
Expand Down
15 changes: 0 additions & 15 deletions libs/simdvec/src/main21/java/org/elasticsearch/simdvec/internal/Similarities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,8 @@ public class Similarities {
.orElseThrow(AssertionError::new);

static final MethodHandle DOT_PRODUCT_7U = DISTANCE_FUNCS.dotProductHandle7u();
static final MethodHandle DOT_PRODUCT_7U_BULK = DISTANCE_FUNCS.dotProductHandle7uBulk();
static final MethodHandle SQUARE_DISTANCE_7U = DISTANCE_FUNCS.squareDistanceHandle7u();

static void dotProduct7uBulk(MemorySegment a, MemorySegment b, int length, int count, MemorySegment scores) {
try {
DOT_PRODUCT_7U_BULK.invokeExact(a, b, length, count, scores);
} catch (Throwable e) {
if (e instanceof Error err) {
throw err;
} else if (e instanceof RuntimeException re) {
throw re;
} else {
throw new RuntimeException(e);
}
}
}

static int dotProduct7u(MemorySegment a, MemorySegment b, int length) {
try {
return (int) DOT_PRODUCT_7U.invokeExact(a, b, length);
Expand Down
13 changes: 4 additions & 9 deletions ...rc/main22/java/org/elasticsearch/simdvec/internal/MemorySegmentES92Int7VectorsScorer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,14 @@ private long nativeInt7DotProduct(byte[] q) throws IOException {
return res;
}

private void nativeInt7DotProductBulk(byte[] q, int count, float[] scores) throws IOException {
final MemorySegment scoresSegment = MemorySegment.ofArray(scores);
final MemorySegment segment = memorySegment.asSlice(in.getFilePointer(), dimensions * count);
final MemorySegment querySegment = MemorySegment.ofArray(q);
Similarities.dotProduct7uBulk(segment, querySegment, dimensions, count, scoresSegment);
in.skipBytes(dimensions * count);
}

@Override
public void int7DotProductBulk(byte[] q, int count, float[] scores) throws IOException {
assert q.length == dimensions;
if (NATIVE_SUPPORTED) {
nativeInt7DotProductBulk(q, count, scores);
// TODO: can we speed up bulks in native code?
for (int i = 0; i < count; i++) {
scores[i] = nativeInt7DotProduct(q);
}
} else {
panamaInt7DotProductBulk(q, count, scores);
}
Expand Down