Skip to content

[bugfix] Fix singularity cli option to change to the mounted stage directory with the Singularity container platform #2581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2022
Merged

[bugfix] Fix singularity cli option to change to the mounted stage directory with the Singularity container platform #2581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion reframe/core/containers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ def launch_command(self, stagedir):
run_opts.append('--nv')

if self.workdir:
run_opts.append(f'-W {self.workdir}')
run_opts.append(f'--pwd {self.workdir}')

run_opts += self.options
if self.command:
Expand Down
8 changes: 4 additions & 4 deletions unittests/test_containers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,15 @@ def expected_cmd_mount_points(container_variant):
elif container_variant in {'Singularity', 'Singularity+nopull'}:
return ('singularity exec -B"/path/one:/one" '
'-B"/path/two:/two" -B"/foo:/rfm_workdir" '
'-W /rfm_workdir image:tag cmd')
'--pwd /rfm_workdir image:tag cmd')
elif container_variant == 'Singularity+cuda':
return ('singularity exec -B"/path/one:/one" '
'-B"/path/two:/two" -B"/foo:/rfm_workdir" --nv '
'-W /rfm_workdir image:tag cmd')
'--pwd /rfm_workdir image:tag cmd')
elif container_variant == 'Singularity+nocommand':
return ('singularity run -B"/path/one:/one" '
'-B"/path/two:/two" -B"/foo:/rfm_workdir" '
'-W /rfm_workdir image:tag')
'--pwd /rfm_workdir image:tag')


@pytest.fixture
Expand Down Expand Up @@ -265,7 +265,7 @@ def expected_run_with_workdir(container_variant_noopt):
'--foo image:tag cmd1'
)
elif container_variant_noopt == 'Singularity':
return ('singularity exec -B\"/foo:/rfm_workdir\" -W foodir '
return ('singularity exec -B\"/foo:/rfm_workdir\" --pwd foodir '
'--foo image:tag cmd1')


Expand Down