uschindler commented on code in PR #14843: URL: https://github.com/apache/lucene/pull/14843#discussion_r2194725242
########## lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/faiss/FaissKnnVectorsFormatProvider.java: ########## @@ -0,0 +1,88 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.lucene.sandbox.codecs.faiss; + +import java.io.IOException; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.util.Arrays; +import java.util.stream.Collectors; +import org.apache.lucene.codecs.KnnVectorsFormat; +import org.apache.lucene.codecs.KnnVectorsReader; +import org.apache.lucene.codecs.KnnVectorsWriter; +import org.apache.lucene.index.SegmentReadState; +import org.apache.lucene.index.SegmentWriteState; + +/** + * Provides a Faiss-based vector format, see corresponding classes in {@code java21/} for docs! + * + * @lucene.experimental + */ +public class FaissKnnVectorsFormatProvider extends KnnVectorsFormat { + private final KnnVectorsFormat delegate; + + public FaissKnnVectorsFormatProvider() { + this(lookup()); + } + + public FaissKnnVectorsFormatProvider(String description, String indexParams) { + this(lookup(description, indexParams)); + } + + private FaissKnnVectorsFormatProvider(KnnVectorsFormat delegate) { + super(delegate.getName()); + this.delegate = delegate; + } + + private static KnnVectorsFormat lookup(Object... args) { + try { + MethodHandles.Lookup lookup = MethodHandles.lookup(); Review Comment: we have a private lookup here, so we can lookup a package private impl. ########## lucene/sandbox/src/java/org/apache/lucene/sandbox/codecs/faiss/FaissKnnVectorsFormatProvider.java: ########## @@ -0,0 +1,88 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.lucene.sandbox.codecs.faiss; + +import java.io.IOException; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.util.Arrays; +import java.util.stream.Collectors; +import org.apache.lucene.codecs.KnnVectorsFormat; +import org.apache.lucene.codecs.KnnVectorsReader; +import org.apache.lucene.codecs.KnnVectorsWriter; +import org.apache.lucene.index.SegmentReadState; +import org.apache.lucene.index.SegmentWriteState; + +/** + * Provides a Faiss-based vector format, see corresponding classes in {@code java21/} for docs! + * + * @lucene.experimental + */ +public class FaissKnnVectorsFormatProvider extends KnnVectorsFormat { Review Comment: I think this class should be named `FaissKnnVectorsFormat`. It is not a provider pattern. In MMapDir this is different, there it is a provider for IndexInputs. Instead the FaissKnnVectorsFormat in the java21 part should be package private (it is now public) and have a different name, e.g. 'FaissKnnVectorsFormatImpl' ########## gradle/generation/extract-jdk-apis.gradle: ########## @@ -17,7 +17,10 @@ def resources = scriptResources(buildscript) -configure(project(":lucene:core")) { +configure([ + project(":lucene:core"), + project(":lucene:sandbox"), Review Comment: unfortunately this causes also the vector API be replicated in the sandbox module.... I don't like that. It also adds useless JAR files again to the code. ########## lucene/sandbox/src/resources/META-INF/services/org.apache.lucene.codecs.KnnVectorsFormat: ########## @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +org.apache.lucene.sandbox.codecs.faiss.FaissKnnVectorsFormatProvider Review Comment: rename (see above) ########## lucene/sandbox/src/java21/org/apache/lucene/sandbox/codecs/faiss/FaissKnnVectorsFormat.java: ########## @@ -0,0 +1,120 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.lucene.sandbox.codecs.faiss; + +import static org.apache.lucene.util.hnsw.HnswGraphBuilder.DEFAULT_BEAM_WIDTH; +import static org.apache.lucene.util.hnsw.HnswGraphBuilder.DEFAULT_MAX_CONN; + +import java.io.IOException; +import java.util.Locale; +import org.apache.lucene.codecs.KnnVectorsFormat; +import org.apache.lucene.codecs.KnnVectorsReader; +import org.apache.lucene.codecs.KnnVectorsWriter; +import org.apache.lucene.codecs.hnsw.FlatVectorScorerUtil; +import org.apache.lucene.codecs.hnsw.FlatVectorsFormat; +import org.apache.lucene.codecs.lucene99.Lucene99FlatVectorsFormat; +import org.apache.lucene.index.SegmentReadState; +import org.apache.lucene.index.SegmentWriteState; + +/** + * A Faiss-based format to create and search vector indexes, using {@link LibFaissC} to interact + * with the native library. + * + * <p>The Faiss index is configured using its flexible <a + * href="https://github.com/facebookresearch/faiss/wiki/The-index-factory";>index factory</a>, which + * allows creating arbitrary indexes by "describing" them. These indexes can be tuned by <a + * href="https://github.com/facebookresearch/faiss/wiki/Index-IO,-cloning-and-hyper-parameter-tuning";>setting + * relevant parameters</a>. + * + * <p>A separate Faiss index is created per-segment, and uses the following files: + * + * <ul> + * <li><code>.faissm</code> (metadata file): stores field number, offset and length of actual + * Faiss index in data file. + * <li><code>.faissd</code> (data file): stores concatenated Faiss indexes for all fields. + * <li>All files required by {@link Lucene99FlatVectorsFormat} for storing raw vectors. + * </ul> + * + * <p>Note: Set the {@code $OMP_NUM_THREADS} environment variable to control <a + * href="https://github.com/facebookresearch/faiss/wiki/Threads-and-asynchronous-calls";>internal + * threading</a>. + * + * <p>TODO: There is no guarantee of backwards compatibility! + * + * @lucene.experimental + */ +public final class FaissKnnVectorsFormat extends KnnVectorsFormat { Review Comment: make package-private -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
