python-ldl 0.1.0__tar.gz → 0.1.2__tar.gz

{python_ldl-0.1.0 → python_ldl-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-ldl
-Version: 0.1.0
+Version: 0.1.2
 Summary: Label distribution learning (LDL) and label enhancement (LE) toolkit implemented in python.
 Home-page: https://github.com/SpriteMisaka/PyLDL
 Author: SpriteMisaka
@@ -17,6 +17,7 @@ Requires-Dist: numba
 Requires-Dist: numpy
 Requires-Dist: qpsolvers
 Requires-Dist: quadprog
+Requires-Dist: requests
 Requires-Dist: scikit-fuzzy
 Requires-Dist: scikit-learn
 Requires-Dist: scipy
@@ -226,6 +227,7 @@ numba
 numpy
 qpsolvers
 quadprog
+requests
 scikit-fuzzy
 scikit-learn
 scipy

{python_ldl-0.1.0 → python_ldl-0.1.2}/README.md

@@ -187,6 +187,7 @@ numba
 numpy
 qpsolvers
 quadprog
+requests
 scikit-fuzzy
 scikit-learn
 scipy

{python_ldl-0.1.0 → python_ldl-0.1.2}/pyldl/algorithms/_duo_ldl.py

@@ -25,9 +25,9 @@ class Duo_LDL(BaseAdam, BaseDeepLDL):
         , axis=1)
 
     def predict(self, X):
-        from pyldl.algorithms.utils import normalize
+        from pyldl.algorithms.utils import proj
         C_pred = self._call(X)
         shape = (X.shape[0], self._n_outputs - 1, self._n_outputs)
         C_pred_reshaped = ops.transpose(ops.reshape(C_pred, shape), (0, 2, 1))
         D_pred = self._to_numpy((ops.sum(C_pred_reshaped, axis=2) + 1) / self._n_outputs)
-        return normalize(D_pred)
+        return proj(D_pred)

{python_ldl-0.1.0 → python_ldl-0.1.2}/pyldl/algorithms/_ldl_dpa.py

@@ -36,4 +36,4 @@ class LDL_DPA(BaseBFGS, BaseDeepLDL):
 
     def _before_train(self):
         from scipy.stats import rankdata
-        self._R = ops.cast(rankdata(self._D, axis=1), dtype="float32")
+        self._R = ops.cast(rankdata(self._to_numpy(self._D), axis=1), dtype="float32")

{python_ldl-0.1.0 → python_ldl-0.1.2}/pyldl/algorithms/_ldl_lclr.py

@@ -4,17 +4,25 @@ from numba import jit
 
 from scipy.optimize import minimize
 from scipy.special import softmax
+from scipy.spatial.distance import cdist
 
 from sklearn.cluster import KMeans
 
 from pyldl.algorithms.base import BaseADMM, BaseLDL
-from pyldl.algorithms.utils import svt, solvel21, pairwise_euclidean
+from pyldl.algorithms.utils import svt, solvel21
+
+
+@jit(nopython=True)
+def _get_log_D_pred(X, W):
+    XW = X @ W
+    for i in range(XW.shape[0]):
+        XW[i] -= np.max(XW[i])
+    return XW - np.log(np.sum(np.exp(XW), axis=1)).reshape(-1, 1)
 
 
 @jit(nopython=True)
 def _get_D_pred(X, W):
-    exp_XW = np.exp(X @ W)
-    return exp_XW / np.sum(exp_XW, axis=1).reshape(-1, 1)
+    return np.exp(_get_log_D_pred(X, W))
 
 
 @jit(nopython=True)
@@ -25,17 +33,19 @@ def _get_D_pred_DSE(D, S, E, X, W):
 
 @jit(nopython=True)
 def _update_W_numba(X, D, W, S, E, V, alpha, rho):
+    log_D_pred = _get_log_D_pred(X, W)
     D_pred, DSE = _get_D_pred_DSE(D, S, E, X, W)
-    DD2 = D_pred - D_pred ** 2
-    kl = np.sum(D * (np.log(D) - np.log(D_pred)))
+    G = -(V + rho * DSE) @ S.T
+    D_flat = D.reshape(-1, )
+    mask = D_flat > 0
+    kl = np.sum(D_flat[mask] * (np.log(D_flat[mask]) - log_D_pred.reshape(-1, )[mask]))
     inn = np.sum(V * DSE)
     fro1 = np.linalg.norm(W) ** 2
     fro2 = rho * np.linalg.norm(DSE) ** 2 / 2.
     loss = kl + inn + alpha * fro1 + fro2
     grad = X.T @ (D_pred - D)
     grad += 2 * alpha * W
-    grad -= X.T @ (DD2 * V) @ S.T
-    grad -= rho * X.T @ (DD2 * DSE) @ S.T
+    grad += X.T @ (D_pred * (G - np.sum(D_pred * G, axis=1).reshape(-1, 1)))
     return loss, grad.reshape(-1, )
 
 
@@ -52,7 +62,7 @@ def _update_S_numba(X, D, W, S, E, Z, V, V2, P, sumP, n_clusters, delta, rho):
     for i in range(n_clusters):
         pairwise -= np.sum(S * P[i])
     loss = inn + fro + delta * pairwise
-    grad = - V.T @ D_pred + V2.T
+    grad = - D_pred.T @ V + V2
     grad += rho * (S - Z - D_pred.T @ DSE)
     grad -= sumP
     return loss, grad.reshape(-1, )
@@ -80,19 +90,21 @@ class LDL_LCLR(BaseADMM, BaseLDL):
         self.delta = delta
 
     def _update_W(self):
-        """Please note that Eq. (9) in paper :cite:`2019:ren2` should be corrected to:
+        r"""The gradient of Eq. (7) in paper :cite:`2019:ren2`, correcting Eq. (9), is:
 
         .. math::
 
-            \\begin{aligned}
-            \\nabla_\\boldsymbol{W} = & \\boldsymbol{X}^{\\top} \\left(\\hat{\\boldsymbol{D}} - \\boldsymbol{D}\\right) + 2 \\lambda_1 \\boldsymbol{W} -
-            \\boldsymbol{X}^{\\top} \\left(\\left(\\hat{\\boldsymbol{D}} - \\hat{\\boldsymbol{D}}^2\\right) \\odot
-            \\boldsymbol{\\Gamma}_1\\right) \\boldsymbol{S}^{\\top} \\\\
-            - & \\rho \\boldsymbol{X}^{\\top} \\left(\\left(\\hat{\\boldsymbol{D}} - \\hat{\\boldsymbol{D}}^2\\right) \\odot
-            \\left(\\boldsymbol{D} - \\hat{\\boldsymbol{D}}\\boldsymbol{S} - \\boldsymbol{E}\\right)\\right) \\boldsymbol{S}^{\\top}\\text{,}
-            \\end{aligned}
-
-        where :math:`\\odot` denotes element-wise multiplication.
+            \begin{aligned}
+            \hat{\boldsymbol{D}} &= \operatorname{softmax}(\boldsymbol{X}\boldsymbol{W}), \\
+            \boldsymbol{R} &= \boldsymbol{D} - \hat{\boldsymbol{D}}\boldsymbol{S} - \boldsymbol{E}, \\
+            \boldsymbol{G} &= -(\boldsymbol{\Gamma}_1 + \rho\boldsymbol{R})\boldsymbol{S}^{\top}, \\
+            \nabla_{\boldsymbol{W}} &= \boldsymbol{X}^{\top}[
+            \hat{\boldsymbol{D}} - \boldsymbol{D} + \hat{\boldsymbol{D}}\odot(
+            \boldsymbol{G} - ((\hat{\boldsymbol{D}}\odot\boldsymbol{G})\boldsymbol{1})
+            \boldsymbol{1}^{\top})] + 2\lambda_1\boldsymbol{W}.
+            \end{aligned}
+
+        Here :math:`\odot` denotes element-wise multiplication.
         """
 
         def _obj_func(w):
@@ -106,6 +118,21 @@ class LDL_LCLR(BaseADMM, BaseLDL):
         self._update_E()
 
     def _update_S(self):
+        r"""The gradient of Eq. (8) in paper :cite:`2019:ren2`, correcting Eq. (10), is:
+
+        .. math::
+
+            \begin{aligned}
+            \boldsymbol{R} &= \boldsymbol{D} - \hat{\boldsymbol{D}}\boldsymbol{S} - \boldsymbol{E}, \\
+            \nabla_{\boldsymbol{S}} &= -\hat{\boldsymbol{D}}^{\top}\boldsymbol{\Gamma}_1
+            + \boldsymbol{\Gamma}_2
+            + \rho(\boldsymbol{S} - \boldsymbol{Z}
+            - \hat{\boldsymbol{D}}^{\top}\boldsymbol{R})
+            - \frac{\lambda_4}{2}\sum_v\boldsymbol{P}_v.
+            \end{aligned}
+
+        Here :math:`(\boldsymbol{P}_v)_{mn} = \|\boldsymbol{D}^{v}_{\cdot m} - \boldsymbol{D}^{v}_{\cdot n}\|_2^2`.
+        """
 
         def _obj_func(s):
             self._S = s.reshape(self._n_outputs, self._n_outputs)
@@ -117,11 +144,11 @@ class LDL_LCLR(BaseADMM, BaseLDL):
         self._S = optimize_result.x.reshape(self._n_outputs, self._n_outputs)
 
     def _update_E(self):
-        _, DSE = _get_D_pred_DSE(self._D, self._S, self._E, self._X, self._W)
-        self._E = solvel21(DSE, self.beta / self._rho)
+        D_pred = _get_D_pred(self._X, self._W)
+        self._E = solvel21(self._D - D_pred @ self._S + self._V / self._rho, self.beta / self._rho)
 
     def _update_Z(self):
-        self._Z = svt(self._S - self._Z, self.gamma / self._rho)
+        self._Z = svt(self._S + self._V2 / self._rho, self.gamma / self._rho)
 
     def _update_V(self):
         self._V, self._V2 = _update_V_numba(self._X, self._D, self._W, self._S, self._E,
@@ -150,10 +177,11 @@ class LDL_LCLR(BaseADMM, BaseLDL):
     def _before_train(self):
         c = KMeans(n_clusters=self.n_clusters).fit_predict(self._D)
         self._P = []
-        self._sumP = 0.
+        self._sumP = np.zeros((self._n_outputs, self._n_outputs))
         for i in range(self.n_clusters):
-            temp = pairwise_euclidean(self._D[c == i].T)
-            self._sumP += self.delta * np.sum(temp)
+            D_cluster = self._D[c == i].T
+            temp = cdist(D_cluster, D_cluster, metric='sqeuclidean')
+            self._sumP += self.delta * temp
             self._P.append(temp)
         self._S = np.eye(self._n_outputs)
         self._E = np.zeros((self._n_samples, self._n_outputs))

{python_ldl-0.1.0 → python_ldl-0.1.2}/pyldl/algorithms/_ldl_lrr.py

@@ -18,17 +18,12 @@ class LDL_LRR(BaseBFGS, BaseDeepLDL):
         self.beta = beta
 
     @staticmethod
-    def ranking_loss(D_pred, P, W):
+    def ranking_loss(D_pred, P, W, sigma=1e2):
         logsig = lambda x: -ops.logaddexp(0., -x)
-        P_hat = D_pred[:, :, None] - D_pred[:, None, :]
-        l = ((1 - P) * logsig(1 - P_hat) + P * logsig(P_hat)) * W
+        P_hat = sigma * (D_pred[:, :, None] - D_pred[:, None, :])
+        l = ((1 - P) * logsig(-P_hat) + P * logsig(P_hat)) * W
         return -ops.sum(l)
 
-    @staticmethod
-    def preprocessing(D):
-        diff = D[:, :, None] - D[:, None, :]
-        return ops.where(diff > .5, 1., 0.), ops.square(diff)
-
     def _loss(self, params_1d):
         theta = self._params2model(params_1d)[0]
         D_pred = keras.activations.softmax(self._X @ theta)
@@ -37,4 +32,6 @@ class LDL_LRR(BaseBFGS, BaseDeepLDL):
         return kld + self.alpha * rnk + self.beta * self._l2_reg(theta)
 
     def _before_train(self):
-        self._P, self._W = LDL_LRR.preprocessing(self._D)
+        diff = self._D[:, :, None] - self._D[:, None, :]
+        self._P = ops.where(diff > 0., 1., ops.where(diff < 0., 0., .5))
+        self._W = ops.square(diff)

{python_ldl-0.1.0 → python_ldl-0.1.2}/pyldl/algorithms/_ldl_scl.py

@@ -35,7 +35,7 @@ class LDL_SCL(BaseAdam, BaseDeepLDL):
         self.beta = beta
 
     def _get_default_model(self):
-        return self.get_2layer_model(self._n_features, self._n_outputs)
+        return self.get_2layer_model(self._n_features, self._n_outputs, activation='linear')
 
     def _before_train(self):
         self._P = ops.convert_to_tensor(
@@ -51,6 +51,10 @@ class LDL_SCL(BaseAdam, BaseDeepLDL):
             initializer=keras.initializers.RandomNormal(), trainable=True
         )
 
+    def train_step(self, *args, **kwargs):
+        super().train_step(*args, **kwargs)
+        self._C.assign(ops.maximum(self._C, EPS))
+
     @staticmethod
     def scl_loss(D_pred, P, C):
         corr = ops.mean(C * keras.losses.mean_squared_error(

{python_ldl-0.1.0 → python_ldl-0.1.2}/pyldl/algorithms/_ldllc.py

@@ -22,5 +22,7 @@ class LDLLC(BaseBFGS, BaseDeepLDL):
         thetaT = ops.transpose(theta)
         D_pred = keras.activations.softmax(self._X @ theta)
         kld = ops.sum(keras.losses.kl_divergence(self._D, D_pred))
-        lc = ops.sum(non_diagonal(ops.sign(ops.corrcoef(thetaT)) * pairwise_euclidean(thetaT))) / 2.
+        centered = thetaT - ops.mean(thetaT, axis=1, keepdims=True)
+        signs = ops.sign(centered @ ops.transpose(centered))
+        lc = ops.sum(non_diagonal(signs * pairwise_euclidean(thetaT))) / 2.
         return kld + self.alpha * lc + self.beta * self._l2_reg(theta)

{python_ldl-0.1.0 → python_ldl-0.1.2}/pyldl/algorithms/_lrldl.py

@@ -11,8 +11,8 @@ class _LRLDL(BaseADMM, BaseLDL):
     :term:`ADMM` is used as optimization algorithm.
     """
 
-    def __init__(self, mode='threshold', param=None, alpha=1e-3, beta=1e-3, random_state=None, **kwargs):
-        super().__init__(random_state, **kwargs)
+    def __init__(self, mode='threshold', param=None, alpha=1e-3, beta=1e-3, **kwargs):
+        super().__init__(**kwargs)
         self._mode = mode
         self._param = param
         self._alpha = alpha