Revert "Adjust default params for Cagra Index build (elastic#136650) (elastic#136710)"

Bad recall for high dims data such as openai_vector

This reverts commit 8b3474e.

Author: mayya-sharipova

docs/changelog/136650.yaml

@@ -92,21 +92,23 @@ private static KnnVectorsFormat getVectorsFormat(DenseVectorFieldMapper.DenseVec
         if (indexOptions.getType() == DenseVectorFieldMapper.VectorIndexType.HNSW) {
             DenseVectorFieldMapper.HnswIndexOptions hnswIndexOptions = (DenseVectorFieldMapper.HnswIndexOptions) indexOptions;
             int efConstruction = hnswIndexOptions.efConstruction();
-            int m = hnswIndexOptions.m();
             if (efConstruction == HnswGraphBuilder.DEFAULT_BEAM_WIDTH) {
-                m = ES92GpuHnswVectorsFormat.DEFAULT_MAX_CONN;
-                efConstruction = ES92GpuHnswVectorsFormat.DEFAULT_BEAM_WIDTH; // default value for GPU graph construction
+                efConstruction = ES92GpuHnswVectorsFormat.DEFAULT_BEAM_WIDTH; // default value for GPU graph construction is 128
             }
-            return new ES92GpuHnswVectorsFormat(m, efConstruction);
+            return new ES92GpuHnswVectorsFormat(hnswIndexOptions.m(), efConstruction);
         } else if (indexOptions.getType() == DenseVectorFieldMapper.VectorIndexType.INT8_HNSW) {
             DenseVectorFieldMapper.Int8HnswIndexOptions int8HnswIndexOptions = (DenseVectorFieldMapper.Int8HnswIndexOptions) indexOptions;
             int efConstruction = int8HnswIndexOptions.efConstruction();
-            int m = int8HnswIndexOptions.m();
             if (efConstruction == HnswGraphBuilder.DEFAULT_BEAM_WIDTH) {
-                m = ES92GpuHnswVectorsFormat.DEFAULT_MAX_CONN;
-                efConstruction = ES92GpuHnswVectorsFormat.DEFAULT_BEAM_WIDTH; // default value for GPU graph construction
+                efConstruction = ES92GpuHnswVectorsFormat.DEFAULT_BEAM_WIDTH; // default value for GPU graph construction is 128
             }
-            return new ES92GpuHnswSQVectorsFormat(m, efConstruction, int8HnswIndexOptions.confidenceInterval(), 7, false);
+            return new ES92GpuHnswSQVectorsFormat(
+                int8HnswIndexOptions.m(),
+                efConstruction,
+                int8HnswIndexOptions.confidenceInterval(),
+                7,
+                false
+            );
         } else {
             throw new IllegalArgumentException(
                 "GPU vector indexing is not supported on this vector type: [" + indexOptions.getType() + "]"

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

@@ -36,8 +36,8 @@ public class ES92GpuHnswVectorsFormat extends KnnVectorsFormat {
     static final String LUCENE99_HNSW_VECTOR_INDEX_EXTENSION = "vex";
     static final int LUCENE99_VERSION_CURRENT = VERSION_GROUPVARINT;
 
-    public static final int DEFAULT_MAX_CONN = 10; // graph degree
-    public static final int DEFAULT_BEAM_WIDTH = 16; // intermediate graph degree
+    static final int DEFAULT_MAX_CONN = 16; // graph degree
+    public static final int DEFAULT_BEAM_WIDTH = 128; // intermediate graph degree
     static final int MIN_NUM_VECTORS_FOR_GPU_BUILD = 2;
 
     private static final FlatVectorsFormat flatVectorsFormat = new Lucene99FlatVectorsFormat(

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

@@ -323,7 +323,6 @@ private CagraIndex buildGPUIndex(
             .withCagraGraphBuildAlgo(CagraIndexParams.CagraGraphBuildAlgo.NN_DESCENT)
             .withGraphDegree(M)
             .withIntermediateGraphDegree(beamWidth)
-            .withNNDescentNumIterations(5)
             .withMetric(distanceType)
             .build();
 

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

@@ -44,7 +44,7 @@ public void testKnnVectorsFormat() throws IOException {
         // TODO improve test with custom parameters
         KnnVectorsFormat knnVectorsFormat = getKnnVectorsFormat("hnsw");
         String expectedStr = "Lucene99HnswVectorsFormat(name=Lucene99HnswVectorsFormat, "
-            + "maxConn=10, beamWidth=16, flatVectorFormat=Lucene99FlatVectorsFormat)";
+            + "maxConn=16, beamWidth=128, flatVectorFormat=Lucene99FlatVectorsFormat)";
         assertEquals(expectedStr, knnVectorsFormat.toString());
     }
 
@@ -53,7 +53,7 @@ public void testKnnQuantizedHNSWVectorsFormat() throws IOException {
         // TOD improve the test with custom parameters
         KnnVectorsFormat knnVectorsFormat = getKnnVectorsFormat("int8_hnsw");
         String expectedStr = "Lucene99HnswVectorsFormat(name=Lucene99HnswVectorsFormat, "
-            + "maxConn=10, beamWidth=16, flatVectorFormat=ES814ScalarQuantizedVectorsFormat";
+            + "maxConn=16, beamWidth=128, flatVectorFormat=ES814ScalarQuantizedVectorsFormat";
         assertTrue(knnVectorsFormat.toString().startsWith(expectedStr));
     }