Merge branch 'branch-25.08' into moar_shellcheck

Author: gforsyth

cpp/include/cuvs/neighbors/tiered_index.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, NVIDIA CORPORATION.
+ * Copyright (c) 2024-2025, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,11 +32,11 @@ extern "C" {
 /**
  * @brief Enum to hold which ANN algorithm is being used in the tiered index
  */
-enum cuvsTieredIndexANNAlgo {
+typedef enum {
   CUVS_TIERED_INDEX_ALGO_CAGRA,
   CUVS_TIERED_INDEX_ALGO_IVF_FLAT,
   CUVS_TIERED_INDEX_ALGO_IVF_PQ
-};
+} cuvsTieredIndexANNAlgo;
 
 /**
  * @defgroup tiered_index_c_index Tiered Index

cpp/tests/neighbors/c_api.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, NVIDIA CORPORATION.
+ * Copyright (c) 2024-2025, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,53 @@
 
 #include <cuvs/core/c_api.h>
 #include <cuvs/neighbors/cagra.h>
+#include <cuvs/neighbors/tiered_index.h>
+
+#include <dlpack/dlpack.h>
+
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-int main()
+void test_compile_cagra()
 {
   // simple smoke test to make sure that we can compile the cagra.h API
   // using a c compiler. This isn't aiming to be a full test, just checking
   // that the exposed C-API is valid C code and doesn't contain C++ features
+  assert(!"test_compile_cagra is not meant to be run");
+
   cuvsCagraIndex_t index;
   cuvsCagraIndexCreate(&index);
   cuvsCagraIndexDestroy(index);
+}
+
+void test_compile_tiered_index()
+{
+  // Smoke test to ensure that the tiered_index.h API compiles correctly
+  // using a c compiler. Not a full test.
+  assert(!"test_compile_tiered_index is not meant to be run");
+
+  cuvsTieredIndex_t tiered_index;
+  cuvsTieredIndexCreate(&tiered_index);
+  cuvsTieredIndexDestroy(tiered_index);
+
+  cuvsTieredIndexParams_t index_params;
+  cuvsResources_t resources;
+  cuvsFilter prefilter;
+  DLManagedTensor dataset, neighbors, distances;
+  cuvsTieredIndexParamsCreate(&index_params);
+  cuvsTieredIndexParamsDestroy(index_params);
+  cuvsTieredIndexBuild(resources, index_params, &dataset, tiered_index);
+  cuvsTieredIndexSearch(resources, NULL, tiered_index, &dataset, &neighbors, &distances, prefilter);
+  cuvsTieredIndexExtend(resources, &dataset, tiered_index);
+}
+
+int main()
+{
+  // These are smoke tests that check that the C-APIs compile with a C compiler.
+  // These are not meant to be run.
+  test_compile_cagra();
+  test_compile_tiered_index();
+
   return 0;
 }

java/README.md

@@ -25,6 +25,18 @@ do `./build.sh java` in the top level directory or just do `./build.sh` in this
 
 Run `./build.sh --run-java-tests` from this directory.
 
+To run a single test:
+```sh
+cd cuvs-java/
+mvn verify -Dintegration-test=com.nvidia.cuvs.CagraBuildAndSearchIT
+```
+Be sure to set (manually, if needed) your `LD_LIBRARY_PATH` to include the directory with the appropriate (matching)
+version of `libcuvs.so`.
+Also, ensure that your panama bindings are up-to-date. They can be re-generated by running:
+```sh
+./panama-bindings/generate-bindings.sh
+```
+
 
 ## Examples