From 7a3e58d8bff479ac84bbf301d5e9dcce478420ea Mon Sep 17 00:00:00 2001 From: Jeremy Pinto Date: Tue, 4 Apr 2023 09:54:25 -0400 Subject: [PATCH 1/3] update licenses file (#106) --- APPROVED_LIBRARIES.md | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/APPROVED_LIBRARIES.md b/APPROVED_LIBRARIES.md index baf7457..d7d2d07 100644 --- a/APPROVED_LIBRARIES.md +++ b/APPROVED_LIBRARIES.md @@ -1,4 +1,3 @@ -{%- if cookiecutter.environment == 'mila' %} __TODO_START__ When starting a project, the other company needs to approve the libraries/tools that we use. There are two options that the company can choose: @@ -10,7 +9,7 @@ If the latter, this file represents the list. The way it works is the following: - First, make sure that all the licenses listed below are still valid (i.e., they did not change). You can use the link to speedup this process. -- Note that the last time the list was checked was on 2022-August-12. +- Note that the last time the list was checked was on 2023-April-04. - Then, ask the company to approve the list by writing "approved" (or similar), with their git account (this will prove that the company approval is authentic). - When new libraries are added, create a new section below (`Dependencies as of ...`), where you copy the old list and you modify it according to your needs. - Ask the company to approve with the method above (git commit). @@ -23,7 +22,7 @@ Here is the list of dependencies required by Mila for the project development. Note that the following dependencies will trigger some other dependencies and for sake of simplicity, we are not listing them all. Modifications since last approved version are in **bold**. -# Dependencies as of {% now 'local', '%Y/%m/%d' %} +# Dependencies as of {PROJECT_START_DATE} ## General dependencies @@ -31,7 +30,7 @@ we are not listing them all. Modifications since last approved version are in ** * virtualenv : MIT ([https://pypi.org/project/virtualenv/](https://pypi.org/project/virtualenv/)) * miniconda : 3-clause BSD ([https://docs.conda.io/en/latest/license.html](https://docs.conda.io/en/latest/license.html)) * pip : MIT ([https://en.wikipedia.org/wiki/Pip_(package_manager)](https://en.wikipedia.org/wiki/Pip_(package_manager))) -* Mila cookiecutter : MIT [https://github.com/mila-iqia/cookiecutter-pyml/tree/lightning_and_keras](https://github.com/mila-iqia/cookiecutter-pyml/tree/lightning_and_keras) +* Mila cookiecutter : MIT [https://github.com/mila-iqia/cookiecutter-pyml/blob/development/LICENSE](https://github.com/mila-iqia/cookiecutter-pyml/blob/development/LICENSE) * ZSH: MIT-like [zsh](http://zsh.sourceforge.net/) * OH-MY-ZSH: MIT [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh/) * TMUX - ISC [tmux](https://github.com/tmux/tmux/) @@ -50,20 +49,18 @@ we are not listing them all. Modifications since last approved version are in ** * 'orion', BSD [https://github.com/Epistimio/orion/blob/develop/LICENSE](https://github.com/Epistimio/orion/blob/develop/LICENSE) * 'pyyaml', MIT ([https://pypi.org/project/PyYAML/](https://pypi.org/project/PyYAML/)) * 'pytest', MIT ([https://pypi.org/project/pytest/](https://pypi.org/project/pytest/)) -* 'pytest-cov', BSD (MIT) ([https://pypi.org/project/pytest-cov/](https://pypi.org/project/pytest-cov/)) +* 'pytest-cov', MIT ([https://pypi.org/project/pytest-cov/](https://pypi.org/project/pytest-cov/)) * 'pytype', MIT + Apache 2.0, ([https://github.com/google/pytype/](https://github.com/google/pytype/blob/master/LICENSE)) * 'pytorch_lightning', Apache-2.0 ([https://pypi.org/project/pytorch-lightning/](https://pypi.org/project/pytorch-lightning/)) * 'sphinx', BSD ([https://pypi.org/project/Sphinx/](https://pypi.org/project/Sphinx/)) * 'sphinx-autoapi', MIT ([https://pypi.org/project/sphinx-autoapi/](https://pypi.org/project/sphinx-autoapi/)) * 'sphinx-rtd-theme', MIT ([https://pypi.org/project/sphinx-rtd-theme/](https://pypi.org/project/sphinx-rtd-theme/)) * 'sphinxcontrib-napoleon', BSD ([https://pypi.org/project/sphinxcontrib-napoleon/](https://pypi.org/project/sphinxcontrib-napoleon/)) -* 'sphinxcontrib-katex', BSD (MIT) ([https://pypi.org/project/sphinxcontrib-katex/](https://pypi.org/project/sphinxcontrib-katex/)) +* 'sphinxcontrib-katex', MIT ([https://pypi.org/project/sphinxcontrib-katex/](https://pypi.org/project/sphinxcontrib-katex/)) * 'tensorboard', Apache License 2.0 ([https://github.com/tensorflow/tensorboard](https://github.com/tensorflow/tensorboard)) * 'tqdm', MIT+Mozilla Public license ([https://pypi.org/project/tqdm/](https://pypi.org/project/tqdm/)) * 'torch', BSD-3 ([https://pypi.org/project/torch/](https://pypi.org/project/torch/)) * 'torchvision', BSD, ([https://pypi.org/project/torchvision/](https://pypi.org/project/torchvision/)) ## Pre-trained models - -* ADD IF USED -{%- endif %} +Add any pre-trained models and associated licenses here if relevant. \ No newline at end of file From 9f627679efc1f420cf8a5822b1898dc2029c2fbe Mon Sep 17 00:00:00 2001 From: mirkobronzi Date: Mon, 21 Aug 2023 10:50:30 -0400 Subject: [PATCH 2/3] trying different version for protobuf --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 843c9ea..e4cf393 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,8 @@ 'tensorboard==2.9.1', 'tqdm==4.64.0', 'torch==1.12.0', - 'torchvision==0.13.0' + 'torchvision==0.13.0', + 'protobuf==3.19.6' ], entry_points={ 'console_scripts': [ From 20f29c9ccd83818fdab067e9b35a364d21dd1048 Mon Sep 17 00:00:00 2001 From: mirkobronzi Date: Mon, 21 Aug 2023 11:07:28 -0400 Subject: [PATCH 3/3] let lightning find the correct tensorbord version --- setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py index e4cf393..bcb89f3 100644 --- a/setup.py +++ b/setup.py @@ -23,11 +23,9 @@ 'sphinx-rtd-theme==1.0.0', 'sphinxcontrib-napoleon==0.7', 'sphinxcontrib-katex==0.8.6', - 'tensorboard==2.9.1', 'tqdm==4.64.0', 'torch==1.12.0', 'torchvision==0.13.0', - 'protobuf==3.19.6' ], entry_points={ 'console_scripts': [