Skip to content

Commit

Permalink
Nit: Cleaning up
Browse files Browse the repository at this point in the history
  • Loading branch information
alaydshah committed Jan 17, 2024
1 parent ce2c3cf commit e4037c6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 26 deletions.
24 changes: 2 additions & 22 deletions installation/build_fedml_docker/x86-64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN apt update -y && apt install -y --no-install-recommends \
curl wget vim tmux emacs less unzip \
htop iftop iotop ca-certificates openssh-client openssh-server \
rsync iputils-ping net-tools sudo \
llvm-9-dev python3-pip git git-lfs
python3-pip git git-lfs

RUN git lfs install

Expand Down Expand Up @@ -93,24 +93,4 @@ RUN eval `ssh-agent -s` && ssh-add ${SSHDIR}/id_rsa

RUN sudo apt install -y iproute2

EXPOSE 22


###############################################################################
## Supervisor container startup
###############################################################################
#ADD ./x86-64/supervisord.conf /etc/supervisor/supervisord.conf


##############################################################################
# Add docker location file
##############################################################################
#ADD ./x86-64/docker-location.yml /home/fedml/fedml-client/fedml/data/docker-location.yml


##############################################################################
# Entry Point Script
##############################################################################
#ADD ./x86-64/entry-point.sh /batch-runtime-scripts/entry-point.sh
#RUN sudo chmod 0755 /batch-runtime-scripts/entry-point.sh
#CMD /batch-runtime-scripts/entry-point.sh
EXPOSE 22
5 changes: 1 addition & 4 deletions python/fedml/computing/scheduler/slave/client_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,6 @@ def execute_job_task(self, unzip_package_path, entry_file_full_path, conf_file_f
assigned_gpu_ids = run_params.get("gpu_ids", None)
job_type = job_yaml.get("job_type", None)
containerize = fedml_config_object.get("containerize", True)
logging.info(f"DEBUG Alay containerize: {containerize}")
# TODO: Can we remove task_type?
job_type = job_yaml.get("task_type", Constants.JOB_TASK_TYPE_TRAIN) if job_type is None else job_type
conf_file_object = load_yaml_config(conf_file_full_path)
Expand All @@ -583,7 +582,7 @@ def execute_job_task(self, unzip_package_path, entry_file_full_path, conf_file_f
# Bootstrap Info
bootstrap_script_path, bootstrap_script_dir, bootstrap_script_file = [None] * 3
env_args = fedml_config_object.get("environment_args", None)
logging.info(f"Alay Debug: {env_args}")

if env_args is not None:

bootstrap_script_file = env_args.get("bootstrap", None)
Expand Down Expand Up @@ -657,9 +656,7 @@ def execute_job_task(self, unzip_package_path, entry_file_full_path, conf_file_f

if containerize:
docker_args = fedml_config_object.get("docker", None)
logging.info(f"DEBUG Alay docker_args: {docker_args}")
docker_args = JobRunnerUtils.create_instance_from_dict(DockerArgs, docker_args)
logging.info(f"DEBUG Alay docker_args from instance: {docker_args}")
try:
job_executing_commands = JobRunnerUtils.generate_launch_docker_command(docker_args=docker_args,
run_id=self.run_id,
Expand Down

0 comments on commit e4037c6

Please sign in to comment.