Merge branch 'spectral-clustering' of https://github.com/aamijar/cuvs into spectral-clustering

aamijar · aamijar · commit f377524a742b · 2025-10-22T23:01:51.000Z
diff --git a/conda/environments/bench_ann_cuda-129_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-129_arch-aarch64.yaml
@@ -35,7 +35,7 @@ dependencies:
 - matplotlib-base>=3.9
 - nccl>=2.19
 - ninja
-- nlohmann_json>=3.11.2
+- nlohmann_json>=3.12.0
 - openblas
 - pandas
 - pylibraft==25.12.*,>=0.0.0a0
diff --git a/conda/environments/bench_ann_cuda-129_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-129_arch-x86_64.yaml
@@ -38,7 +38,7 @@ dependencies:
 - mkl-devel=2023
 - nccl>=2.19
 - ninja
-- nlohmann_json>=3.11.2
+- nlohmann_json>=3.12.0
 - openblas
 - pandas
 - pylibraft==25.12.*,>=0.0.0a0
diff --git a/conda/environments/bench_ann_cuda-130_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-130_arch-aarch64.yaml
@@ -35,7 +35,7 @@ dependencies:
 - matplotlib-base>=3.9
 - nccl>=2.19
 - ninja
-- nlohmann_json>=3.11.2
+- nlohmann_json>=3.12.0
 - openblas
 - pandas
 - pylibraft==25.12.*,>=0.0.0a0
diff --git a/conda/environments/bench_ann_cuda-130_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-130_arch-x86_64.yaml
@@ -38,7 +38,7 @@ dependencies:
 - mkl-devel=2023
 - nccl>=2.19
 - ninja
-- nlohmann_json>=3.11.2
+- nlohmann_json>=3.12.0
 - openblas
 - pandas
 - pylibraft==25.12.*,>=0.0.0a0
diff --git a/conda/recipes/cuvs-bench-cpu/conda_build_config.yaml b/conda/recipes/cuvs-bench-cpu/conda_build_config.yaml
@@ -20,4 +20,4 @@ h5py_version:
   - ">=3.8.0"
 
 nlohmann_json_version:
-  - ">=3.11.2"
+  - ">=3.12.0"
diff --git a/cpp/cmake/thirdparty/get_nlohmann_json.cmake b/cpp/cmake/thirdparty/get_nlohmann_json.cmake
@@ -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.
@@ -35,8 +35,8 @@ function(find_and_configure_nlohmann_json)
 
 endfunction()
 
-find_and_configure_nlohmann_json(VERSION  3.11.2
+find_and_configure_nlohmann_json(VERSION  3.12.0
         FORK             nlohmann
-        PINNED_TAG       v3.11.2
+        PINNED_TAG       v3.12.0
         EXCLUDE_FROM_ALL ON
         )
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -453,7 +453,7 @@ dependencies:
     common:
       - output_types: [conda, pyproject, requirements]
         packages:
-          - nlohmann_json>=3.11.2
+          - nlohmann_json>=3.12.0
           - glog>=0.6.0
           - h5py>=3.8.0
           - benchmark>=1.8.2
