Upgrade Numpy 2.0 (#664)

Author: tqtg

.circleci/config.yml

@@ -10,7 +10,6 @@ jobs:
       - image: cimg/python:3.10.2
         environment:
           LIMIT_NUMPY_VERSION: 2.0.0
-          LIMIT_SCIPY_VERSION: 1.13.1
     steps:
       - checkout
       - python/install-packages:
@@ -20,7 +19,7 @@ jobs:
           no_output_timeout: 30m
           command: |
             pip install --upgrade pip
-            pip install --only-binary=numpy,scipy "numpy<$LIMIT_NUMPY_VERSION" "scipy<=$LIMIT_SCIPY_VERSION" Cython pytest pytest-cov codecov
+            pip install --only-binary=numpy,scipy "numpy>$LIMIT_NUMPY_VERSION" Cython pytest pytest-cov codecov
             pip install -e .[tests]
       - run:
           name: Run tests

.github/workflows/python-package.yml

@@ -8,7 +8,7 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
-
+  
 jobs:
   build:
     name: Building on ${{ matrix.os }}
@@ -20,7 +20,6 @@ jobs:
         python-version: ["3.9", "3.10", "3.11", "3.12"]
     env:
       LIMIT_NUMPY_VERSION: 2.0.0
-      LIMIT_SCIPY_VERSION: 1.13.1
     steps:
     - name: Get number of CPU cores
       uses: SimenB/github-actions-cpu-cores@v2
@@ -63,7 +62,7 @@ jobs:
 
     - name: Install other dependencies
       run: |
-        python${{ matrix.python-version }} -m pip install Cython pytest pytest-cov flake8 "numpy<${{ env.LIMIT_NUMPY_VERSION }}" "scipy<=${{ env.LIMIT_SCIPY_VERSION }}"
+        python${{ matrix.python-version }} -m pip install Cython pytest pytest-cov flake8 "numpy>${{ env.LIMIT_NUMPY_VERSION }}" scipy
         python${{ matrix.python-version }} setup.py build_ext -j${{ steps.cpu-cores.outputs.count }}
         python${{ matrix.python-version }} -m pip install -e .[tests]
 

.github/workflows/python-publish.yml

@@ -14,7 +14,6 @@ on:
 
 env:
   LIMIT_NUMPY_VERSION: 2.0.0
-  LIMIT_SCIPY_VERSION: 1.13.1
 
 jobs:
   build-wheels:
@@ -59,7 +58,7 @@ jobs:
       run: python${{ matrix.python-version }} -m pip install wheel setuptools pip --upgrade
 
     - name: Install numpy, scipy
-      run: pip install "numpy<${{ env.LIMIT_NUMPY_VERSION }}" "scipy<=${{ env.LIMIT_SCIPY_VERSION }}"
+      run: pip install "numpy>${{ env.LIMIT_NUMPY_VERSION }}" scipy
 
     - name: Install other dependencies
       run: |

cornac/metrics/ranking.py

@@ -91,7 +91,7 @@ def dcg_score(gt_pos, pd_rank, k=-1):
         else:
             truncated_pd_rank = pd_rank
 
-        ranked_scores = np.in1d(truncated_pd_rank, gt_pos).astype(int)
+        ranked_scores = np.isin(truncated_pd_rank, gt_pos).astype(int)
         gain = 2**ranked_scores - 1
         discounts = np.log2(np.arange(len(ranked_scores)) + 2)
 
@@ -162,7 +162,7 @@ def compute(self, gt_pos, pd_rank, **kwargs):
             truncated_pd_rank = pd_rank
 
         # Compute CRR
-        rec_rank = np.where(np.in1d(truncated_pd_rank, gt_pos))[0]
+        rec_rank = np.where(np.isin(truncated_pd_rank, gt_pos))[0]
         if len(rec_rank) == 0:
             return 0.0
         rec_rank = rec_rank + 1  # +1 because indices starts from 0 in python
@@ -210,7 +210,7 @@ def compute(self, gt_pos, pd_rank, **kwargs):
             Mean Reciprocal Rank score.
 
         """
-        matched_items = np.nonzero(np.in1d(pd_rank, gt_pos))[0]
+        matched_items = np.nonzero(np.isin(pd_rank, gt_pos))[0]
 
         if len(matched_items) == 0:
             raise ValueError(
@@ -267,7 +267,7 @@ def compute(self, gt_pos, pd_rank, **kwargs):
         else:
             truncated_pd_rank = pd_rank
 
-        tp = np.sum(np.in1d(truncated_pd_rank, gt_pos))
+        tp = np.sum(np.isin(truncated_pd_rank, gt_pos))
         tp_fn = len(gt_pos)
         tp_fp = self.k if self.k > 0 else len(truncated_pd_rank)
 
@@ -470,11 +470,11 @@ def compute(self, item_indices, pd_scores, gt_pos, gt_neg=None, **kwargs):
 
         """
 
-        gt_pos_mask = np.in1d(item_indices, gt_pos)
+        gt_pos_mask = np.isin(item_indices, gt_pos)
         gt_neg_mask = (
             np.logical_not(gt_pos_mask)
             if gt_neg is None
-            else np.in1d(item_indices, gt_neg)
+            else np.isin(item_indices, gt_neg)
         )
 
         pos_scores = pd_scores[gt_pos_mask]
@@ -519,7 +519,7 @@ def compute(self, item_indices, pd_scores, gt_pos, **kwargs):
             AP score.
 
         """
-        relevant = np.in1d(item_indices, gt_pos)
+        relevant = np.isin(item_indices, gt_pos)
         rank = rankdata(-pd_scores, "max")[relevant]
         L = rankdata(-pd_scores[relevant], "max")
         ans = (L / rank).mean()

cornac/models/beacon/recom_beacon.py

@@ -270,7 +270,7 @@ def _remove_diag(self, adj_matrix):
 
     def _normalize(self, adj_matrix: csr_matrix):
         """Symmetrically normalize adjacency matrix."""
-        row_sum = adj_matrix.sum(1).A.squeeze()
+        row_sum = adj_matrix.sum(1).toarray().squeeze()
         d_inv_sqrt = np.power(
             row_sum,
             -0.5,

cornac/models/bivaecf/bivae.py

@@ -20,7 +20,6 @@
 import torch.nn as nn
 from tqdm.auto import trange
 
-
 EPS = 1e-10
 
 ACT = {
@@ -136,7 +135,7 @@ def loss(self, x, x_, mu, mu_prior, std, kl_beta):
         # Likelihood
         ll_choices = {
             "bern": x * torch.log(x_ + EPS) + (1 - x) * torch.log(1 - x_ + EPS),
-            "gaus": -(x - x_) ** 2,
+            "gaus": -((x - x_) ** 2),
             "pois": x * torch.log(x_ + EPS) - x_,
         }
 
@@ -198,7 +197,7 @@ def learn(
         i_count = 0
         for i_ids in train_set.item_iter(batch_size, shuffle=False):
             i_batch = tx[i_ids, :]
-            i_batch = i_batch.A
+            i_batch = i_batch.toarray()
             i_batch = torch.tensor(i_batch, dtype=dtype, device=device)
 
             # Reconstructed batch
@@ -228,7 +227,7 @@ def learn(
         u_count = 0
         for u_ids in train_set.user_iter(batch_size, shuffle=False):
             u_batch = x[u_ids, :]
-            u_batch = u_batch.A
+            u_batch = u_batch.toarray()
             u_batch = torch.tensor(u_batch, dtype=dtype, device=device)
 
             # Reconstructed batch
@@ -259,7 +258,7 @@ def learn(
     # infer mu_beta
     for i_ids in train_set.item_iter(batch_size, shuffle=False):
         i_batch = tx[i_ids, :]
-        i_batch = i_batch.A
+        i_batch = i_batch.toarray()
         i_batch = torch.tensor(i_batch, dtype=dtype, device=device)
 
         beta, _, i_mu, _ = bivae(i_batch, user=False, theta=bivae.theta)
@@ -268,7 +267,7 @@ def learn(
     # infer mu_theta
     for u_ids in train_set.user_iter(batch_size, shuffle=False):
         u_batch = x[u_ids, :]
-        u_batch = u_batch.A
+        u_batch = u_batch.toarray()
         u_batch = torch.tensor(u_batch, dtype=dtype, device=device)
 
         theta, _, u_mu, _ = bivae(u_batch, user=True, beta=bivae.beta)

cornac/models/bpr/recom_bpr.pyx

@@ -37,6 +37,8 @@ from ...utils.common import scale
 from ...utils.init_utils import zeros, uniform
 
 
+DTYPE = np.float32
+
 cdef extern from "recom_bpr.h" namespace "recom_bpr" nogil:
     cdef int get_thread_num()
 
@@ -119,7 +121,7 @@ class BPR(Recommender, ANNMixin):
         seed=None
     ):
         super().__init__(name=name, trainable=trainable, verbose=verbose)
-        self.k = k
+        self.k = int(k)
         self.max_iter = max_iter
         self.learning_rate = learning_rate
         self.lambda_reg = lambda_reg
@@ -144,10 +146,10 @@ class BPR(Recommender, ANNMixin):
         n_users, n_items = self.total_users, self.total_items
 
         if self.u_factors is None:
-            self.u_factors = (uniform((n_users, self.k), random_state=self.rng) - 0.5) / self.k
+            self.u_factors = (uniform((n_users, self.k), random_state=self.rng, dtype=DTYPE) - 0.5) / self.k
         if self.i_factors is None:
-            self.i_factors = (uniform((n_items, self.k), random_state=self.rng) - 0.5) / self.k
-        self.i_biases = zeros(n_items) if self.i_biases is None or self.use_bias is False else self.i_biases
+            self.i_factors = (uniform((n_items, self.k), random_state=self.rng, dtype=DTYPE) - 0.5) / self.k
+        self.i_biases = zeros(n_items, dtype=DTYPE) if self.i_biases is None or self.use_bias is False else self.i_biases
 
     def _prepare_data(self, train_set):
         X = train_set.matrix # csr_matrix

cornac/models/cdl/recom_cdl.py

@@ -243,7 +243,7 @@ def _fit_cdl(self, train_set):
                     feed_dict = {
                         model.text_mask: corruption_mask[batch_ids, :],
                         model.text_input: text_feature[batch_ids],
-                        model.ratings: batch_R.A,
+                        model.ratings: batch_R.toarray(),
                         model.C: batch_C,
                         model.item_ids: batch_ids,
                     }

cornac/models/ctr/ctr.py

@@ -29,7 +29,7 @@ def _df_simplex(gamma, v, lambda_v, x):
 
 
 def _is_on_simplex(v, s):
-    if v.sum() < s + 1e-10 and np.alltrue(v > 0):
+    if v.sum() < s + 1e-10 and np.all(v > 0):
         return True
     return False
 

cornac/models/cvae/recom_cvae.py

@@ -16,11 +16,10 @@
 import numpy as np
 from tqdm.auto import trange
 
-from ..recommender import Recommender
-from ..recommender import ANNMixin, MEASURE_DOT
 from ...exception import ScoreException
 from ...utils import get_rng
 from ...utils.init_utils import xavier_uniform
+from ..recommender import MEASURE_DOT, Recommender
 
 
 class CVAE(Recommender):
@@ -175,9 +174,10 @@ def _fit_cvae(self, train_set):
         )  # normalization
 
         # VAE initialization
-        from .cvae import Model
         import tensorflow.compat.v1 as tf
 
+        from .cvae import Model
+
         tf.disable_eager_execution()
 
         tf.set_random_seed(self.seed)
@@ -216,7 +216,7 @@ def _fit_cvae(self, train_set):
 
                 feed_dict = {
                     model.x: document[batch_ids],
-                    model.ratings: batch_R.A,
+                    model.ratings: batch_R.toarray(),
                     model.C: batch_C,
                     model.item_ids: batch_ids,
                 }