Skip to content

Commit 4abbb19

Browse files
thecoopafoucret
authored andcommitted
Revert "Test ES|QL bfloat16 support (elastic#138499)"
This reverts commit 6f70507.
1 parent 3d5fd95 commit 4abbb19

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/DenseVectorFieldTypeIT.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ private enum VectorSourceOptions {
6161
.collect(Collectors.toSet());
6262

6363
public static final float DELTA = 1e-7F;
64-
public static final float BFLOAT16_DELTA = 1e-2F;
6564

6665
private final ElementType elementType;
6766
private final DenseVectorFieldMapper.VectorSimilarity similarity;
@@ -71,7 +70,7 @@ private enum VectorSourceOptions {
7170
@ParametersFactory
7271
public static Iterable<Object[]> parameters() throws Exception {
7372
List<Object[]> params = new ArrayList<>();
74-
for (ElementType elementType : List.of(ElementType.BYTE, ElementType.FLOAT, ElementType.BIT, ElementType.BFLOAT16)) {
73+
for (ElementType elementType : List.of(ElementType.BYTE, ElementType.FLOAT, ElementType.BIT)) {
7574
// Test all similarities
7675
for (DenseVectorFieldMapper.VectorSimilarity similarity : DenseVectorFieldMapper.VectorSimilarity.values()) {
7776
if (elementType == ElementType.BIT && similarity != DenseVectorFieldMapper.VectorSimilarity.L2_NORM) {
@@ -138,10 +137,8 @@ public void testRetrieveTopNDenseVectorFieldData() {
138137
} else {
139138
assertNotNull(actualVector);
140139
assertEquals(expectedVector.size(), actualVector.size());
141-
142-
float delta = elementType == ElementType.BFLOAT16 ? BFLOAT16_DELTA : DELTA;
143140
for (int i = 0; i < expectedVector.size(); i++) {
144-
assertEquals(expectedVector.get(i).floatValue(), actualVector.get(i).floatValue(), delta);
141+
assertEquals(expectedVector.get(i).floatValue(), actualVector.get(i).floatValue(), DELTA);
145142
}
146143
}
147144
});
@@ -170,14 +167,12 @@ public void testRetrieveDenseVectorFieldData() {
170167
} else {
171168
assertNotNull(actualVector);
172169
assertEquals(expectedVector.size(), actualVector.size());
173-
174-
float delta = elementType == ElementType.BFLOAT16 ? BFLOAT16_DELTA : DELTA;
175170
for (int i = 0; i < actualVector.size(); i++) {
176171
assertEquals(
177172
"Actual: " + actualVector + "; expected: " + expectedVector,
178173
expectedVector.get(i).floatValue(),
179174
actualVector.get(i).floatValue(),
180-
delta
175+
DELTA
181176
);
182177
}
183178
}
@@ -258,13 +253,12 @@ public void setup() throws IOException {
258253
} else {
259254
for (int j = 0; j < numDims; j++) {
260255
switch (elementType) {
261-
case FLOAT, BFLOAT16 -> vector.add(randomFloatBetween(0F, 1F, true));
256+
case FLOAT -> vector.add(randomFloatBetween(0F, 1F, true));
262257
case BYTE, BIT -> vector.add((byte) randomIntBetween(-128, 127));
263258
default -> throw new IllegalArgumentException("Unexpected element type: " + elementType);
264259
}
265260
}
266-
if ((elementType == ElementType.FLOAT || elementType == ElementType.BFLOAT16)
267-
&& (similarity == DenseVectorFieldMapper.VectorSimilarity.DOT_PRODUCT || rarely())) {
261+
if ((elementType == ElementType.FLOAT) && (similarity == DenseVectorFieldMapper.VectorSimilarity.DOT_PRODUCT || rarely())) {
268262
// Normalize the vector
269263
float magnitude = DenseVector.getMagnitude(vector);
270264
vector.replaceAll(number -> number.floatValue() / magnitude);

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/KnnFunctionIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ public static Iterable<Object[]> parameters() throws Exception {
5757
List<Object[]> params = new ArrayList<>();
5858
for (String indexType : ALL_DENSE_VECTOR_INDEX_TYPES) {
5959
params.add(new Object[] { DenseVectorFieldMapper.ElementType.FLOAT, indexType });
60-
params.add(new Object[] { DenseVectorFieldMapper.ElementType.BFLOAT16, indexType });
6160
}
6261
for (String indexType : NON_QUANTIZED_DENSE_VECTOR_INDEX_TYPES) {
6362
params.add(new Object[] { DenseVectorFieldMapper.ElementType.BYTE, indexType });
@@ -265,7 +264,7 @@ public void setup() throws IOException {
265264
List<Number> vector = new ArrayList<>(numDims);
266265
for (int j = 0; j < numDims; j++) {
267266
switch (elementType) {
268-
case FLOAT, BFLOAT16 -> vector.add(randomFloatBetween(0F, 1F, true));
267+
case FLOAT -> vector.add(randomFloatBetween(0F, 1F, true));
269268
case BYTE, BIT -> vector.add((byte) (randomFloatBetween(0F, 1F, true) * 127.0f));
270269
default -> throw new IllegalArgumentException("Unexpected element type: " + elementType);
271270
}

0 commit comments

Comments
 (0)