Skip to content

Commit

Permalink
Merge pull request #1978 from recommenders-team/miguel/license
Browse files Browse the repository at this point in the history
License update
  • Loading branch information
miguelgfierro committed Aug 29, 2023
2 parents 0cfe1b4 + bb9dd60 commit 4b57b38
Show file tree
Hide file tree
Showing 237 changed files with 49,904 additions and 49,819 deletions.
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
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
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: 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
20 changes: 10 additions & 10 deletions examples/00_quick_start/als_movielens.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"<i>Copyright (c) Microsoft Corporation. All rights reserved.</i>\n",
"<i>Copyright (c) Recommenders contributors.</i>\n",
"\n",
"<i>Licensed under the MIT License.</i>"
]
Expand Down Expand Up @@ -298,7 +298,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"\r",
"\r\n",
" \r"
]
}
Expand Down Expand Up @@ -425,7 +425,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"\r",
"\r\n",
" \r"
]
}
Expand Down Expand Up @@ -494,9 +494,9 @@
"name": "stderr",
"output_type": "stream",
"text": [
"\r",
"[Stage 500:=================================================> (186 + 3) / 200]\r",
"\r",
"\r\n",
"[Stage 500:=================================================> (186 + 3) / 200]\r\n",
"\r\n",
" \r"
]
}
Expand Down Expand Up @@ -534,7 +534,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"\r",
"\r\n",
" \r"
]
}
Expand Down Expand Up @@ -627,9 +627,9 @@
"name": "stderr",
"output_type": "stream",
"text": [
"\r",
"[Stage 904:> (0 + 2) / 2]\r",
"\r",
"\r\n",
"[Stage 904:> (0 + 2) / 2]\r\n",
"\r\n",
" \r"
]
},
Expand Down
Loading

0 comments on commit 4b57b38

Please sign in to comment.