Merge pull request #12

Fix the issue where primal solver cannot be used in libmultilabel.

Author: zhi-bao

libmultilabel/linear/linear.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 import scipy.sparse as sparse
-from liblinear.liblinearutil import train, problem, parameter
+from liblinear.liblinearutil import train, problem, parameter, solver_names
 from tqdm import tqdm
 
 __all__ = [
@@ -335,7 +335,8 @@ def _do_train(y: np.ndarray, x: sparse.csr_matrix, options: str) -> np.matrix:
 
     prob = problem(y, x)
     param = parameter(options)
-    param.w_recalc = True   # only works for solving L1/L2-SVM dual
+    if param.solver_type in [solver_names.L2R_L1LOSS_SVC_DUAL, solver_names.L2R_L2LOSS_SVC_DUAL]:
+        param.w_recalc = True  # only works for solving L1/L2-SVM dual
     with silent_stderr():
         model = train(prob, param)
 
@@ -597,7 +598,8 @@ def train_binary_and_multiclass(
 
     prob = problem(y, x)
     param = parameter(options)
-    param.w_recalc = True
+    if param.solver_type in [solver_names.L2R_L1LOSS_SVC_DUAL, solver_names.L2R_L2LOSS_SVC_DUAL]:
+        param.w_recalc = True
     with silent_stderr():
         model = train(prob, param)
 

requirements.txt

@@ -1,4 +1,4 @@
-liblinear-multicore
+liblinear-multicore>=2.49.0
 numba
 pandas>1.3.0
 PyYAML

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = libmultilabel
-version = 0.7.2
+version = 0.7.3
 author = LibMultiLabel Team
 license = MIT License
 license_file = LICENSE
@@ -25,7 +25,7 @@ classifiers =
 [options]
 packages = find:
 install_requires =
-    liblinear-multicore
+    liblinear-multicore>=2.49.0
     numba
     pandas>1.3.0
     PyYAML