Fix merge main

Signed-off-by: Adam Li <adam2392@gmail.com>
neurodata · Sep 8, 2023 · ea330a7 · ea330a7
1 parent c634b8a
commit ea330a7
Show file tree

Hide file tree

Showing 17 changed files with 3,034 additions and 750 deletions.
diff --git a/Makefile b/Makefile
@@ -62,3 +62,6 @@ doc-noplot: inplace
 
 code-analysis:
 	build_tools/linting.sh
+
+build-dev:
+	pip install --verbose --no-build-isolation --editable .
diff --git a/setup.py b/setup.py
@@ -225,10 +225,10 @@ def check_package_status(package, min_version):
         {"sources": ["_cdnmf_fast.pyx"], "include_np": True},
     ],
     "ensemble": [
-        {"sources": ["_gradient_boosting.pyx"], "include_np": True},
+        {"sources": ["_gradient_boosting.pyx"], "language": "c++", "include_np": True},
     ],
     "ensemble._hist_gradient_boosting": [
-        {"sources": ["_gradient_boosting.pyx"], "include_np": True},
+        {"sources": ["_gradient_boosting.pyx"], "language": "c++", "include_np": True},
         {"sources": ["histogram.pyx"], "include_np": True},
         {"sources": ["splitting.pyx"], "include_np": True},
         {"sources": ["_binning.pyx"], "include_np": True},
@@ -310,7 +310,7 @@ def check_package_status(package, min_version):
         {"sources": ["_ball_tree.pyx.tp"], "include_np": True},
         {"sources": ["_kd_tree.pyx.tp"], "include_np": True},
         {"sources": ["_partition_nodes.pyx"], "language": "c++", "include_np": True},
-        {"sources": ["_quad_tree.pyx"], "include_np": True},
+        {"sources": ["_quad_tree.pyx"], "language": "c++", "include_np": True},
     ],
     "svm": [
         {
@@ -378,9 +378,24 @@ def check_package_status(package, min_version):
             "include_np": True,
             "optimization_level": "O3",
         },
-        {"sources": ["_splitter.pyx"], "include_np": True, "optimization_level": "O3"},
-        {"sources": ["_criterion.pyx"], "include_np": True, "optimization_level": "O3"},
-        {"sources": ["_utils.pyx"], "include_np": True, "optimization_level": "O3"},
+        {
+            "sources": ["_splitter.pyx"],
+            "include_np": True,
+            "language": "c++",
+            "optimization_level": "O3",
+        },
+        {
+            "sources": ["_criterion.pyx"],
+            "include_np": True,
+            "language": "c++",
+            "optimization_level": "O3",
+        },
+        {
+            "sources": ["_utils.pyx"],
+            "include_np": True,
+            "language": "c++",
+            "optimization_level": "O3",
+        },
     ],
     "utils": [
         {"sources": ["sparsefuncs_fast.pyx"], "include_np": True},