Fix for 0.3.0 (#105)

* More docs

* Update codecov-actions

* Use more explicit gcc options

Author: tohtsky

.github/workflows/run-test.yml

@@ -17,7 +17,8 @@ jobs:
         run: |
           pip install --upgrade pip
           sudo apt-get install lcov
-          CXXFLAGS="-O0 -g -coverage" pip install -e .
+          FLAGS="-fprofile-arcs -ftest-coverage"
+          CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" pip install -e .
       - name: Run pytest
         run: |
           pip install pytest pytest-mock pytest-cov
@@ -28,10 +29,10 @@ jobs:
           coverage xml
           lcov -d `pwd` -c -o coverage.info
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
           files: ./coverage.xml,./coverage.info
+          name: codecov-umbrella
+          fail_ci_if_error: true
           verbose: false
           env_vars: OS,PYTHON
-          name: codecov-umbrella
-          fail_ci_if_error: false

create_pb_stubs.sh

@@ -9,7 +9,7 @@ for module_name in "${modules[@]}"
 do
     echo "Create stub for $module_name"
     pybind11-stubgen -o stubs --no-setup-py "$module_name"
-    output_path="$(echo "${module_name}" | sed 's/\./\//g').pyi"
+    output_path="src/$(echo "${module_name}" | sed 's/\./\//g').pyi"
     input_path="stubs/$(echo "${module_name}" | sed 's/\./\//g')-stubs/__init__.pyi"
     rm "${output_path}"
     echo 'm: int

docs/source/api_reference.rst

@@ -95,3 +95,5 @@ Dataset
     MovieLens1MDataManager
     MovieLens100KDataManager
     MovieLens20MDataManager
+    NeuMFML1MDownloader
+    NeuMFPinterestDownloader

examples/1-vs-100-negative.ipynb

@@ -3,5 +3,5 @@
 sphinx-autobuild  \
     --host 0.0.0.0 \
     --port 9999 \
-    --watch irspack/ \
+    --watch src/irspack/ \
     docs/source docs/build

run_autobuild.sh

@@ -5,11 +5,14 @@
     MovieLens20MDataManager,
     MovieLens100KDataManager,
 )
+from .neu_mf import NeuMFML1MDownloader, NeuMFMPinterestDownloader
 
 __all__ = [
     "MovieLens100KDataManager",
     "MovieLens1MDataManager",
     "MovieLens20MDataManager",
     "CiteULikeADataManager",
     "AmazonMusicDataManager",
+    "NeuMFML1MDownloader",
+    "NeuMFMPinterestDownloader",
 ]

src/irspack/dataset/__init__.py

@@ -17,6 +17,15 @@ def _save_to_zippath(self, path: Path) -> None:
     def __init__(
         self, zippath: Optional[Union[Path, str]] = None, force_download: bool = False
     ):
+        """Specify the zip path for dataset. If that path does not exist, try downloading the relevant data from online resources.
+
+        Args:
+            zippath (Optional[Union[Path, str]], optional): _description_. Defaults to None.
+            force_download (bool, optional): _description_. Defaults to False.
+
+        Raises:
+            RuntimeError: _description_
+        """
         if zippath is None:
             zippath = self.DEFAULT_PATH
         zippath = Path(zippath)

src/irspack/dataset/downloader.py

@@ -54,13 +54,33 @@ def read_train_test(self) -> Tuple[pd.DataFrame, pd.DataFrame]:
 
 
 class NeuMFML1MDownloader(NeuMFDownloader):
+    r"""Manages MovieLens 1M dataset split under 1-vs-100 negative evaluation protocol.
+
+    Args:
+        zippath:
+            Where the zipped data is located. If `None`, assumes the path to be `~/.neumf-ml-1m.zip`.
+            If the designated path does not exist, you will be prompted for the permission to download the data.
+            Defaults to `None`.
+        force_download:
+            If `True`, the class will not prompt for the permission and start downloading immediately.
+    """
     DEFAULT_PATH = Path("~/.neumf-ml-1m.zip").expanduser()
 
     TRAIN_URL = "https://raw.githubusercontent.com/tohtsky/neural_collaborative_filtering/master/Data/ml-1m.train.rating"
     NEGATIVE_URL = "https://raw.githubusercontent.com/tohtsky/neural_collaborative_filtering/master/Data/ml-1m.test.negative"
 
 
 class NeuMFMPinterestDownloader(NeuMFDownloader):
+    r"""Manages Pinterest dataset split under 1-vs-100 negative evaluation protocol.
+
+    Args:
+        zippath:
+            Where the zipped data is located. If `None`, assumes the path to be `~/.neumf-pinterest.zip`.
+            If the designated path does not exist, you will be prompted for the permission to download the data.
+            Defaults to `None`.
+        force_download:
+            If `True`, the class will not prompt for the permission and start downloading immediately.
+    """
     DEFAULT_PATH = Path("~/.neumf-pinterest.zip").expanduser()
 
     TRAIN_URL = "https://raw.githubusercontent.com/tohtsky/neural_collaborative_filtering/master/Data/pinterest-20.train.rating"

src/irspack/dataset/neu_mf.py

@@ -84,11 +84,13 @@ class BaseRecommender(object, metaclass=RecommenderMeta):
     config_class: Type[RecommenderConfig]
     default_tune_range: List[ParameterRange]
 
+    X_train_all: sps.csr_matrix
+    """The matrix to feed into recommender."""
+
     def __init__(self, X_train_all: InteractionMatrix, **kwargs: Any) -> None:
         self.X_train_all: sps.csr_matrix = sps.csr_matrix(X_train_all).astype(
             np.float64
         )
-        """The matrix to feed into recommender."""
 
         self.n_users: int = self.X_train_all.shape[0]
         self.n_items: int = self.X_train_all.shape[1]
@@ -387,18 +389,18 @@ def get_score_cold_user_remove_seen(self, X: InteractionMatrix) -> DenseScoreArr
 class BaseSimilarityRecommender(BaseRecommender):
     """The computed item-item similarity. Might not be initialized before `learn()` is called."""
 
-    W_: Optional[Union[sps.csr_matrix, sps.csc_matrix, np.ndarray]]
+    _W: Optional[Union[sps.csr_matrix, sps.csc_matrix, np.ndarray]]
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
-        self.W_ = None
+        self._W = None
 
     @property
     def W(self) -> Union[sps.csr_matrix, sps.csc_matrix, np.ndarray]:
         """The computed item-item similarity weight matrix."""
-        if self.W_ is None:
+        if self._W is None:
             raise RuntimeError("W fetched before fit.")
-        return self.W_
+        return self._W
 
     def get_score(self, user_indices: UserIndexArray) -> DenseScoreArray:
         return _sparse_to_array(self.X_train_all[user_indices].dot(self.W))

src/irspack/recommenders/base.py

@@ -50,4 +50,4 @@ def _learn(self) -> None:
         P_dense *= -diag_P_inv[np.newaxis, :]
         range_ = np.arange(self.n_items)
         P_dense[range_, range_] = 0
-        self.W_ = P_dense
+        self._W = P_dense