Skip to content

Commit 0372175

Browse files
committed
Merge remote-tracking branch 'upstream/es-gpu' into optimize-write-field
2 parents 4f9b98a + 3cd4405 commit 0372175

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

x-pack/plugin/gpu/src/main/java/org/elasticsearch/xpack/gpu/codec/ESGpuHnswVectorsWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ public void mergeOneField(FieldInfo fieldInfo, MergeState mergeState) throws IOE
467467
.fromInput(memorySegmentAccessInput, numVectors, fieldInfo.getVectorDimension(), dataType);
468468
datasetOrVectors = DatasetOrVectors.fromDataset(ds);
469469
} else {
470-
assert numVectors < MIN_NUM_VECTORS_FOR_GPU_BUILD : "numVectors: " + numVectors;
470+
// assert numVectors < MIN_NUM_VECTORS_FOR_GPU_BUILD : "numVectors: " + numVectors;
471471
// we don't really need real value for vectors here,
472472
// we just build a mock graph where every node is connected to every other node
473473
datasetOrVectors = DatasetOrVectors.fromDataset(

x-pack/plugin/gpu/src/test/java/org/elasticsearch/xpack/gpu/codec/ESGpuHnswVectorsFormatTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@
1010
import org.apache.lucene.index.VectorEncoding;
1111
import org.apache.lucene.index.VectorSimilarityFunction;
1212
import org.apache.lucene.tests.index.BaseKnnVectorsFormatTestCase;
13+
import org.apache.lucene.tests.util.LuceneTestCase;
1314
import org.apache.lucene.tests.util.TestUtil;
1415
import org.elasticsearch.common.logging.LogConfigurator;
1516
import org.elasticsearch.xpack.gpu.GPUSupport;
1617
import org.junit.BeforeClass;
1718

19+
// CuVS prints tons of logs to stdout
20+
@LuceneTestCase.SuppressSysoutChecks(bugUrl = "https://github.com/rapidsai/cuvs/issues/1310")
1821
public class ESGpuHnswVectorsFormatTests extends BaseKnnVectorsFormatTestCase {
1922

2023
static {

0 commit comments

Comments
 (0)