Skip to content
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

Bug Fix - Update Docker Exec Command for Persistent HPCX Environment #635

Merged
merged 3 commits into from
Aug 13, 2024
Merged

Bug Fix - Update Docker Exec Command for Persistent HPCX Environment #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d5946d
fix ld path issue
RyoYang Aug 1, 2024
15011fd
add inactivate setup as well
RyoYang Aug 2, 2024
0568fdf
Merge branch 'main' into yangwang1/fix-ld-path
RyoYang Aug 11, 2024
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 dockerfile/cuda12.2.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ ENV PATH="${PATH}" \
RUN echo PATH="$PATH" > /etc/environment && \
echo LD_LIBRARY_PATH="$LD_LIBRARY_PATH" >> /etc/environment && \
echo SB_MICRO_PATH="$SB_MICRO_PATH" >> /etc/environment && \
echo "source /opt/hpcx/hpcx-init.sh && hpcx_load" >> /etc/bash.bashrc
echo "source /opt/hpcx/hpcx-init.sh && hpcx_load" | tee -a /etc/bash.bashrc >> /etc/profile.d/10-hpcx.sh

# Add config files
ADD dockerfile/etc /opt/microsoft/
Expand Down
2 changes: 1 addition & 1 deletion dockerfile/cuda12.4.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ ENV PATH="${PATH}" \
RUN echo PATH="$PATH" > /etc/environment && \
echo LD_LIBRARY_PATH="$LD_LIBRARY_PATH" >> /etc/environment && \
echo SB_MICRO_PATH="$SB_MICRO_PATH" >> /etc/environment && \
echo "source /opt/hpcx/hpcx-init.sh && hpcx_load" >> /etc/bash.bashrc
echo "source /opt/hpcx/hpcx-init.sh && hpcx_load" | tee -a /etc/bash.bashrc >> /etc/profile.d/10-hpcx.sh

# Add config files
ADD dockerfile/etc /opt/microsoft/
Expand Down
4 changes: 2 additions & 2 deletions superbench/runner/runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def run_sys_info(self):

logger.info('Runner is going to get node system info.')

fcmd = "docker exec sb-workspace bash -c '{command}'"
fcmd = "docker exec sb-workspace bash -lc '{command}'"

if 'skip' not in self._docker_config:
self._docker_config.skip = False
Expand Down Expand Up @@ -462,7 +462,7 @@ def _run_proc(self, benchmark_name, mode, vars):
envvar = f'{k}={str(v).format(proc_rank=mode.proc_rank, proc_num=mode.proc_num)}'
env_list += f' -e {envvar}' if not self._docker_config.skip else f' && export {envvar}'

fcmd = "docker exec {env_list} sb-workspace bash -c '{command}'"
fcmd = "docker exec {env_list} sb-workspace bash -lc '{command}'"
if self._docker_config.skip:
fcmd = "bash -c '{env_list} && cd $SB_WORKSPACE && {command}'"
ansible_runner_config = self._ansible_client.get_shell_config(
Expand Down
Loading