Skip to content

Commit

Permalink
Merge in main
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonYansenZhao committed Sep 1, 2023
2 parents b71c4ed + 57f37ea commit 3b4a641
Show file tree
Hide file tree
Showing 246 changed files with 50,119 additions and 49,929 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# See https://help.github.com/articles/about-codeowners/
# for more info about CODEOWNERS file

* @miguelgfierro @gramhagen @anargyri @loomlike @wutaomsft @simonzhaoms
* @miguelgfierro @gramhagen @anargyri @loomlike @wutaomsft @simonyansenzhao

2 changes: 1 addition & 1 deletion .github/actions/azureml-test/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ---------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.
# ---------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/get-test-groups/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ---------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.
# ---------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/azureml-cpu-nightly.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ---------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.
# ---------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/azureml-gpu-nightly.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ---------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.
# ---------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/azureml-release-pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.

on:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/azureml-spark-nightly.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ---------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.
# ---------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/azureml-unit-tests.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ---------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.
# ---------------------------------------------------------

Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/pypi-test-publish.yml

This file was deleted.

25 changes: 0 additions & 25 deletions .github/workflows/pypi.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/sarplus.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ---------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.
# ---------------------------------------------------------
# This workflow will run tests and do packaging for contrib/sarplus.
Expand Down
2 changes: 1 addition & 1 deletion AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ They have admin access to the repo and provide support reviewing issues and pull
* **[Scott Graham](https://github.com/gramhagen)**
* Improving documentation
* VW notebook
* **[Simon Zhao](https://github.com/simonzhaoms)**
* **[Simon Zhao](https://github.com/simonyansenzhao)**
* SARplus algorithm upgrade
* **[Tao Wu](https://github.com/wutaomsft)**
* Improving documentation
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Here are the basic steps to get started with your first contribution. Please rea
1. Create a test that replicates the issue.
1. Make code changes.
1. 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).
1. When adding code to the repo, make sure you sign the commits, otherwise the tests will fail (see [how to sign the commits](https://github.com/recommenders-team/recommenders/wiki/How-to-sign-commits)).
1. 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
3 changes: 2 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
MIT License

Copyright (c) Microsoft Corporation. All rights reserved.
Copyright (c) 2018-present Microsoft Corporation.
Copyright (c) 2023-present Recommenders contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 5 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
# What's New

## Update August 18, 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.

## Update February 7, 2023

We reached 15,000 stars!!

## Update July, 2022
## Update July 20, 2022

We have a new release [Recommenders 1.1.1](https://github.com/microsoft/recommenders/releases/tag/1.1.1)!

Expand Down
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,11 @@

[![Documentation Status](https://readthedocs.org/projects/microsoft-recommenders/badge/?version=latest)](https://microsoft-recommenders.readthedocs.io/en/latest/?badge=latest)

## What's New (April, 2023)
<img src="https://raw.githubusercontent.com/recommenders-team/artwork/main/color/recommenders_color.svg" width="800">

We reached 15,000 stars!!
## What's New (August, 2023)

Our latest release is [Recommenders 1.1.1](https://github.com/microsoft/recommenders/releases/tag/1.1.1)!

We have introduced a new way of testing our repository using [AzureML](https://azure.microsoft.com/en-us/services/machine-learning/). With AzureML we are able to distribute our tests to different machines and run them in parallel. This allows us to test our repository on a wider range of machines and provides us with a much faster test cycle. Our total computation time went from around 9h to 35min, and we were able to reduce the costs by half. See more details [here](tests/README.md).

We also made other improvements like faster evaluation metrics and improving SAR algorithm.
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.

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

Expand Down
2 changes: 1 addition & 1 deletion contrib/sarplus/python/.flake8
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[flake8]
max-line-length = 120
ignore = W291
ignore = W291,W503
per-file-ignores = pysarplus/SARPlus.py: E501, pysarplus/__init__.py: F401
6 changes: 4 additions & 2 deletions contrib/sarplus/python/pysarplus/SARModel.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.

import pysarplus_cpp
Expand All @@ -21,7 +21,9 @@ def __init__(self, path):
sar_files = list(Path(path).glob("*" + SARModel.__extension))
sar_files.sort(key=os.path.getmtime, reverse=True)
if len(sar_files) < 1:
raise ValueError(f"Directory '{path}' must contain at least 1 file ending in '{SARModel.__extension}'")
raise ValueError(
f"Directory '{path}' must contain at least 1 file ending in '{SARModel.__extension}'"
)

# instantiate C++ backend
SARModel.__model = self.model = pysarplus_cpp.SARModelCpp(str(sar_files[0]))
Expand Down
2 changes: 1 addition & 1 deletion contrib/sarplus/python/pysarplus/SARPlus.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.
"""This is the implementation of SAR."""

Expand Down
4 changes: 2 additions & 2 deletions contrib/sarplus/python/pysarplus/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.

from pathlib import Path
Expand All @@ -10,7 +10,7 @@
__version__ = (Path(__file__).resolve().parent / "VERSION").read_text().strip()
__author__ = "RecoDev Team at Microsoft"
__license__ = "MIT"
__copyright__ = "Copyright 2018-present Microsoft Corporation"
__copyright__ = "Copyright 2018-present Recommenders contributors."

# Synonyms
TITLE = __title__
Expand Down
8 changes: 5 additions & 3 deletions contrib/sarplus/python/setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.

from pathlib import Path
Expand Down Expand Up @@ -26,10 +26,12 @@ def __str__(self):

setup(
name="pysarplus",
version=(Path(__file__).resolve().parent / "pysarplus" / "VERSION").read_text().strip(),
version=(Path(__file__).resolve().parent / "pysarplus" / "VERSION")
.read_text()
.strip(),
description="SAR prediction for use with PySpark",
long_description=(Path(__file__).resolve().parent / "README.md").read_text(),
long_description_content_type='text/markdown',
long_description_content_type="text/markdown",
url="https://github.com/microsoft/recommenders/tree/main/contrib/sarplus",
author="RecoDev Team at Microsoft",
author_email="[email protected]",
Expand Down
2 changes: 1 addition & 1 deletion contrib/sarplus/python/src/pysarplus.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Copyright (c) Recommenders contributors.
* Licensed under the MIT License.
*/

Expand Down
2 changes: 1 addition & 1 deletion contrib/sarplus/python/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.

import calendar
Expand Down
10 changes: 8 additions & 2 deletions contrib/sarplus/python/tests/test_pyspark_sar.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.

import math
Expand Down Expand Up @@ -381,7 +381,13 @@ def test_userpred(
df = spark.createDataFrame(demo_usage_data)
model.fit(df)

url = sar_settings["FILE_DIR"] + "userpred_" + file + str(threshold) + "_userid_only.csv"
url = (
sar_settings["FILE_DIR"]
+ "userpred_"
+ file
+ str(threshold)
+ "_userid_only.csv"
)

pred_ref = pd.read_csv(url)
pred_ref = (
Expand Down
2 changes: 1 addition & 1 deletion contrib/sarplus/scala/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Copyright (c) Recommenders contributors.
* Licensed under the MIT License.
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Copyright (c) Recommenders contributors.
* Licensed under the MIT License.
*/

Expand Down
2 changes: 1 addition & 1 deletion contrib/sarplus/scala/python/pysarplus_dummy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.

installed = 1
6 changes: 4 additions & 2 deletions contrib/sarplus/scala/python/setup.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.

from distutils.core import setup
from pathlib import Path

setup(
name="pysarplus_dummy",
version=(Path(__file__).resolve().parent.parent.parent / "VERSION").read_text().strip(),
version=(Path(__file__).resolve().parent.parent.parent / "VERSION")
.read_text()
.strip(),
description="pysarplus dummy package to trigger spark packaging",
author="RecoDev Team at Microsoft",
author_email="[email protected]",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Copyright (c) Recommenders contributors.
* Licensed under the MIT License.
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Copyright (c) Recommenders contributors.
* Licensed under the MIT License.
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Copyright (c) Recommenders contributors.
* Licensed under the MIT License.
*/

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Copyright (c) Recommenders contributors.
* Licensed under the MIT License.
*/

Expand Down
2 changes: 1 addition & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.

# You can set these variables from the command line.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (c) Recommenders contributors.
# Licensed under the MIT License.

# -*- coding: utf-8 -*-
Expand Down
Loading

0 comments on commit 3b4a641

Please sign in to comment.