From 4283912a26d50c111ea52aae0d4ef5c1e1588dcd Mon Sep 17 00:00:00 2001 From: Alexandre Strube Date: Fri, 18 Nov 2022 14:01:09 +0000 Subject: [PATCH 1/7] Version bump. New dependencies of latest tensorboard and Lightning --- ...-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb diff --git a/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb b/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb new file mode 100644 index 00000000000..8f4749f4dae --- /dev/null +++ b/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb @@ -0,0 +1,49 @@ +easyblock = 'PythonBundle' + +name = 'PyTorch-Lightning' +version = '1.8.2' +versionsuffix = '-CUDA-%(cudaver)s' + +homepage = 'https://pytorchlightning.ai' +description = "PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers." + +toolchain = {'name': 'foss', 'version': '2022a'} + +dependencies = [ + ('CUDA', '11.7.0', '', SYSTEM), + ('Python', '3.10.4'), + ('PyTorch', '1.12.0', versionsuffix), + ('tqdm', '4.64.0'), + ('tensorboard', '2.10.0'), + ('typing-extensions', '4.3.0'), +] + +exts_list = [ + ('fsspec', '2022.11.0', { + 'checksums': ['259d5fd5c8e756ff2ea72f42e7613c32667dc2049a4ac3d84364a7ca034acb8b'], + }), + ('pyDeprecate', '0.3.2', { + 'modulename': 'deprecate', + 'checksums': ['d481116cc5d7f6c473e7c4be820efdd9b90a16b594b350276e9e66a6cb5bdd29'], + }), + ('torchmetrics', '0.10.3', { + 'checksums': ['9e6ab66175f2dc13e246c37485b2c27c77931dfe47fc2b81c76217b8efdc1e57'], + }), + ('termcolor', '2.1.0', { + 'checksums': ['b80df54667ce4f48c03fe35df194f052dc27a541ebbf2544e4d6b47b5d6949c4'], + }), + ('fire', '0.4.0', { + 'checksums': ['c5e2b8763699d1142393a46d0e3e790c5eb2f0706082df8f647878842c216a62'], + }), + ('lightning-utilities', '0.3.0', { + 'checksums': ['d769ab9b76ebdee3243d1051d509aafee57d7947734ddc22977deef8a6427f2f'], + }), + ('pytorch-lightning', version, { + 'checksums': ['480f3396cd63888c4e5ec2f21c02fe662a2b035d9634e6f31fcf1197a36ebd15'], + }), +] + +use_pip = True +sanity_pip_check = True + +moduleclass = 'lib' From 30411e5fe2fe94d592ea3f9e64b82a44b961e9e4 Mon Sep 17 00:00:00 2001 From: Alexandre Strube Date: Thu, 8 Dec 2022 20:39:41 +0100 Subject: [PATCH 2/7] Update PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb --- .../PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb | 3 --- 1 file changed, 3 deletions(-) diff --git a/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb b/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb index 8f4749f4dae..d131b7ed36b 100644 --- a/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb +++ b/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb @@ -29,9 +29,6 @@ exts_list = [ ('torchmetrics', '0.10.3', { 'checksums': ['9e6ab66175f2dc13e246c37485b2c27c77931dfe47fc2b81c76217b8efdc1e57'], }), - ('termcolor', '2.1.0', { - 'checksums': ['b80df54667ce4f48c03fe35df194f052dc27a541ebbf2544e4d6b47b5d6949c4'], - }), ('fire', '0.4.0', { 'checksums': ['c5e2b8763699d1142393a46d0e3e790c5eb2f0706082df8f647878842c216a62'], }), From 98485c1091a42fff28f8ac171d28e2ae0a0d81d8 Mon Sep 17 00:00:00 2001 From: Alexandre Strube Date: Thu, 8 Dec 2022 23:04:22 +0100 Subject: [PATCH 3/7] Update easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb Co-authored-by: SebastianAchilles --- .../PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb b/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb index d131b7ed36b..e9d3bd119a4 100644 --- a/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb +++ b/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb @@ -29,6 +29,10 @@ exts_list = [ ('torchmetrics', '0.10.3', { 'checksums': ['9e6ab66175f2dc13e246c37485b2c27c77931dfe47fc2b81c76217b8efdc1e57'], }), + # stick to termcolor 1.x, to avoid hatchling required dependency + ('termcolor', '1.1.0', { + 'checksums': ['1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b'], + }), ('fire', '0.4.0', { 'checksums': ['c5e2b8763699d1142393a46d0e3e790c5eb2f0706082df8f647878842c216a62'], }), From b63081a90ed5f63181fa96c4ef9fd53264be90cf Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Fri, 9 Dec 2022 23:40:37 +0100 Subject: [PATCH 4/7] adding easyconfig deepdiff-5.8.1-GCCcore-11.3.0.eb --- .../deepdiff/deepdiff-5.8.1-GCCcore-11.3.0.eb | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 easybuild/easyconfigs/d/deepdiff/deepdiff-5.8.1-GCCcore-11.3.0.eb diff --git a/easybuild/easyconfigs/d/deepdiff/deepdiff-5.8.1-GCCcore-11.3.0.eb b/easybuild/easyconfigs/d/deepdiff/deepdiff-5.8.1-GCCcore-11.3.0.eb new file mode 100644 index 00000000000..fffd39905e0 --- /dev/null +++ b/easybuild/easyconfigs/d/deepdiff/deepdiff-5.8.1-GCCcore-11.3.0.eb @@ -0,0 +1,29 @@ +easyblock = 'PythonBundle' + +name = 'deepdiff' +version = '5.8.1' + +homepage = 'https://zepworks.com/deepdiff/current/' +description = """DeepDiff: Deep Difference of dictionaries, iterables and almost any other object recursively.""" + +toolchain = {'name': 'GCCcore', 'version': '11.3.0'} + +builddependencies = [('binutils', '2.38')] +dependencies = [('Python', '3.10.4')] + +use_pip = True +sanity_pip_check = True + +exts_list = [ + ('jsonpickle', '2.2.0', { + 'checksums': ['7b272918b0554182e53dc340ddd62d9b7f902fec7e7b05620c04f3ccef479a0e'], + }), + ('ordered-set', '4.1.0', { + 'checksums': ['694a8e44c87657c59292ede72891eb91d34131f6531463aab3009191c77364a8'], + }), + (name, version, { + 'checksums': ['8d4eb2c4e6cbc80b811266419cb71dd95a157094a3947ccf937a94d44943c7b8'], + }), +] + +moduleclass = 'tools' From d40c72fb741a95735e90e9ad9223ee4095192d36 Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Sat, 10 Dec 2022 00:34:25 +0100 Subject: [PATCH 5/7] adding easyconfigs tensorboardX-2.5.1-foss-2022a.eb --- .../tensorboardX-2.5.1-foss-2022a.eb | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 easybuild/easyconfigs/t/tensorboardX/tensorboardX-2.5.1-foss-2022a.eb diff --git a/easybuild/easyconfigs/t/tensorboardX/tensorboardX-2.5.1-foss-2022a.eb b/easybuild/easyconfigs/t/tensorboardX/tensorboardX-2.5.1-foss-2022a.eb new file mode 100644 index 00000000000..8a5ba42a91c --- /dev/null +++ b/easybuild/easyconfigs/t/tensorboardX/tensorboardX-2.5.1-foss-2022a.eb @@ -0,0 +1,30 @@ +easyblock = 'PythonBundle' + +name = 'tensorboardX' +version = '2.5.1' + +homepage = 'https://github.com/lanpa/tensorboardX' +description = "Tensorboard for PyTorch." + +toolchain = {'name': 'foss', 'version': '2022a'} + +# tensorboardX v2.x works with tensorboards generated with TensorFlow 2, +# but TensorFlow is not needed to use tensorboardX +dependencies = [ + ('Python', '3.10.4'), + ('SciPy-bundle', '2022.05'), + ('protobuf-python', '3.19.4'), +] + +use_pip = True + +exts_list = [ + (name, version, { + 'modulename': '%(name)s', + 'checksums': ['ea85a3446f22ce8a917fe4fa4d8a7a96222ef84ac835267d038c34bb99f6d61b'], + }), +] + +sanity_pip_check = True + +moduleclass = 'vis' From 9605baf9cb3834d492af9988b49fca58dc835788 Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Fri, 9 Dec 2022 23:41:12 +0100 Subject: [PATCH 6/7] update PyTorch-Lightning v1.8.2 to v1.8.4 and use dependencies following its requirements file --- ...-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb | 50 ------- ...-Lightning-1.8.4-foss-2022a-CUDA-11.7.0.eb | 124 ++++++++++++++++++ 2 files changed, 124 insertions(+), 50 deletions(-) delete mode 100644 easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb create mode 100644 easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.4-foss-2022a-CUDA-11.7.0.eb diff --git a/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb b/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb deleted file mode 100644 index e9d3bd119a4..00000000000 --- a/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.2-foss-2022a-CUDA-11.7.0.eb +++ /dev/null @@ -1,50 +0,0 @@ -easyblock = 'PythonBundle' - -name = 'PyTorch-Lightning' -version = '1.8.2' -versionsuffix = '-CUDA-%(cudaver)s' - -homepage = 'https://pytorchlightning.ai' -description = "PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers." - -toolchain = {'name': 'foss', 'version': '2022a'} - -dependencies = [ - ('CUDA', '11.7.0', '', SYSTEM), - ('Python', '3.10.4'), - ('PyTorch', '1.12.0', versionsuffix), - ('tqdm', '4.64.0'), - ('tensorboard', '2.10.0'), - ('typing-extensions', '4.3.0'), -] - -exts_list = [ - ('fsspec', '2022.11.0', { - 'checksums': ['259d5fd5c8e756ff2ea72f42e7613c32667dc2049a4ac3d84364a7ca034acb8b'], - }), - ('pyDeprecate', '0.3.2', { - 'modulename': 'deprecate', - 'checksums': ['d481116cc5d7f6c473e7c4be820efdd9b90a16b594b350276e9e66a6cb5bdd29'], - }), - ('torchmetrics', '0.10.3', { - 'checksums': ['9e6ab66175f2dc13e246c37485b2c27c77931dfe47fc2b81c76217b8efdc1e57'], - }), - # stick to termcolor 1.x, to avoid hatchling required dependency - ('termcolor', '1.1.0', { - 'checksums': ['1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b'], - }), - ('fire', '0.4.0', { - 'checksums': ['c5e2b8763699d1142393a46d0e3e790c5eb2f0706082df8f647878842c216a62'], - }), - ('lightning-utilities', '0.3.0', { - 'checksums': ['d769ab9b76ebdee3243d1051d509aafee57d7947734ddc22977deef8a6427f2f'], - }), - ('pytorch-lightning', version, { - 'checksums': ['480f3396cd63888c4e5ec2f21c02fe662a2b035d9634e6f31fcf1197a36ebd15'], - }), -] - -use_pip = True -sanity_pip_check = True - -moduleclass = 'lib' diff --git a/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.4-foss-2022a-CUDA-11.7.0.eb b/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.4-foss-2022a-CUDA-11.7.0.eb new file mode 100644 index 00000000000..532eba19c22 --- /dev/null +++ b/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.4-foss-2022a-CUDA-11.7.0.eb @@ -0,0 +1,124 @@ +easyblock = 'PythonBundle' + +name = 'PyTorch-Lightning' +version = '1.8.4' +versionsuffix = '-CUDA-%(cudaver)s' + +homepage = 'https://pytorchlightning.ai' +description = "PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers." + +toolchain = {'name': 'foss', 'version': '2022a'} + +dependencies = [ + ('CUDA', '11.7.0', '', SYSTEM), + ('Python', '3.10.4'), + # dependencies from requirements/app/base.txt + ('aiohttp', '3.8.3'), + ('BeautifulSoup', '4.10.0'), + ('deepdiff', '5.8.1'), + # dependencies from requirements/pytorch/base.txt + ('PyTorch', '1.12.0', versionsuffix), + ('tqdm', '4.64.0'), + ('tensorboardX', '2.5.1'), +] + +use_pip = True + +# dependencies from requirements/app/base.txt and requirements/pytorch/base.txt +exts_list = [ + ('commonmark', '0.9.1', { + 'checksums': ['452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60'], + }), + ('rich', '12.5.1', { + 'checksums': ['63a5c5ce3673d3d5fbbf23cd87e11ab84b6b451436f1b7f19ec54b6bc36ed7ca'], + }), + ('pydantic', '1.10.2', { + 'checksums': ['91b8e218852ef6007c2b98cd861601c6a09f1aa32bbbb74fab5b1c33d4a1e410'], + }), + ('PyJWT', '2.6.0', { + 'modulename': 'jwt', + 'checksums': ['69285c7e31fc44f68a1feb309e948e0df53259d579295e6cfe2b1792329f05fd'], + }), + ('starlette', '0.19.1', { + 'checksums': ['c6d21096774ecb9639acad41b86b7706e52ba3bf1dc13ea4ed9ad593d47e24c7'], + }), + ('fastapi', '0.79.1', { + 'checksums': ['006862dec0f0f5683ac21fb0864af2ff12a931e7ba18920f28cc8eceed51896b'], + }), + ('sniffio', '1.3.0', { + 'checksums': ['e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101'], + }), + ('anyio', '3.6.1', { + 'checksums': ['413adf95f93886e442aea925f3ee43baa5a765a64a0f52c6081894f9992fdd0b'], + }), + ('websocket-client', '1.4.2', { + 'modulename': 'websocket', + 'checksums': ['d6e8f90ca8e2dd4e8027c4561adeb9456b54044312dba655e7cae652ceb9ae59'], + }), + ('lightning_cloud', '0.5.12', { + 'checksums': ['5b0cf53ecfb512f9476eec3a7f425c0e174ca9d0e726673605d5e1e57074eb0c'], + }), + ('itsdangerous', '2.1.2', { + 'checksums': ['5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a'], + }), + ('starsessions', '1.3.0', { + 'checksums': ['8d3b509d4e6d235655f7dd495fcf0afc1bd86da84de3a8d434e6f82137ebcde8'], + }), + ('fsspec', '2022.7.1', { + 'checksums': ['7f9fb19d811b027b97c4636c6073eb53bc4cbee2d3c4b33fa88b9f26906fd7d7'], + }), + ('croniter', '1.3.8', { + 'checksums': ['32a5ec04e97ec0837bcdf013767abd2e71cceeefd3c2e14c804098ce51ad6cd9'], + }), + ('traitlets', '5.2.0', { + 'checksums': ['60474f39bf1d39a11e0233090b99af3acee93bbc2281777e61dd8c87da8a0014'], + }), + ('arrow', '1.2.3', { + 'checksums': ['3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1'], + }), + ('lightning-utilities', '0.4.2', { + 'checksums': ['dc6696ab180117f7e97b5488dac1d77765ab891022f7521a97a39e10d362bdb8'], + }), + ('blessed', '1.19.1', { + 'checksums': ['9a0d099695bf621d4680dd6c73f6ad547f6a3442fbdbe80c4b1daa1edbc492fc'], + }), + ('python-editor', '1.0.4', { + 'modulename': 'editor', + 'checksums': ['51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b'], + }), + ('readchar', '4.0.3', { + 'checksums': ['1d920d0e9ab76ec5d42192a68d15af2562663b5dfbf4a67cf9eba520e1ca57e6'], + }), + ('inquirer', '2.10.1', { + 'checksums': ['e9876258183e24f6e8c44136b04f6f2e18dd6684aee59b86a8057c50601a6523'], + }), + ('wrapt', '1.14.1', { + 'checksums': ['380a85cf89e0e69b7cfbe2ea9f765f004ff419f34194018a6827ac0e3edfed4d'], + }), + ('jmespath', '1.0.1', { + 'checksums': ['90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe'], + }), + ('botocore', '1.24.21', { + 'checksums': ['7e976cfd0a61601e74624ef8f5246b40a01f2cce73a011ef29cf80a6e371d0fa'], + }), + ('aioitertools', '0.11.0', { + 'checksums': ['42c68b8dd3a69c2bf7f2233bf7df4bb58b557bca5252ac02ed5187bbc67d6831'], + }), + ('aiobotocore', '2.3.4', { + 'checksums': ['6554ebea5764f66f4be544a4fcaa0953ee80e600dd7bd818ba4893d72bf12bfb'], + }), + ('s3fs', '2022.7.1', { + 'checksums': ['4883d682cb96b769fca568dbbcaa33ff457ac8077a03af221e6f253adac05771'], + }), + ('torchmetrics', '0.9.3', { + 'checksums': ['4ebfd2466021db26397636966ee1a195d3b340ba5d71bb258e764340dfc2476f'], + }), + ('pytorch-lightning', version, { + 'checksums': ['c2771f966fc1b909cdfd1d603a87b8c84a3d5ff7aacf35b2c0260f697ec0c8be'], + }), +] + +sanity_pip_check = True + +moduleclass = 'lib' + From 39f7d49c2f8e8187dcf1ebc086eddd728ffc7b4c Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Sun, 11 Dec 2022 01:51:14 +0100 Subject: [PATCH 7/7] remove blank lines at end of PyTorch-Lightning-1.8.4-foss-2022a-CUDA-11.7.0.eb --- .../PyTorch-Lightning-1.8.4-foss-2022a-CUDA-11.7.0.eb | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.4-foss-2022a-CUDA-11.7.0.eb b/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.4-foss-2022a-CUDA-11.7.0.eb index 532eba19c22..faf2e40814c 100644 --- a/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.4-foss-2022a-CUDA-11.7.0.eb +++ b/easybuild/easyconfigs/p/PyTorch-Lightning/PyTorch-Lightning-1.8.4-foss-2022a-CUDA-11.7.0.eb @@ -121,4 +121,3 @@ exts_list = [ sanity_pip_check = True moduleclass = 'lib' -