[MNT] Small NumPy 2 related fixes

.pre-commit-config.yaml

@@ -73,7 +73,8 @@ repos:
                 setup[.]cfg$
           exclude: |
             (?x)
-                cpp/src/tsne/cannylab/bh[.]cu$
+                cpp/src/tsne/cannylab/bh[.]cu$|
+                python/cuml/cuml/_thirdparty
         - id: verify-alpha-spec
     - repo: https://github.com/rapidsai/dependency-file-generator
       rev: v1.13.11

python/cuml/cuml/_thirdparty/sklearn/utils/sparsefuncs.py

@@ -214,7 +214,7 @@ def _sparse_min_or_max(X, axis, min_or_max):
         if np.isnan(m):
             if 'nan' in min_or_max:
                 m = 0
-        elif X.nnz != cpu_np.product(X.shape):
+        elif X.nnz != cpu_np.prod(X.shape):
             if 'min' in min_or_max:
                 m = m if m <= 0 else 0
             else:

python/cuml/cuml/internals/array.py

@@ -1163,12 +1163,16 @@ def from_input(
         if (
             not fail_on_order and order != arr.order and order != "K"
         ) or make_copy:
-            arr = cls(
-                arr.mem_type.xpy.array(
-                    arr.to_output("array"), order=order, copy=make_copy
-                ),
-                index=index,
-            )
+            if make_copy:
+                data = arr.mem_type.xpy.array(
+                    arr.to_output("array"), order=order
+                )
+            else:
+                data = arr.mem_type.xpy.asarray(
+                    arr.to_output("array"), order=order
+                )
+
+            arr = cls(data, index=index)
 
         n_rows = arr.shape[0]
 

python/cuml/cuml/tests/test_make_classification.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020-2023, NVIDIA CORPORATION.
+# Copyright (c) 2020-2024, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -115,7 +115,7 @@ def test_make_classification_informative_features():
 
             # Cluster by sign, viewed as strings to allow uniquing
             signs = np.sign(cp.asnumpy(X))
-            signs = signs.view(dtype="|S{0}".format(signs.strides[0]))
+            signs = signs.view(dtype="|S{0}".format(signs.strides[0])).ravel()
             unique_signs, cluster_index = np.unique(signs, return_inverse=True)
 
             assert (

python/cuml/cuml/tests/test_metrics.py

@@ -1065,7 +1065,7 @@ def test_pairwise_distances(metric: str, matrix_size, is_col_major):
     cp.testing.assert_array_almost_equal(S, S2, decimal=compare_precision)
 
     # Change precision of one parameter
-    Y = np.asfarray(Y, dtype=np.float32)
+    Y = np.asarray(Y, dtype=np.float32)
     S = pairwise_distances(X, Y, metric=metric)
     S2 = ref_dense_pairwise_dist(X, Y, metric=metric)
     cp.testing.assert_array_almost_equal(S, S2, decimal=compare_precision)
@@ -1074,8 +1074,8 @@ def test_pairwise_distances(metric: str, matrix_size, is_col_major):
     compare_precision = 2
 
     # Change precision of both parameters to float
-    X = np.asfarray(X, dtype=np.float32)
-    Y = np.asfarray(Y, dtype=np.float32)
+    X = np.asarray(X, dtype=np.float32)
+    Y = np.asarray(Y, dtype=np.float32)
     S = pairwise_distances(X, Y, metric=metric)
     S2 = ref_dense_pairwise_dist(X, Y, metric=metric)
     cp.testing.assert_array_almost_equal(S, S2, decimal=compare_precision)
@@ -1132,8 +1132,8 @@ def test_pairwise_distances_sklearn_comparison(metric: str, matrix_size):
     # For fp32, compare at 4 decimals, (3 places less than the ~7 max)
     compare_precision = 4
 
-    X = np.asfarray(X, dtype=np.float32)
-    Y = np.asfarray(Y, dtype=np.float32)
+    X = np.asarray(X, dtype=np.float32)
+    Y = np.asarray(Y, dtype=np.float32)
 
     # Compare to sklearn, fp32
     S = pairwise_distances(X, Y, metric=metric)
@@ -1228,7 +1228,7 @@ def test_pairwise_distances_exceptions():
 
     X_int = rng.randint(10, size=(5, 4))
     X_double = rng.random_sample((5, 4))
-    X_float = np.asfarray(X_double, dtype=np.float32)
+    X_float = np.asarray(X_double, dtype=np.float32)
     X_bool = rng.choice([True, False], size=(5, 4))
 
     # Test int inputs (only float/double accepted at this time)

python/cuml/cuml/tests/test_umap.py

@@ -420,9 +420,9 @@ def get_embedding(n_components, random_state):
         )
         return reducer.fit_transform(data, convert_dtype=True)
 
-    state = copy.copy(random_state)
+    state = copy.deepcopy(random_state)
     cuml_embedding1 = get_embedding(n_components, state)
-    state = copy.copy(random_state)
+    state = copy.deepcopy(random_state)
     cuml_embedding2 = get_embedding(n_components, state)
 
     assert not np.isnan(cuml_embedding1).any()
@@ -475,9 +475,9 @@ def get_embedding(n_components, random_state):
         reducer.fit(fit_data, convert_dtype=True)
         return reducer.transform(transform_data, convert_dtype=True)
 
-    state = copy.copy(random_state)
+    state = copy.deepcopy(random_state)
     cuml_embedding1 = get_embedding(n_components, state)
-    state = copy.copy(random_state)
+    state = copy.deepcopy(random_state)
     cuml_embedding2 = get_embedding(n_components, state)
 
     assert not np.isnan(cuml_embedding1).any()