Merge pull request easybuilders#21337 from lexming/20240906160150_new…

…_pr_TensorFlow2151 use proper dependency for tensorboard in easyconfigs for TensorFlow v2.15.1
boegel · Sep 21, 2024 · 94b1e13 · 94b1e13
2 parents 4b61706 + 6772363
commit 94b1e13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 123 deletions.
diff --git a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.15.1-foss-2023a-CUDA-12.1.1.eb b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.15.1-foss-2023a-CUDA-12.1.1.eb
@@ -51,7 +51,7 @@ dependencies = [
     ('libpng', '1.6.39'),
     ('snappy', '1.1.10'),
     ('zlib', '1.2.13'),
-    ('grpcio', '1.57.0'),
+    ('tensorboard', '2.15.1'),
 ]
 
 # Dependencies created and updated using findPythonDeps, see:
@@ -71,48 +71,6 @@ exts_list = [
         'source_tmpl': 'tensorflow_estimator-%(version)s-py2.py3-none-any.whl',
         'checksums': ['aedf21eec7fb2dc91150fc91a1ce12bc44dbb72278a08b58e79ff87c9e28f153'],
     }),
-    ('Werkzeug', '3.0.2', {
-        'source_tmpl': SOURCELOWER_TAR_GZ,
-        'checksums': ['e39b645a6ac92822588e7b39a692e7828724ceae0b0d702ef96701f90e70128d'],
-    }),
-    ('tensorboard-data-server', '0.7.2', {
-        'source_tmpl': 'tensorboard_data_server-%(version)s-py3-none-any.whl',
-        'checksums': ['7e0610d205889588983836ec05dc098e80f97b7e7bbff7e994ebb78f578d0ddb'],
-    }),
-    ('Markdown', '3.6', {
-        'checksums': ['ed4f41f6daecbeeb96e576ce414c41d2d876daa9a16cb35fa8ed8c2ddfad0224'],
-    }),
-    ('oauthlib', '3.2.2', {
-        'checksums': ['9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918'],
-    }),
-    ('requests-oauthlib', '2.0.0', {
-        'checksums': ['b3dffaebd884d8cd778494369603a9e7b58d29111bf6b41bdc2dcd87203af4e9'],
-    }),
-    ('rsa', '4.9', {
-        'checksums': ['e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21'],
-    }),
-    ('pyasn1-modules', '0.4.0', {
-        'source_tmpl': 'pyasn1_modules-%(version)s.tar.gz',
-        'checksums': ['831dbcea1b177b28c9baddf4c6d1013c24c3accd14a1873fffaa6a2e905f17b6'],
-    }),
-    ('cachetools', '5.3.3', {
-        'checksums': ['ba29e2dfa0b8b556606f097407ed1aa62080ee108ab0dc5ec9d6a723a007d105'],
-    }),
-    ('google-auth', '2.29.0', {
-        'modulename': 'google.auth',
-        'checksums': ['672dff332d073227550ffc7457868ac4218d6c500b155fe6cc17d2b13602c360'],
-    }),
-    ('google-auth-oauthlib', '1.2.0', {
-        'checksums': ['292d2d3783349f2b0734a0a0207b1e1e322ac193c2c09d8f7c613fb7cc501ea8'],
-    }),
-    ('absl-py', '2.1.0', {
-        'modulename': 'absl',
-        'checksums': ['7820790efbb316739cde8b4e19357243fc3608a152024288513dd968d7d959ff'],
-    }),
-    ('tensorboard', '2.15.2', {
-        'source_tmpl': '%(name)s-%(version)s-py3-none-any.whl',
-        'checksums': ['a6f6443728064d962caea6d34653e220e34ef8df764cb06a8212c17e1a8f0622'],
-    }),
     ('keras', '2.15.0', {
         'source_tmpl': '%(name)s-%(version)s-py3-none-any.whl',
         'checksums': ['2dcc6d2e30cf9c951064b63c1f4c404b966c59caf09e01f3549138ec8ee0dd1f'],
@@ -131,15 +89,6 @@ exts_list = [
     ('astor', '0.8.1', {
         'checksums': ['6a6effda93f4e1ce9f618779b2dd1d9d84f1e32812c23a29b3fff6fd7f63fa5e'],
     }),
-    # Optional profile plugin + dependency
-    ('gviz-api', '1.10.0', {
-        'source_tmpl': 'gviz_api-%(version)s.tar.gz',
-        'checksums': ['846692dd8cc73224fc31b18e41589bd934e1cc05090c6576af4b4b26c2e71b90'],
-    }),
-    ('tensorboard-plugin-profile', '2.15.1', {
-        'source_tmpl': 'tensorboard_plugin_profile-%(version)s.tar.gz',
-        'checksums': ['84bb33e446eb4a9c0616f669fc6a42cdd40eadd9ae1d74bf756f4f0479993273'],
-    }),
     (name, version, {
         'patches': [
             'TensorFlow-2.1.0_fix-cuda-build.patch',
@@ -226,13 +175,4 @@ exts_list = [
     }),
 ]
 
-#  Taken from tensorboard-2.15.1-gfbf-2023a.eb:
-#  Relax restriction on protobuf dependency as issue was fixed
-#  in https://github.com/protocolbuffers/upb/pull/1514
-#  see also: https://github.com/easybuilders/easybuild-easyconfigs/pull/19671
-postinstallcmds = [
-    'sed -i "s/Requires-Dist: protobuf.*/Requires-Dist: protobuf >=3.19.6/g" ' +
-    '%(installdir)s/lib/python%(pyshortver)s/site-packages/tensorboard-2.15.2.dist-info/METADATA',
-]
-
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.15.1-foss-2023a.eb b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.15.1-foss-2023a.eb
@@ -47,7 +47,7 @@ dependencies = [
     ('libpng', '1.6.39'),
     ('snappy', '1.1.10'),
     ('zlib', '1.2.13'),
-    ('grpcio', '1.57.0'),
+    ('tensorboard', '2.15.1'),
 ]
 
 # Dependencies created and updated using findPythonDeps, see:
@@ -57,7 +57,6 @@ dependencies = [
 # - portpicker for tests no longer needed (TF@e85860e838)
 # - opt_einsum now comes from ml_dtypes
 exts_list = [
-
     ('wrapt', '1.14.1', {
         'checksums': ['380a85cf89e0e69b7cfbe2ea9f765f004ff419f34194018a6827ac0e3edfed4d'],
     }),
@@ -68,48 +67,6 @@ exts_list = [
         'source_tmpl': 'tensorflow_estimator-%(version)s-py2.py3-none-any.whl',
         'checksums': ['aedf21eec7fb2dc91150fc91a1ce12bc44dbb72278a08b58e79ff87c9e28f153'],
     }),
-    ('Werkzeug', '3.0.2', {
-        'source_tmpl': SOURCELOWER_TAR_GZ,
-        'checksums': ['e39b645a6ac92822588e7b39a692e7828724ceae0b0d702ef96701f90e70128d'],
-    }),
-    ('tensorboard-data-server', '0.7.2', {
-        'source_tmpl': 'tensorboard_data_server-%(version)s-py3-none-any.whl',
-        'checksums': ['7e0610d205889588983836ec05dc098e80f97b7e7bbff7e994ebb78f578d0ddb'],
-    }),
-    ('Markdown', '3.6', {
-        'checksums': ['ed4f41f6daecbeeb96e576ce414c41d2d876daa9a16cb35fa8ed8c2ddfad0224'],
-    }),
-    ('oauthlib', '3.2.2', {
-        'checksums': ['9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918'],
-    }),
-    ('requests-oauthlib', '2.0.0', {
-        'checksums': ['b3dffaebd884d8cd778494369603a9e7b58d29111bf6b41bdc2dcd87203af4e9'],
-    }),
-    ('rsa', '4.9', {
-        'checksums': ['e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21'],
-    }),
-    ('pyasn1-modules', '0.4.0', {
-        'source_tmpl': 'pyasn1_modules-%(version)s.tar.gz',
-        'checksums': ['831dbcea1b177b28c9baddf4c6d1013c24c3accd14a1873fffaa6a2e905f17b6'],
-    }),
-    ('cachetools', '5.3.3', {
-        'checksums': ['ba29e2dfa0b8b556606f097407ed1aa62080ee108ab0dc5ec9d6a723a007d105'],
-    }),
-    ('google-auth', '2.29.0', {
-        'modulename': 'google.auth',
-        'checksums': ['672dff332d073227550ffc7457868ac4218d6c500b155fe6cc17d2b13602c360'],
-    }),
-    ('google-auth-oauthlib', '1.2.0', {
-        'checksums': ['292d2d3783349f2b0734a0a0207b1e1e322ac193c2c09d8f7c613fb7cc501ea8'],
-    }),
-    ('absl-py', '2.1.0', {
-        'modulename': 'absl',
-        'checksums': ['7820790efbb316739cde8b4e19357243fc3608a152024288513dd968d7d959ff'],
-    }),
-    ('tensorboard', '2.15.2', {
-        'source_tmpl': '%(name)s-%(version)s-py3-none-any.whl',
-        'checksums': ['a6f6443728064d962caea6d34653e220e34ef8df764cb06a8212c17e1a8f0622'],
-    }),
     ('keras', '2.15.0', {
         'source_tmpl': '%(name)s-%(version)s-py3-none-any.whl',
         'checksums': ['2dcc6d2e30cf9c951064b63c1f4c404b966c59caf09e01f3549138ec8ee0dd1f'],
@@ -128,15 +85,6 @@ exts_list = [
     ('astor', '0.8.1', {
         'checksums': ['6a6effda93f4e1ce9f618779b2dd1d9d84f1e32812c23a29b3fff6fd7f63fa5e'],
     }),
-    # Optional profile plugin + dependency
-    ('gviz-api', '1.10.0', {
-        'source_tmpl': 'gviz_api-%(version)s.tar.gz',
-        'checksums': ['846692dd8cc73224fc31b18e41589bd934e1cc05090c6576af4b4b26c2e71b90'],
-    }),
-    ('tensorboard-plugin-profile', '2.15.1', {
-        'source_tmpl': 'tensorboard_plugin_profile-%(version)s.tar.gz',
-        'checksums': ['84bb33e446eb4a9c0616f669fc6a42cdd40eadd9ae1d74bf756f4f0479993273'],
-    }),
     (name, version, {
         'patches': [
             'TensorFlow-2.13.0_add-missing-system-protobuf-targets.patch',
@@ -208,13 +156,4 @@ exts_list = [
     }),
 ]
 
-#  Taken from tensorboard-2.15.1-gfbf-2023a.eb:
-#  Relax restriction on protobuf dependency as issue was fixed
-#  in https://github.com/protocolbuffers/upb/pull/1514
-#  see also: https://github.com/easybuilders/easybuild-easyconfigs/pull/19671
-postinstallcmds = [
-    'sed -i "s/Requires-Dist: protobuf.*/Requires-Dist: protobuf >=3.19.6/g" ' +
-    '%(installdir)s/lib/python%(pyshortver)s/site-packages/tensorboard-2.15.2.dist-info/METADATA',
-]
-
 moduleclass = 'lib'