ClearML/clearml
1
0
Fork 0
mirror of https://github.com/clearml/clearml synced 2025-06-26 18:16:07 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix requirements detection:

Browse Source 
- multiple -e packages were not detected (only the first one)
- trains installed from git + running with trains in python path resulted in double entry of trains
- Do not add -e to packages installed from git repositories, Trains-Agent doesn't like it
This commit is contained in:
allegroai
2020-07-30 15:12:46 +03:00
parent 1d277d01d3
commit 619be3dc75
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
trains/backend_interface/task/repo/scriptinfo.py
View File

@@ -128,7 +128,10 @@ class ScriptRequirements(object):
name = 'torch'
k, v = reqs_lower.get(name, (None, None))
if k and v is not None:
conda_requirements += '{0} {1} {2}\n'.format(k, '==', v.version)
if v.version:
conda_requirements += '{0} {1} {2}\n'.format(k, '==', v.version)
else:
conda_requirements += '{0}\n'.format(k)
except Exception:
conda_requirements = ''
@@ -147,7 +150,10 @@ class ScriptRequirements(object):
if local_pks:
requirements_txt += '\n# Local modules found - skipping:\n'
for k, v in local_pks.sorted_items():
requirements_txt += '# {0} == {1}\n'.format(k, v.version)
if v.version:
requirements_txt += '# {0} == {1}\n'.format(k, v.version)
else:
requirements_txt += '# {0}\n'.format(k)
# requirement summary
requirements_txt += '\n'
@@ -158,9 +164,11 @@ class ScriptRequirements(object):
if forced_version:
version = forced_version
# requirements_txt += ''.join(['# {0}\n'.format(c) for c in v.comments.sorted_items()])
if k == '-e':
requirements_txt += '{0} {1}\n'.format(k, version)
elif v:
if k == '-e' and version:
requirements_txt += '{0}\n'.format(version)
elif k.startswith('-e '):
requirements_txt += '{0} {1}\n'.format(k.replace('-e ', '', 1), version or '')
elif version:
requirements_txt += '{0} {1} {2}\n'.format(k, '==', version)
else:
requirements_txt += '{0}\n'.format(k)