Bug Fix - Update Docker Exec Command for Persistent HPCX Environment (#635)
Add 10-hpcx.sh to /etc/profile.d Update the Docker exec command to ensure a persistent HPCX environment.
This commit is contained in:
Родитель
9de841bc95
Коммит
46a5792915
|
@ -131,7 +131,7 @@ ENV PATH="${PATH}" \
|
||||||
RUN echo PATH="$PATH" > /etc/environment && \
|
RUN echo PATH="$PATH" > /etc/environment && \
|
||||||
echo LD_LIBRARY_PATH="$LD_LIBRARY_PATH" >> /etc/environment && \
|
echo LD_LIBRARY_PATH="$LD_LIBRARY_PATH" >> /etc/environment && \
|
||||||
echo SB_MICRO_PATH="$SB_MICRO_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 config files
|
||||||
ADD dockerfile/etc /opt/microsoft/
|
ADD dockerfile/etc /opt/microsoft/
|
||||||
|
|
|
@ -125,7 +125,7 @@ ENV PATH="${PATH}" \
|
||||||
RUN echo PATH="$PATH" > /etc/environment && \
|
RUN echo PATH="$PATH" > /etc/environment && \
|
||||||
echo LD_LIBRARY_PATH="$LD_LIBRARY_PATH" >> /etc/environment && \
|
echo LD_LIBRARY_PATH="$LD_LIBRARY_PATH" >> /etc/environment && \
|
||||||
echo SB_MICRO_PATH="$SB_MICRO_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 config files
|
||||||
ADD dockerfile/etc /opt/microsoft/
|
ADD dockerfile/etc /opt/microsoft/
|
||||||
|
|
|
@ -205,7 +205,7 @@ class SuperBenchRunner():
|
||||||
|
|
||||||
logger.info('Runner is going to get node system info.')
|
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:
|
if 'skip' not in self._docker_config:
|
||||||
self._docker_config.skip = False
|
self._docker_config.skip = False
|
||||||
|
@ -462,7 +462,7 @@ class SuperBenchRunner():
|
||||||
envvar = f'{k}={str(v).format(proc_rank=mode.proc_rank, proc_num=mode.proc_num)}'
|
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}'
|
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:
|
if self._docker_config.skip:
|
||||||
fcmd = "bash -c '{env_list} && cd $SB_WORKSPACE && {command}'"
|
fcmd = "bash -c '{env_list} && cd $SB_WORKSPACE && {command}'"
|
||||||
ansible_runner_config = self._ansible_client.get_shell_config(
|
ansible_runner_config = self._ansible_client.get_shell_config(
|
||||||
|
|
Загрузка…
Ссылка в новой задаче