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

Bugfix/cwd flag closes #1160 (#1161)

Browse Source 
Fixes bug when using --cwd and --file with clearml-task

Co-authored-by: dimda <dimda@dtu.dk>
This commit is contained in:
dimidagd 2024-02-09 16:05:06 +01:00 committed by GitHub
parent 006741645f
commit 956e7e4478
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clearml/backend_interface/task/populate.py
View File

@ -92,7 +92,6 @@ class CreateAndPopulate(object):
repo = None repo = None
else: else:
folder = None folder = None
if raise_on_missing_entries and not base_task_id: if raise_on_missing_entries and not base_task_id:
if not script: if not script:
raise ValueError("Entry point script not provided") raise ValueError("Entry point script not provided")
@ -168,7 +167,6 @@ class CreateAndPopulate(object):
and not self.repo and ( and not self.repo and (
not repo_info or not repo_info.script or not repo_info.script.get('repository')): not repo_info or not repo_info.script or not repo_info.script.get('repository')):
raise ValueError("Standalone script detected \'{}\', but no requirements provided".format(self.script)) raise ValueError("Standalone script detected \'{}\', but no requirements provided".format(self.script))
if dry_run: if dry_run:
task = None task = None
task_state = dict( task_state = dict(
@ -204,7 +202,6 @@ class CreateAndPopulate(object):
# clear the script section # clear the script section
task_state['script'] = {} task_state['script'] = {}
if repo_info: if repo_info:
task_state['script']['repository'] = repo_info.script['repository'] task_state['script']['repository'] = repo_info.script['repository']
task_state['script']['version_num'] = repo_info.script['version_num'] task_state['script']['version_num'] = repo_info.script['version_num']
@ -216,15 +213,15 @@ class CreateAndPopulate(object):
task_state['script']['requirements'] = repo_info.script.get('requirements') or {} task_state['script']['requirements'] = repo_info.script.get('requirements') or {}
if self.cwd: if self.cwd:
self.cwd = self.cwd self.cwd = self.cwd
cwd = self.cwd if Path(self.cwd).is_dir() else ( cwd = (Path(repo_info.script['repo_root']) / self.cwd).as_posix()
Path(repo_info.script['repo_root']) / self.cwd).as_posix()
if not Path(cwd).is_dir(): if not Path(cwd).is_dir():
raise ValueError("Working directory \'{}\' could not be found".format(cwd)) raise ValueError("Working directory \'{}\' could not be found".format(cwd))
cwd = Path(cwd).relative_to(repo_info.script['repo_root']).as_posix()
entry_point = \ entry_point = \
Path(repo_info.script['repo_root']) / repo_info.script['working_dir'] / repo_info.script[ Path(repo_info.script['repo_root']) / repo_info.script['working_dir'] / repo_info.script[
'entry_point'] 'entry_point']
entry_point = entry_point.relative_to(cwd).as_posix() entry_point = entry_point.relative_to(cwd).as_posix()
cwd = Path(cwd).relative_to(repo_info.script['repo_root']).as_posix()
task_state['script']['entry_point'] = entry_point or "" task_state['script']['entry_point'] = entry_point or ""
task_state['script']['working_dir'] = cwd or "." task_state['script']['working_dir'] = cwd or "."
elif self.repo: elif self.repo:
@ -260,7 +257,6 @@ class CreateAndPopulate(object):
# standalone task # standalone task
task_state['script']['entry_point'] = self.script or "" task_state['script']['entry_point'] = self.script or ""
task_state['script']['working_dir'] = '.' task_state['script']['working_dir'] = '.'
# update requirements # update requirements
reqs = [] reqs = []
if self.requirements_file: if self.requirements_file:
@ -345,7 +341,6 @@ class CreateAndPopulate(object):
if task_state['script']['diff'] and not task_state['script']['diff'].endswith('\n'): if task_state['script']['diff'] and not task_state['script']['diff'].endswith('\n'):
task_state['script']['diff'] += '\n' task_state['script']['diff'] += '\n'
task_state['script']['diff'] += task_init_patch task_state['script']['diff'] += task_init_patch
# set base docker image if provided # set base docker image if provided
if self.docker: if self.docker:
if dry_run: if dry_run: