diff --git a/src/main/knn/KnnGraphTester.java b/src/main/knn/KnnGraphTester.java index ec262d7c..73e8e982 100644 --- a/src/main/knn/KnnGraphTester.java +++ b/src/main/knn/KnnGraphTester.java @@ -517,7 +517,7 @@ private void run(String... args) throws Exception { if (outputPath != null) { testSearch(indexPath, queryPath, queryStartIndex, outputPath, null); } else { - testSearch(indexPath, queryPath, queryStartIndex, null, getExactNN(docVectorsPath, indexPath, queryPath, queryStartIndex)); + testSearch(indexPath, queryPath, queryStartIndex, null, getExactNN(docVectorsPath, queryPath, queryStartIndex)); } if (operation.equals("-search-and-stats")) { // also print stats, after searching @@ -1022,9 +1022,9 @@ private int compareNN(int[] expected, int[] results) { * The method runs "numQueryVectors" target queries and returns "topK" nearest neighbors * for each of them. Nearest Neighbors are computed using exact match. */ - private int[][] getExactNN(Path docPath, Path indexPath, Path queryPath, int queryStartIndex) throws IOException, InterruptedException { + private int[][] getExactNN(Path docPath, Path queryPath, int queryStartIndex) throws IOException, InterruptedException { // look in working directory for cached nn file - String hash = Integer.toString(Objects.hash(docPath, indexPath, queryPath, numDocs, numQueryVectors, topK, similarityFunction.ordinal(), parentJoin, queryStartIndex, prefilter ? selectivity : 1f, prefilter ? randomSeed : 0f), 36); + String hash = Integer.toString(Objects.hash(docPath, queryPath, numDocs, numQueryVectors, topK, similarityFunction.ordinal(), parentJoin, queryStartIndex, prefilter ? selectivity : 1f, prefilter ? randomSeed : 0f), 36); String nnFileName = "nn-" + hash + ".bin"; Path nnPath = Paths.get(nnFileName); if (Files.exists(nnPath) && isNewer(nnPath, docPath, queryPath)) { diff --git a/src/python/initial_setup.py b/src/python/initial_setup.py index 02b3ae46..4c765a4f 100755 --- a/src/python/initial_setup.py +++ b/src/python/initial_setup.py @@ -29,8 +29,7 @@ DATA_FILES = [ # remote url, local name - ("https://luceneutil-corpus-files.s3.ca-central-1.amazonaws.com/enwiki-20120502-lines-1k-fixed-utf8-with-random-label.txt.lzma", - "enwiki-20120502-lines-1k-fixed-utf8-with-random-label.txt.lzma"), + ("https://luceneutil-corpus-files.s3.ca-central-1.amazonaws.com/enwiki-20120502-lines-1k-fixed-utf8-with-random-label.txt.lzma", "enwiki-20120502-lines-1k-fixed-utf8-with-random-label.txt.lzma"), # ("https://luceneutil-corpus-files.s3.ca-central-1.amazonaws.com/cohere-wikipedia-docs-768d.vec", "cohere-wikipedia-docs-768d.vec"), ("https://luceneutil-corpus-files.s3.ca-central-1.amazonaws.com/cohere-wikipedia-docs-5M-768d.vec", "cohere-wikipedia-docs-5M-768d.vec"), ("https://luceneutil-corpus-files.s3.ca-central-1.amazonaws.com/cohere-wikipedia-queries-768d.vec", "cohere-wikipedia-queries-768d.vec"),