Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
5 changes: 0 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,3 @@ Try to be empathic.

</details>

## Microsoft Contributor License Agreement

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ibrahimhaddad Does LF require some similar type of agreement for contributors?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tracked here: #1997


Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com.

When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repos using our CLA.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

## What's New (August, 2023)

We moved to a new organization! Now to access the repo, instead of going to https://github.com/microsoft/recommenders, you need to go to https://github.com/recommenders-team/recommenders. The old URL will still resolve to the new one, but we recommend you to update your bookmarks.
We moved to a new organization! Now to access the repo, instead of going to https://github.com/microsoft/recommenders, you need to go to https://github.com/recommenders-team/recommenders. The old URL will still resolve to the new one, but we recommend that you update your bookmarks.

Starting with release 0.6.0, Recommenders has been available on PyPI and can be installed using pip!

Expand Down
35 changes: 0 additions & 35 deletions SECURITY.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{
"cell_type": "markdown",
"source": [
"Hyperparameter tuning for Spark based recommender algorithm is important to select a model with the optimal performance. This notebook introduces good practices in performing hyperparameter tuning for building recommender models with the utility functions provided in the [Microsoft/Recommenders](https://github.com/Microsoft/Recommenders.git) repository.\n",
"Hyperparameter tuning for Spark based recommender algorithm is important to select a model with the optimal performance. This notebook introduces good practices in performing hyperparameter tuning for building recommender models with the utility functions provided in the [Microsoft/Recommenders](https://github.com/recommenders-team/recommenders.git) repository.\n",
"\n",
"Three different approaches are introduced and comparatively studied.\n",
"* Spark native/custom constructs (`ParamGridBuilder`, `TrainValidationSplit`).\n",
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
extras_require = {
"gpu": [
"nvidia-ml-py3>=7.352.0",
# TensorFlow compiled with CUDA 11.2, cudnn 8.1
# TensorFlow compiled with CUDA 11.2, CuDNN 8.1
"tensorflow~=2.6.1;python_version=='3.6'",
"tensorflow~=2.7.0;python_version>='3.7'",
"tf-slim>=1.1.0",
Expand Down Expand Up @@ -105,9 +105,9 @@
url="https://github.com/recommenders-team/recommenders",
project_urls={
"Documentation": "https://microsoft-recommenders.readthedocs.io/en/stable/",
"Wiki": "https://github.com/microsoft/recommenders/wiki",
"Wiki": "https://github.com/recommenders-team/recommenders/wiki",
},
author="RecoDev Team at Microsoft",
author="Recommenders contributors",
author_email="RecoDevTeam@service.microsoft.com",

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Email too is outdated.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have sent an email to Ibrahim to see which one we can add

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tracked here: #1997

classifiers=[
"Development Status :: 5 - Production/Stable",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def create_run_config(
reco_extras = reco_extras + ",spark"

conda_dep.add_pip_package(
f"recommenders[{reco_extras}]@git+https://github.com/microsoft/recommenders.git@{commit_sha}"
f"recommenders[{reco_extras}]@git+https://github.com/recommenders-team/recommenders.git@{commit_sha}"
)

run_azuremlcompute.environment.python.conda_dependencies = conda_dep
Expand Down
8 changes: 4 additions & 4 deletions tests/ci/azureml_tests/test_groups.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
"tests/functional/examples/test_notebooks_python.py::test_lightfm_functional",
],
"group_cpu_003": [ # Total group time: 2253s
"tests/data_validation/recommenders/dataset/test_criteo.py::test_download_criteo_sample", # 1.05s
"tests/data_validation/recommenders/dataset/test_criteo.py::test_extract_criteo_sample", # 1.22s
"tests/data_validation/recommenders/dataset/test_criteo.py::test_criteo_load_pandas_df_sample", # 1.73s
"tests/data_validation/recommenders/datasets/test_criteo.py::test_download_criteo_sample", # 1.05s
"tests/data_validation/recommenders/datasets/test_criteo.py::test_extract_criteo_sample", # 1.22s
"tests/data_validation/recommenders/datasets/test_criteo.py::test_criteo_load_pandas_df_sample", # 1.73s
"tests/data_validation/recommenders/datasets/test_criteo.py::test_criteo_load_pandas_df_full", # 1368.63s
#
"tests/smoke/examples/test_notebooks_python.py::test_sar_single_node_smoke", # 12.58s
Expand Down Expand Up @@ -145,7 +145,7 @@
"group_spark_001": [ # Total group time: 987.16s
"tests/data_validation/recommenders/datasets/test_movielens.py::test_load_spark_df", # 4.33s+ 25.58s + 101.99s + 139.23s
#
"tests/data_validation/recommenders/dataset/test_criteo.py::test_criteo_load_spark_df_sample", # 6.83s
"tests/data_validation/recommenders/datasets/test_criteo.py::test_criteo_load_spark_df_sample", # 6.83s
"tests/data_validation/recommenders/datasets/test_criteo.py::test_criteo_load_spark_df_full", # 374.64s
#
"tests/smoke/examples/test_notebooks_pyspark.py::test_mmlspark_lightgbm_criteo_smoke", # 32.45s
Expand Down
1 change: 1 addition & 0 deletions tests/data_validation/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
1 change: 1 addition & 0 deletions tests/data_validation/examples/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
1 change: 1 addition & 0 deletions tests/data_validation/recommenders/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
1 change: 1 addition & 0 deletions tests/data_validation/recommenders/datasets/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
1 change: 1 addition & 0 deletions tests/functional/examples/test_notebooks_python.py
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ def test_geoimc_functional(notebooks, output_notebook, kernel_name, expected_val

@pytest.mark.notebooks
@pytest.mark.experimental
@pytest.mark.skip(reason="xLearn pip package has installation incompatibilities")

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this temporal? or do we want to skip only at some condition, like using skipif("some_module" not in sys.modules, reason="'some_module' was not installed correctly maybe due to version conflict")?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In reality, it is a matter than someone has time to integrate xlearn in the core libraries

def test_xlearn_fm_functional(notebooks, output_notebook, kernel_name):
notebook_path = notebooks["xlearn_fm_deep_dive"]
pm.execute_notebook(
Expand Down
1 change: 1 addition & 0 deletions tests/integration/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
1 change: 1 addition & 0 deletions tests/integration/recommenders/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
1 change: 1 addition & 0 deletions tests/integration/recommenders/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
1 change: 1 addition & 0 deletions tests/performance/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
1 change: 1 addition & 0 deletions tests/performance/recommenders/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
1 change: 1 addition & 0 deletions tests/performance/recommenders/evaluation/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
1 change: 1 addition & 0 deletions tests/regression/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
1 change: 1 addition & 0 deletions tests/responsible_ai/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
1 change: 1 addition & 0 deletions tests/responsible_ai/recommenders/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
1 change: 1 addition & 0 deletions tests/responsible_ai/recommenders/datasets/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
1 change: 1 addition & 0 deletions tests/security/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Needed to execute the AzureML tests
2 changes: 1 addition & 1 deletion tools/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ docker run -it recommenders:cpu bash -c 'pip install pytest; \
pip install pytest-cov; \
pip install pytest-mock; \
apt-get install -y git; \
git clone https://github.com/microsoft/recommenders.git; \
git clone https://github.com/recommenders-team/recommenders.git; \
cd recommenders; \
pytest tests/unit -m "not spark and not gpu and not notebooks and not experimental"'
```