Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Andreas/docs #1426

Merged
merged 42 commits into from
Jun 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
d9a4c8c
:bug: in installation process and in test execution
miguelgfierro May 28, 2021
8aea5a9
make sure we are using the package when running the test :bug:
miguelgfierro May 28, 2021
afbde93
tag
miguelgfierro Jun 1, 2021
756bc8d
xlearn :bug:
miguelgfierro Jun 1, 2021
1c26389
trying to remove exit -1
miguelgfierro Jun 1, 2021
8bc0871
trying to remove exit -1 :bug:
miguelgfierro Jun 1, 2021
80c9f8b
Remove html files in docs from being pushed
miguelgfierro Jun 1, 2021
150f94a
trying to remove exit -1 :bug::bug:
miguelgfierro Jun 1, 2021
fbc9c58
trying to remove exit -1 failOnStderr
miguelgfierro Jun 1, 2021
9005a8f
trying to remove exit -1 :boom:
miguelgfierro Jun 1, 2021
ee387fe
Merge pull request #1419 from microsoft/miguelgfierro-patch-1
miguelgfierro Jun 1, 2021
c03fcb2
trying to remove exit -1 :boom::boom:
miguelgfierro Jun 1, 2021
3626675
new full run xlearn in
miguelgfierro Jun 1, 2021
4f32505
trigger tag :bug:
miguelgfierro Jun 1, 2021
d17b2e2
Merge branch 'zhangya' into andreas/docs
anargyri Jun 1, 2021
0b56527
Edit CONTRIBUTING.md
anargyri Jun 1, 2021
b2c8bc0
backoff
miguelgfierro Jun 1, 2021
a596364
:memo:
miguelgfierro Jun 1, 2021
e18c138
Merge pull request #1420 from microsoft/miguel/retry_maybedownload
miguelgfierro Jun 2, 2021
0aad35d
fix conflict and keep non-alphabetical order following @anargyri advice
miguelgfierro Jun 2, 2021
966a683
review :memo: in common
miguelgfierro Jun 2, 2021
0c5682d
wip
miguelgfierro Jun 2, 2021
a77d2b4
Merge branch 'zhangya' into andreas/docs
anargyri Jun 2, 2021
3684161
deprec
miguelgfierro Jun 2, 2021
f6f30ed
fix :memo:
miguelgfierro Jun 2, 2021
a95c898
removing dev branch, will trigger only with tag
miguelgfierro Jun 2, 2021
1c4953d
Fix docstrings in dataset and evaluation
anargyri Jun 2, 2021
0e684e9
Merge branch 'miguel/review_docs' into andreas/docs
anargyri Jun 2, 2021
6c92d65
Merge branch 'zhangya' into andreas/docs
anargyri Jun 3, 2021
0e704d7
Fix ** in docstring
anargyri Jun 3, 2021
964c26d
Fix code example in docstring
anargyri Jun 3, 2021
aa4c28d
Reorder data sets in rst
anargyri Jun 3, 2021
dbf9f25
fix deeprec tests
miguelgfierro Jun 3, 2021
927d0cb
remove xlearn from core deps
miguelgfierro Jun 3, 2021
31d3a4f
remove xlearn from core deps :bug:
miguelgfierro Jun 3, 2021
a739e8e
Add sections for each data set
anargyri Jun 3, 2021
8304089
improve maybe download tests
miguelgfierro Jun 3, 2021
cac6a29
Edit dataset utils
anargyri Jun 3, 2021
e50da3d
wip
miguelgfierro Jun 3, 2021
289e69f
Add missing docstrings
anargyri Jun 3, 2021
ad601e0
Merge branch 'pipeline_release' into andreas/docs
anargyri Jun 3, 2021
96f910d
Fix list
anargyri Jun 3, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,14 @@ ml-20m/
*.model
*.mml
nohup.out
*.svg
*.html
*.js
*.css
*.tff
*.woff
*.woff2
*.eot

##### kdd 2020 tutorial data folder
examples/07_tutorials/KDD2020-tutorial/data_folder/
Expand All @@ -164,4 +172,4 @@ examples/07_tutorials/KDD2020-tutorial/data_folder/
*.sh

tests/**/resources/
reports/
reports/
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Here are the basic steps to get started with your first contribution. Please rea
5. Install development requirements. `pip install -r dev-requirements.txt`
6. Create a test that replicates the issue.
7. Make code changes.
8. Ensure unit tests pass and code style / formatting is consistent (see [wiki](https://github.com/Microsoft/Recommenders/wiki/Coding-Guidelines#python-and-docstrings-style) for more details).
8. Ensure that unit tests pass and code style / formatting is consistent (see [wiki](https://github.com/Microsoft/Recommenders/wiki/Coding-Guidelines#python-and-docstrings-style) for more details). In particular, make sure that there is a docstring for every function you add and that it conforms to the Google style.
9. Create a pull request against **staging** branch.

Once the features included in a [milestone](https://github.com/microsoft/recommenders/milestones) are completed, we will merge staging into main. See the wiki for more detail about our [merge strategy](https://github.com/microsoft/recommenders/wiki/Strategy-to-merge-the-code-to-main-branch).
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ To build the documentation as HTML:
cd docs
make html

To contribute to this repository, please follow these [guidelines](https://github.com/Microsoft/Recommenders/wiki/Coding-Guidelines).
To contribute to this repository, please follow these [guidelines](https://github.com/Microsoft/Recommenders/wiki/Coding-Guidelines). See also the [Sphinx documentation](https://sublime-and-sphinx-guide.readthedocs.io/en/latest/index.html) for the syntax of docstrings.
47 changes: 32 additions & 15 deletions docs/source/dataset.rst
Original file line number Diff line number Diff line change
@@ -1,49 +1,66 @@
.. _dataset:

Dataset module
**************************
##############

Recommendation datasets
===============================
Recommendation datasets and related utilities

.. automodule:: reco_utils.dataset.movielens
:members:
Recommendation datasets
***********************

.. automodule:: reco_utils.dataset.criteo
:members:
Amazon Reviews
==============

.. automodule:: reco_utils.dataset.amazon_reviews
:members:

Azure COVID-19
==============

.. automodule:: reco_utils.dataset.covid_utils
:members:

Criteo
======

.. automodule:: reco_utils.dataset.criteo
:members:

MIND
====

.. automodule:: reco_utils.dataset.mind
:members:

MovieLens
=========

.. automodule:: reco_utils.dataset.movielens
:members:

Download utilities
===============================
******************

.. automodule:: reco_utils.dataset.download_utils
:members:


Cosmos CLI
===============================
Cosmos CLI utilities
*********************

.. automodule:: reco_utils.dataset.cosmos_cli
:members:


Pandas dataframe utils
===============================
Pandas dataframe utilities
***************************

.. automodule:: reco_utils.dataset.pandas_df_utils
:members:


Splitter utilities
===============================
******************

.. automodule:: reco_utils.dataset.python_splitters
:members:
Expand All @@ -56,14 +73,14 @@ Splitter utilities


Sparse utilities
===============================
****************

.. automodule:: reco_utils.dataset.sparse
:members:


Knowledge graph utilities
===============================
*************************

.. automodule:: reco_utils.dataset.wikidata
:members:
4 changes: 2 additions & 2 deletions examples/01_prepare_data/mind_utils.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"from tempfile import TemporaryDirectory\n",
"from reco_utils.dataset.mind import (download_mind,\n",
" extract_mind,\n",
" download_and_extract_globe,\n",
" download_and_extract_glove,\n",
" load_glove_matrix,\n",
" word_tokenize\n",
" )\n",
Expand Down Expand Up @@ -326,7 +326,7 @@
}
],
"source": [
"glove_path = download_and_extract_globe(data_path)"
"glove_path = download_and_extract_glove(data_path)"
]
},
{
Expand Down
Loading