From 0a791d4462f91347899383809b005ef521aa6b68 Mon Sep 17 00:00:00 2001 From: Max Berrendorf Date: Thu, 19 May 2022 15:50:46 +0200 Subject: [PATCH 01/13] add first draft of PyKEEN configuration --- configs/pykeen/pykeen.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 configs/pykeen/pykeen.yaml diff --git a/configs/pykeen/pykeen.yaml b/configs/pykeen/pykeen.yaml new file mode 100644 index 00000000..b4e2eb69 --- /dev/null +++ b/configs/pykeen/pykeen.yaml @@ -0,0 +1,16 @@ +target_repository: + HTTPS: https://github.com/pykeen/pykeen.git + checkout: master + # copy some tests + copy_tests: + - tests + +dependencies: + - name: pytorch-lightning + HTTPS: https://github.com/PyTorchLightning/pytorch-lightning.git + checkout: release/stable + +testing: + dirs: + - tests + From b99fee3eae56c808a580d7925667a6ee4a73349b Mon Sep 17 00:00:00 2001 From: Max Berrendorf Date: Sat, 21 May 2022 10:44:17 +0200 Subject: [PATCH 02/13] update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aa55a726..b1feea85 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Here are pre-requisites for your project before adding to the Lightning EcoSyste ``` 1. Copy the [template file](actions/_config.yaml) in `configs` folder and call it `.yaml`. ``` - cp configs/template.yaml configs/.yaml + cp actions/_config.yaml configs/.yaml ``` 1. At the minimum, modify the `HTTPS` variable to point to your repository. See [Configuring my project](https://github.com/PyTorchLightning/ecosystem-ci/tree/main#configuring-my-project) for more options. ```yaml From fb216e0953c3c2aff6c21d8608f6eca8e455b871 Mon Sep 17 00:00:00 2001 From: Max Berrendorf Date: Sat, 21 May 2022 10:48:33 +0200 Subject: [PATCH 03/13] update YAML --- configs/pykeen/pykeen.yaml | 55 +++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 6 deletions(-) diff --git a/configs/pykeen/pykeen.yaml b/configs/pykeen/pykeen.yaml index b4e2eb69..491353d6 100644 --- a/configs/pykeen/pykeen.yaml +++ b/configs/pykeen/pykeen.yaml @@ -1,16 +1,59 @@ target_repository: HTTPS: https://github.com/pykeen/pykeen.git - checkout: master - # copy some tests + # OPTIONAL, for some protected repository + # username: my-nick + # OPTIONAL, paired with the username + # password: dont-tell-anyone + # OPTIONAL, overrides the user/pass + # token: authentication-token + # OPTIONAL, checkout a particular branch or a tag + # TODO: change once https://github.com/pykeen/pykeen/pull/930 is merged + checkout: pyl-tests + # checkout: master + # OPTIONAL, define installing package extras + # install_extras: all + # OPTIONAL, install additional requirements from a file + # requirements_file: requirements.txt + # copy some test from the target repository copy_tests: - - tests + - tests/test_lightning.py + +contact: + slack: + - U03DAAVMLSH + email: [] + +# OPTIONAL, running before installing your project +# WARNING: this is custom for given OS, we do not manage any inter OS compatibility +#before_install: +# - pip install Cython==3.56 + +# OPTIONAL, if any installation require some env. variables +#env: +# HOROVOD_BUILD_ARCH_FLAGS: "-mfma" +# # HOROVOD_WITHOUT_MXNET: 1 +# # HOROVOD_WITHOUT_TENSORFLOW: 1 dependencies: - name: pytorch-lightning HTTPS: https://github.com/PyTorchLightning/pytorch-lightning.git - checkout: release/stable - + checkout: release/latest + # install_extras: all +# - name: Cython +# checkout: 0.29.24 + +# OPTIONAL, running before installing your project +# WARNING: this is custom for given OS, we do not manage any inter OS compatibility +#before_test: +# - wget https://pl-flash-data.s3.amazonaws.com/titanic.zip + testing: dirs: - - tests + - tests/ +# # OPTIONAL, additional pytest arguments +# pytest_args: --strict +#runtimes: +# - {os: "ubuntu-20.04", python-version: "3.9"} +# - {os: "macOS-10.15", python-version: "3.7"} +# - {os: "windows-2019", python-version: "3.8"} From 4457bb01983a99ee1a37acec1a1a74eeae20ddf1 Mon Sep 17 00:00:00 2001 From: Max Berrendorf Date: Sat, 21 May 2022 10:50:04 +0200 Subject: [PATCH 04/13] bring back runtimes --- configs/pykeen/pykeen.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pykeen/pykeen.yaml b/configs/pykeen/pykeen.yaml index 491353d6..7af1523b 100644 --- a/configs/pykeen/pykeen.yaml +++ b/configs/pykeen/pykeen.yaml @@ -53,7 +53,7 @@ testing: # # OPTIONAL, additional pytest arguments # pytest_args: --strict -#runtimes: -# - {os: "ubuntu-20.04", python-version: "3.9"} -# - {os: "macOS-10.15", python-version: "3.7"} -# - {os: "windows-2019", python-version: "3.8"} +runtimes: + - {os: "ubuntu-20.04", python-version: "3.10"} + - {os: "macOS-10.15", python-version: "3.9"} + - {os: "windows-2019", python-version: "3.8"} From f956084db878fed08a9b31ce18a1115173eda536 Mon Sep 17 00:00:00 2001 From: Max Berrendorf Date: Sat, 21 May 2022 10:51:24 +0200 Subject: [PATCH 05/13] add .azure entry --- .azure/ci-testig-parameterized.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure/ci-testig-parameterized.yml b/.azure/ci-testig-parameterized.yml index aac70606..b091b199 100644 --- a/.azure/ci-testig-parameterized.yml +++ b/.azure/ci-testig-parameterized.yml @@ -22,3 +22,4 @@ jobs: - "PyTorchLightning/flash_pl-develop.yaml" - "PyTorchLightning/flash_pl-release.yaml" - "microsoft/deepspeed-release.yaml" + - "pykeen/pykeen.yaml" From 921fa7be08e786a2322c2c9c05e62bbe022cde0e Mon Sep 17 00:00:00 2001 From: Max Berrendorf Date: Sat, 21 May 2022 11:06:15 +0200 Subject: [PATCH 06/13] fix missing install extra --- configs/pykeen/pykeen.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pykeen/pykeen.yaml b/configs/pykeen/pykeen.yaml index 7af1523b..f42b228f 100644 --- a/configs/pykeen/pykeen.yaml +++ b/configs/pykeen/pykeen.yaml @@ -11,7 +11,7 @@ target_repository: checkout: pyl-tests # checkout: master # OPTIONAL, define installing package extras - # install_extras: all + install_extras: lightning # OPTIONAL, install additional requirements from a file # requirements_file: requirements.txt # copy some test from the target repository From f4ca6c70209f3fdc7ffb31f892ff2933d4a477dd Mon Sep 17 00:00:00 2001 From: Max Berrendorf Date: Tue, 24 May 2022 18:08:22 +0200 Subject: [PATCH 07/13] update checkout branch --- configs/pykeen/pykeen.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configs/pykeen/pykeen.yaml b/configs/pykeen/pykeen.yaml index f42b228f..cce9d27c 100644 --- a/configs/pykeen/pykeen.yaml +++ b/configs/pykeen/pykeen.yaml @@ -7,9 +7,7 @@ target_repository: # OPTIONAL, overrides the user/pass # token: authentication-token # OPTIONAL, checkout a particular branch or a tag - # TODO: change once https://github.com/pykeen/pykeen/pull/930 is merged - checkout: pyl-tests - # checkout: master + checkout: master # OPTIONAL, define installing package extras install_extras: lightning # OPTIONAL, install additional requirements from a file From 9dc4c13aad6eccb648d29b5f7006d9c263829e02 Mon Sep 17 00:00:00 2001 From: Max Berrendorf Date: Sun, 1 Jan 2023 17:15:21 +0100 Subject: [PATCH 08/13] Update configs/pykeen/pykeen.yaml Co-authored-by: Jirka Borovec <6035284+Borda@users.noreply.github.com> --- configs/pykeen/pykeen.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/configs/pykeen/pykeen.yaml b/configs/pykeen/pykeen.yaml index cce9d27c..5a9b25d4 100644 --- a/configs/pykeen/pykeen.yaml +++ b/configs/pykeen/pykeen.yaml @@ -1,11 +1,5 @@ target_repository: HTTPS: https://github.com/pykeen/pykeen.git - # OPTIONAL, for some protected repository - # username: my-nick - # OPTIONAL, paired with the username - # password: dont-tell-anyone - # OPTIONAL, overrides the user/pass - # token: authentication-token # OPTIONAL, checkout a particular branch or a tag checkout: master # OPTIONAL, define installing package extras From f8bf15f976b85f8358c02040b0ed91f726ed5417 Mon Sep 17 00:00:00 2001 From: Max Berrendorf Date: Sun, 1 Jan 2023 17:15:51 +0100 Subject: [PATCH 09/13] Update configs/pykeen/pykeen.yaml Co-authored-by: Jirka Borovec <6035284+Borda@users.noreply.github.com> --- configs/pykeen/pykeen.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/pykeen/pykeen.yaml b/configs/pykeen/pykeen.yaml index 5a9b25d4..bb828f4c 100644 --- a/configs/pykeen/pykeen.yaml +++ b/configs/pykeen/pykeen.yaml @@ -12,6 +12,7 @@ target_repository: contact: slack: + # Max Berrendorf - U03DAAVMLSH email: [] From 7699bb3234a3eb92a599f0d68e7a1a0009cd083b Mon Sep 17 00:00:00 2001 From: Max Berrendorf Date: Sun, 1 Jan 2023 17:16:02 +0100 Subject: [PATCH 10/13] Update configs/pykeen/pykeen.yaml Co-authored-by: Jirka Borovec <6035284+Borda@users.noreply.github.com> --- configs/pykeen/pykeen.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/configs/pykeen/pykeen.yaml b/configs/pykeen/pykeen.yaml index bb828f4c..58246443 100644 --- a/configs/pykeen/pykeen.yaml +++ b/configs/pykeen/pykeen.yaml @@ -16,17 +16,6 @@ contact: - U03DAAVMLSH email: [] -# OPTIONAL, running before installing your project -# WARNING: this is custom for given OS, we do not manage any inter OS compatibility -#before_install: -# - pip install Cython==3.56 - -# OPTIONAL, if any installation require some env. variables -#env: -# HOROVOD_BUILD_ARCH_FLAGS: "-mfma" -# # HOROVOD_WITHOUT_MXNET: 1 -# # HOROVOD_WITHOUT_TENSORFLOW: 1 - dependencies: - name: pytorch-lightning HTTPS: https://github.com/PyTorchLightning/pytorch-lightning.git From 4cd6fae9cd7dee181a116ed254dec38041ae7cef Mon Sep 17 00:00:00 2001 From: Max Berrendorf Date: Sun, 1 Jan 2023 17:16:09 +0100 Subject: [PATCH 11/13] Update configs/pykeen/pykeen.yaml Co-authored-by: Jirka Borovec <6035284+Borda@users.noreply.github.com> --- configs/pykeen/pykeen.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/pykeen/pykeen.yaml b/configs/pykeen/pykeen.yaml index 58246443..f93e9156 100644 --- a/configs/pykeen/pykeen.yaml +++ b/configs/pykeen/pykeen.yaml @@ -37,5 +37,4 @@ testing: runtimes: - {os: "ubuntu-20.04", python-version: "3.10"} - - {os: "macOS-10.15", python-version: "3.9"} - {os: "windows-2019", python-version: "3.8"} From c956f8f7e87ddbb6fb91f08fa82ec68486da807e Mon Sep 17 00:00:00 2001 From: Max Berrendorf Date: Sun, 1 Jan 2023 17:31:59 +0100 Subject: [PATCH 12/13] fix missing test utilities --- configs/pykeen/pykeen.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/pykeen/pykeen.yaml b/configs/pykeen/pykeen.yaml index f93e9156..1cd7c802 100644 --- a/configs/pykeen/pykeen.yaml +++ b/configs/pykeen/pykeen.yaml @@ -9,6 +9,7 @@ target_repository: # copy some test from the target repository copy_tests: - tests/test_lightning.py + - tests/utils.py contact: slack: From e01cee7c928060f36cfe40b5ac9f233aab8d43e6 Mon Sep 17 00:00:00 2001 From: Max Berrendorf Date: Tue, 10 Jan 2023 19:28:40 +0100 Subject: [PATCH 13/13] update to new template cf. https://github.com/Lightning-AI/ecosystem-ci/blob/ca71a80f107273ef7e196b71f69eed0cac5af5b2/actions/_config.yaml --- configs/pykeen/pykeen.yaml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/configs/pykeen/pykeen.yaml b/configs/pykeen/pykeen.yaml index 1cd7c802..8288628c 100644 --- a/configs/pykeen/pykeen.yaml +++ b/configs/pykeen/pykeen.yaml @@ -4,8 +4,6 @@ target_repository: checkout: master # OPTIONAL, define installing package extras install_extras: lightning - # OPTIONAL, install additional requirements from a file - # requirements_file: requirements.txt # copy some test from the target repository copy_tests: - tests/test_lightning.py @@ -19,22 +17,12 @@ contact: dependencies: - name: pytorch-lightning - HTTPS: https://github.com/PyTorchLightning/pytorch-lightning.git + HTTPS: https://github.com/Lightning-AI/lightning.git checkout: release/latest - # install_extras: all -# - name: Cython -# checkout: 0.29.24 - -# OPTIONAL, running before installing your project -# WARNING: this is custom for given OS, we do not manage any inter OS compatibility -#before_test: -# - wget https://pl-flash-data.s3.amazonaws.com/titanic.zip testing: dirs: - tests/ -# # OPTIONAL, additional pytest arguments -# pytest_args: --strict runtimes: - {os: "ubuntu-20.04", python-version: "3.10"}