ClearML/clearml-agent
1
0
Fork 0
mirror of https://github.com/clearml/clearml-agent synced 2025-06-10 08:27:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix conda support to install graphviz packages even if matplotlib was installed from pip

Browse Source
This commit is contained in:
allegroai 2020-01-27 19:22:51 +02:00
parent 8ef78fd058
commit df10e6ed46
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
trains_agent/helper/package/conda_api.py
View File

@ -312,6 +312,8 @@ class CondaAPI(PackageManager):
else: else:
# not in conda, it is a pip package # not in conda, it is a pip package
pip_requirements.append(m) pip_requirements.append(m)
if m_name == 'matplotlib':
has_matplotlib = True
# remove any leftover conda packages (they were removed from the pip list) # remove any leftover conda packages (they were removed from the pip list)
if conda_supported_req_names: if conda_supported_req_names:
@ -320,6 +322,7 @@ class CondaAPI(PackageManager):
# Conda requirements Hacks: # Conda requirements Hacks:
if has_matplotlib: if has_matplotlib:
reqs.append(MarkerRequirement(Requirement.parse('graphviz'))) reqs.append(MarkerRequirement(Requirement.parse('graphviz')))
reqs.append(MarkerRequirement(Requirement.parse('python-graphviz')))
reqs.append(MarkerRequirement(Requirement.parse('kiwisolver'))) reqs.append(MarkerRequirement(Requirement.parse('kiwisolver')))
if has_torch and cuda_version == 0: if has_torch and cuda_version == 0:
reqs.append(MarkerRequirement(Requirement.parse('cpuonly'))) reqs.append(MarkerRequirement(Requirement.parse('cpuonly')))