Skip to content

Commit add779b

Browse files
fedml-alexfedml-alex
authored
Merge pull request #850 from fedml-alex/dev/v0.7.0
Sync dev.
2 parents 9eb43ff + 1e31d81 commit add779b

File tree

12 files changed

+276
-102
lines changed

12 files changed

+276
-102
lines changed

‎devops/dockerfile/device-image/Dockerfile-Base‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG VERSION=base
22
ARG IS_BUILDING_GPU_IMAGE=0
33
#ARG BASE_IMAGE=continuumio/miniconda3:4.7.12
4-
ARG BASE_IMAGE=fedml/fedml:latest-torch1.12.1-cuda11.3-cudnn8-devel
4+
ARG BASE_IMAGE=fedml/fedml:latest-torch1.13.1-cuda11.6-cudnn8-devel
55
FROM ${BASE_IMAGE}
66

77
ADD ./devops/scripts/aws ./fedml/aws

‎devops/dockerfile/multi-stages-build/Dockerfile-Inference-Dev‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
ARG VERSION=dev
2+
ARG BASE_IMAGE=public.ecr.aws/x6k8q1x9/fedml-device-image:base
3+
ARG FEDML_PIP_HOME=/usr/local/lib/python3.8/dist-packages/fedml
4+
FROM ${BASE_IMAGE} AS fedml-inference-env-base
5+
6+
ADD ./devops/scripts/runner.sh ./fedml/runner.sh
7+
8+
ADD ./devops/scripts/requirements.txt ./fedml/requirements.txt
9+
10+
RUN chmod a+x ./fedml/runner.sh
11+
RUN echo "Updating..."
12+
13+
RUN pip3 install -r ./fedml/requirements.txt
14+
15+
COPY ./python ./fedml/fedml-pip
16+
COPY ./python/fedml ${FEDML_PIP_HOME}
17+
WORKDIR ./fedml/fedml-pip
18+
RUN pip3 install -e ./
19+
20+
WORKDIR /fedml
21+
22+
23+
ARG FEDML_PIP_HOME=/usr/local/lib/python3.8/dist-packages/fedml
24+
FROM ${BASE_IMAGE} AS fedml-inference-master
25+
26+
WORKDIR /fedml
27+
28+
COPY --from=fedml-inference-env-base /fedml/fedml-pip /fedml/fedml-pip
29+
COPY --from=fedml-inference-env-base /fedml/fedml-pip/python/fedml ${FEDML_PIP_HOME}
30+
31+
ENV ACCOUNT_ID=0 FEDML_VERSION=${VERSION} SERVER_DEVICE_ID=0 SERVER_OS_NAME=linux INFER_HOST="127.0.0.1" \
32+
FEDML_REDIS_ADDR="127.0.0.1" FEDML_REDIS_PORT=6379 FEDML_REDIS_PASSWORD="fedml_default"
33+
34+
CMD fedml model device login ${ACCOUNT_ID} -v ${FEDML_VERSION} -p -m \
35+
-ih ${INFER_HOST} -id ${SERVER_DEVICE_ID} -os ${SERVER_OS_NAME} \
36+
-ra ${FEDML_REDIS_ADDR} -rp ${FEDML_REDIS_PORT} -rpw ${FEDML_REDIS_PASSWORD};./runner.sh
37+
38+
39+
FROM ${BASE_IMAGE} AS fedml-inference-slave
40+
41+
WORKDIR /fedml
42+
43+
COPY --from=fedml-inference-env-base /fedml/fedml-pip /fedml/fedml-pip
44+
COPY --from=fedml-inference-env-base /fedml/fedml-pip/python/fedml ${FEDML_PIP_HOME}
45+
46+
ENV ACCOUNT_ID=0 FEDML_VERSION=${VERSION} CLIENT_DEVICE_ID=0 CLIENT_OS_NAME=linux INFER_HOST="127.0.0.1"
47+
48+
CMD fedml model device login ${ACCOUNT_ID} -v ${FEDML_VERSION} -p \
49+
-id ${CLIENT_DEVICE_ID} -os ${CLIENT_OS_NAME} -ih ${INFER_HOST}; ./runner.sh
50+
51+
52+
FROM ${BASE_IMAGE} AS fedml-inference-ingress
53+
54+
WORKDIR /fedml
55+
56+
COPY --from=fedml-inference-env-base /fedml/fedml-pip /fedml/fedml-pip
57+
COPY --from=fedml-inference-env-base /fedml/fedml-pip/python/fedml ${FEDML_PIP_HOME}
58+
59+
ENV FEDML_REDIS_ADDR="local" FEDML_REDIS_PORT=6379 FEDML_REDIS_PASSWORD="fedml_default" \
60+
FEDML_END_POINT_ID=0 FEDML_MODEL_ID=0 \
61+
FEDML_MODEL_NAME="model" FEDML_MODEL_VERSION="v1" \
62+
FEDML_INFER_URL="infer" FEDML_CONFIG_VERSION="release" \
63+
FEDML_INFER_PORT=5001
64+
65+
CMD python3 ${FEDML_PIP_HOME}/cli/model_deployment/device_model_inference_entry.py \
66+
-rp ${FEDML_REDIS_ADDR} -ra ${FEDML_REDIS_PORT} -rpw ${FEDML_REDIS_PASSWORD} \
67+
-ep ${FEDML_END_POINT_ID} -mi ${FEDML_MODEL_ID} \
68+
-mn ${FEDML_MODEL_NAME} -mv ${FEDML_MODEL_VERSION} \
69+
-iu ${FEDML_INFER_URL} -cv ${FEDML_CONFIG_VERSION} \
70+
-ip ${FEDML_INFER_PORT};./runner.sh
71+
72+
73+
ARG INF_BACKEND_BASE_IMAGE=nvcr.io/nvidia/tritonserver:22.01-py3
74+
FROM ${INF_BACKEND_BASE_IMAGE} AS fedml-inference-backend
75+
76+
ADD ./devops/scripts/runner.sh ./fedml/runner.sh
77+
78+
ADD ./devops/scripts/requirements.txt ./fedml/requirements.txt
79+
80+
RUN chmod a+x ./fedml/runner.sh
81+
82+
ENV FEDML_MODEL_SERVING_REPO_SCAN_INTERVAL=3 \
83+
FEDML_MODEL_SERVING_REPO_PATH=/home/fedml/fedml-client/fedml/models_serving
84+
85+
CMD mkdir -p ${FEDML_MODEL_SERVING_REPO_PATH};tritonserver --model-control-mode=poll \
86+
--strict-model-config=false \
87+
--backend-config=onnxruntime,default-max-batch-size=1 \
88+
--repository-poll-secs=${FEDML_MODEL_SERVING_REPO_SCAN_INTERVAL} \
89+
--model-repository=${FEDML_MODEL_SERVING_REPO_PATH}

‎devops/dockerfile/multi-stages-build/Dockerfile-Traing-Dev‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
ARG VERSION=dev
2+
ARG IS_BUILDING_GPU_IMAGE=0
3+
#ARG BASE_IMAGE=continuumio/miniconda3:4.7.12
4+
ARG BASE_IMAGE=fedml/fedml:latest-torch1.13.1-cuda11.6-cudnn8-devel
5+
ARG FEDML_PIP_HOME=/usr/local/lib/python3.8/dist-packages/fedml
6+
FROM ${BASE_IMAGE} AS fedml-image-base
7+
8+
ADD ./devops/scripts/aws ./fedml/aws
9+
ADD ./devops/scripts/setup-aws-cli.sh ./fedml/setup-aws-cli.sh
10+
ADD ./devops/scripts/set-aws-credentials.sh ./fedml/set-aws-credentials.sh
11+
ADD ./devops/scripts/docker /usr/bin/
12+
ADD ./devops/scripts/kubectl /usr/bin/
13+
14+
ADD ./devops/scripts/requirements.txt ./fedml/requirements.txt
15+
ADD ./devops/scripts/setup-conda-env.sh ./fedml/setup-conda-env.sh
16+
17+
RUN chmod a+x /usr/bin/docker
18+
RUN chmod a+x /usr/bin/kubectl
19+
RUN chmod a+x ./fedml/setup-aws-cli.sh
20+
RUN chmod a+x ./fedml/set-aws-credentials.sh
21+
RUN ./fedml/setup-aws-cli.sh
22+
23+
RUN apt-get update
24+
#RUN apt-get -y install gettext-base
25+
#RUN apt-get -y install unar wget
26+
#RUN apt-get -y install libquadmath0
27+
28+
RUN sudo DEBIAN_FRONTEND=noninteractive apt-get install -qq gettext-base < /dev/null > /dev/null
29+
RUN sudo DEBIAN_FRONTEND=noninteractive apt-get install -qq unar wget < /dev/null > /dev/null
30+
RUN sudo DEBIAN_FRONTEND=noninteractive apt-get install -qq libquadmath0 < /dev/null > /dev/null
31+
32+
RUN chmod a+x ./fedml/setup-conda-env.sh
33+
RUN bash ./fedml/setup-conda-env.sh ${IS_BUILDING_GPU_IMAGE}
34+
35+
#RUN pip install --upgrade pip
36+
#RUN pip3 uninstall fedml
37+
38+
RUN pip3 install --upgrade fedml
39+
RUN pip3 install -r ./fedml/requirements.txt
40+
RUN pip3 install --upgrade gevent
41+
42+
43+
FROM ${BASE_IMAGE} AS fedml-training-env-base
44+
45+
ADD ./devops/scripts/runner.sh ./fedml/runner.sh
46+
47+
ADD ./devops/scripts/requirements.txt ./fedml/requirements.txt
48+
49+
RUN chmod a+x ./fedml/runner.sh
50+
RUN echo "Updating..."
51+
52+
RUN pip3 install -r ./fedml/requirements.txt
53+
54+
COPY ./python ./fedml/fedml-pip
55+
COPY ./python/fedml ${FEDML_PIP_HOME}
56+
WORKDIR ./fedml/fedml-pip
57+
RUN pip3 install -e ./
58+
#RUN pip3 install -e '.[tensorflow]'
59+
#RUN pip3 install -e '.[jax]'
60+
#RUN pip3 install -e '.[mxnet]'
61+
62+
WORKDIR /fedml
63+
64+
65+
FROM ${BASE_IMAGE} AS fedml-image-base-with-version
66+
67+
RUN pip3 install MNN==1.1.6
68+
69+
WORKDIR /fedml
70+
71+
COPY --from=fedml-training-env-base /fedml/fedml-pip /fedml/fedml-pip
72+
COPY --from=fedml-training-env-base /fedml/fedml-pip/fedml ${FEDML_PIP_HOME}
73+
74+
ENV MODE=normal FEDML_VERSION=${VERSION} ACCOUNT_ID=0 SERVER_DEVICE_ID=0 \
75+
FEDML_PACKAGE_NAME=package FEDML_PACKAGE_URL=s3_url \
76+
FEDML_RUNNER_CMD=3dsad
77+
78+
CMD fedml login ${ACCOUNT_ID} -v ${FEDML_VERSION} -s -r cloud_server -rc ${FEDML_RUNNER_CMD} -id ${SERVER_DEVICE_ID}; ./runner.sh
79+
80+
81+
FROM ${BASE_IMAGE} AS fedml-client-agent
82+
83+
WORKDIR /fedml
84+
85+
COPY --from=fedml-training-env-base /fedml/fedml-pip /fedml/fedml-pip
86+
COPY --from=fedml-training-env-base /fedml/fedml-pip/fedml ${FEDML_PIP_HOME}
87+
88+
ENV ACCOUNT_ID=0 FEDML_VERSION=${VERSION} CLIENT_DEVICE_ID=0 CLIENT_OS_NAME=linux
89+
90+
CMD fedml login ${ACCOUNT_ID} -v ${FEDML_VERSION} -c -id ${CLIENT_DEVICE_ID} -os ${CLIENT_OS_NAME}; ./runner.sh
91+
92+
93+
FROM ${BASE_IMAGE} AS fedml-server-agent
94+
95+
WORKDIR /fedml
96+
97+
COPY --from=fedml-training-env-base /fedml/fedml-pip /fedml/fedml-pip
98+
COPY --from=fedml-image-base /fedml/fedml-pip/python/fedml ${FEDML_PIP_HOME}
99+
100+
ENV MODE=normal FEDML_VERSION=${VERSION} ACCOUNT_ID=0 SERVER_AGENT_ID=0 \
101+
AWS_IAM_ACCESS_ID=0 \
102+
AWS_IAM_ACCESS_KEY=0 \
103+
AWS_REGION=0
104+
105+
CMD ./set-aws-credentials.sh ${AWS_IAM_ACCESS_ID} ${AWS_IAM_ACCESS_KEY} ${AWS_REGION};fedml login ${ACCOUNT_ID} -v ${FEDML_VERSION} -s -r cloud_agent -id ${SERVER_AGENT_ID};./runner.sh
106+
107+
108+
FROM ${BASE_IMAGE} AS fedml-edge-server
109+
110+
WORKDIR /fedml
111+
112+
COPY --from=fedml-training-env-base /fedml/fedml-pip /fedml/fedml-pip
113+
COPY --from=fedml-image-base /fedml/fedml-pip/python/fedml ${FEDML_PIP_HOME}
114+
115+
ENV ACCOUNT_ID=0 FEDML_VERSION=${VERSION} SERVER_DEVICE_ID=0 SERVER_OS_NAME=linux
116+
117+
CMD fedml login ${ACCOUNT_ID} -v ${FEDML_VERSION} -s -id ${SERVER_DEVICE_ID} -os ${SERVER_OS_NAME};./runner.sh

‎devops/scripts/build-fedml-docker.sh‎

Lines changed: 28 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,25 @@ pwd=`pwd`
33
build_arm_arch_images=$1
44

55
export FEDML_VERSION=`cat python/setup.py |grep version= |awk -F'=' '{print $2}' |awk -F',' '{print $1}'|awk -F'"' '{print $2}'`
6-
7-
if [[ $build_arm_arch_images = "" ]]; then
6+
echo "version from setup.py: ${FEDML_VERSION}"
7+
8+
OS="ubuntu20.04"
9+
DISTRO="ubuntu2004"
10+
PYTHON_VERSION="3.8"
11+
PYTORCH_VERSION="1.13.1"
12+
NCCL_VERSION="2.11.4"
13+
CUDA_VERSION="11.6"
14+
LIB_NCCL="2.11.4-1+cuda11.6"
15+
NVIDIA_BASE_IMAGE="nvidia/cuda:11.6.1-cudnn8-devel-ubuntu20.04"
16+
PYTORCH_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cu116"
17+
PYTORCH_GEOMETRIC_URL="https://data.pyg.org/whl/torch-1.13.1+cu116.html"
18+
19+
if [ "$build_arm_arch_images" = "" ]; then
820
# Build X86_64 docker
921
ARCH="x86_64"
10-
OS="ubuntu18.04"
11-
DISTRO="ubuntu1804"
12-
PYTHON_VERSION="3.7"
13-
PYTORCH_VERSION="1.12.1"
14-
NCCL_VERSION="2.9.9"
15-
CUDA_VERSION="11.3"
16-
LIB_NCCL="2.9.9-1+cuda11.3"
17-
OUTPUT_IMAGE="fedml/fedml:latest-torch1.12.1-cuda11.3-cudnn8-devel"
18-
NVIDIA_BASE_IMAGE="nvidia/cuda:11.3.1-cudnn8-devel-ubuntu18.04"
19-
PYTORCH_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cu113"
20-
PYTORCH_GEOMETRIC_URL="https://data.pyg.org/whl/torch-1.12.0+cu113.html"
21-
CURRENT_IMAGE="fedml/fedml:${FEDML_VERSION}-torch1.12.1-cuda11.3-cudnn8-devel"
22+
23+
OUTPUT_IMAGE="fedml/fedml:latest-torch1.13.1-cuda11.6-cudnn8-devel"
24+
CURRENT_IMAGE="fedml/fedml:${FEDML_VERSION}-torch1.13.1-cuda11.6-cudnn8-devel"
2225

2326
cd ./docker
2427
docker rmi $OUTPUT_IMAGE
@@ -30,21 +33,12 @@ if [[ $build_arm_arch_images = "" ]]; then
3033
cd $pwd
3134
fi
3235

33-
if [[ $build_arm_arch_images != "" ]]; then
36+
if [ "$build_arm_arch_images" != "" ]; then
3437
# Build ARM_64 docker
3538
ARCH="arm64"
36-
OS="ubuntu20.04"
37-
DISTRO="ubuntu2004"
38-
PYTHON_VERSION="3.8"
39-
PYTORCH_VERSION="1.12.1"
40-
NCCL_VERSION="2.9.6"
41-
CUDA_VERSION="11.3"
42-
LIB_NCCL="2.9.6-1+cuda11.3"
43-
OUTPUT_IMAGE="fedml/fedml:latest-torch1.12.1-cuda11.3-cudnn8-devel-arm64"
44-
NVIDIA_BASE_IMAGE="nvidia/cuda:11.3.0-cudnn8-devel-ubuntu20.04@sha256:8e3df8601e81c57e85c082e9bcc6c547641635730ef8516b2cfa9c9e6c1208af"
45-
PYTORCH_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cu113"
46-
PYTORCH_GEOMETRIC_URL="https://data.pyg.org/whl/torch-1.12.0+cu113.html"
47-
CURRENT_IMAGE="fedml/fedml:${FEDML_VERSION}-torch1.12.1-cuda11.3-cudnn8-devel-arm64"
39+
OUTPUT_IMAGE="fedml/fedml:latest-arm64-torch1.13.1-cuda11.6-cudnn8-devel"
40+
NVIDIA_BASE_IMAGE="nvidia/cuda:11.6.1-cudnn8-devel-ubuntu20.04@sha256:1a06a6cc47ba6ade96c646231c3d0f3216f9b32fb1420f88e46616eea478a661"
41+
CURRENT_IMAGE="fedml/fedml:${FEDML_VERSION}-arm64-torch1.13.1-cuda11.6-cudnn8-devel"
4842

4943
cd ./docker
5044
docker rmi $OUTPUT_IMAGE
@@ -58,16 +52,8 @@ if [[ $build_arm_arch_images != "" ]]; then
5852

5953
# Build nvidia_jetson docker
6054
ARCH="jetson"
61-
OS="ubuntu20.04"
62-
DISTRO="ubuntu2004"
63-
PYTHON_VERSION="3.7"
64-
PYTORCH_VERSION="1.12.1"
65-
NCCL_VERSION="2.9.6"
66-
CUDA_VERSION="11.3"
6755
OUTPUT_IMAGE="fedml/fedml:latest-nvidia-jetson-l4t-ml-r35.1.0-py3"
68-
NVIDIA_BASE_IMAGE="nvidia/cuda:11.3.0-cudnn8-devel-ubuntu20.04@sha256:8e3df8601e81c57e85c082e9bcc6c547641635730ef8516b2cfa9c9e6c1208af"
69-
PYTORCH_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cu113"
70-
PYTORCH_GEOMETRIC_URL="https://data.pyg.org/whl/torch-1.12.0+cu113.html"
56+
NVIDIA_BASE_IMAGE="nvidia/cuda:11.6.1-cudnn8-devel-ubuntu18.04@sha256:1a06a6cc47ba6ade96c646231c3d0f3216f9b32fb1420f88e46616eea478a661"
7157
CURRENT_IMAGE="fedml/fedml:${FEDML_VERSION}-nvidia-jetson-l4t-ml-r35.1.0-py3"
7258

7359
cd ./docker
@@ -82,17 +68,9 @@ if [[ $build_arm_arch_images != "" ]]; then
8268

8369
# Build rpi32 docker
8470
#ARCH="rpi32"
85-
#OS="ubuntu20.04"
86-
#DISTRO="ubuntu2004"
87-
#PYTHON_VERSION="3.7"
88-
#PYTORCH_VERSION="1.12.1"
89-
#NCCL_VERSION="2.9.6"
90-
#CUDA_VERSION="11.3"
91-
#OUTPUT_IMAGE="fedml/fedml:latest-raspberrypi4-32-py37"
92-
#NVIDIA_BASE_IMAGE="nvidia/cuda:11.3.0-cudnn8-devel-ubuntu20.04@sha256:8e3df8601e81c57e85c082e9bcc6c547641635730ef8516b2cfa9c9e6c1208af"
93-
#PYTORCH_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cu113"
94-
#PYTORCH_GEOMETRIC_URL="https://data.pyg.org/whl/torch-1.12.0+cu113.html"
95-
#CURRENT_IMAGE="fedml/fedml:${FEDML_VERSION}-raspberrypi4-32-py37"
71+
#OUTPUT_IMAGE="fedml/fedml:latest-raspberrypi4-32-py38"
72+
#NVIDIA_BASE_IMAGE="nvidia/cuda:11.6.1-cudnn8-devel-ubuntu18.04@sha256:1a06a6cc47ba6ade96c646231c3d0f3216f9b32fb1420f88e46616eea478a661"
73+
#CURRENT_IMAGE="fedml/fedml:${FEDML_VERSION}-raspberrypi4-32-py38"
9674

9775
cd ./docker
9876
docker rmi $OUTPUT_IMAGE
@@ -106,17 +84,9 @@ if [[ $build_arm_arch_images != "" ]]; then
10684

10785
# Build rpi64 docker
10886
ARCH="rpi64"
109-
OS="ubuntu20.04"
110-
DISTRO="ubuntu2004"
111-
PYTHON_VERSION="3.7"
112-
PYTORCH_VERSION="1.12.1"
113-
NCCL_VERSION="2.9.6"
114-
CUDA_VERSION="11.3"
115-
OUTPUT_IMAGE="fedml/fedml:latest-raspberrypi4-64-py37"
116-
NVIDIA_BASE_IMAGE="nvidia/cuda:11.3.0-cudnn8-devel-ubuntu20.04@sha256:8e3df8601e81c57e85c082e9bcc6c547641635730ef8516b2cfa9c9e6c1208af"
117-
PYTORCH_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cu113"
118-
PYTORCH_GEOMETRIC_URL="https://data.pyg.org/whl/torch-1.12.0+cu113.html"
119-
CURRENT_IMAGE="fedml/fedml:${FEDML_VERSION}-raspberrypi4-64-py37"
87+
OUTPUT_IMAGE="fedml/fedml:latest-raspberrypi4-64-py38"
88+
NVIDIA_BASE_IMAGE="nvidia/cuda:11.6.1-cudnn8-devel-ubuntu20.04@sha256:1a06a6cc47ba6ade96c646231c3d0f3216f9b32fb1420f88e46616eea478a661"
89+
CURRENT_IMAGE="fedml/fedml:${FEDML_VERSION}-raspberrypi4-64-py38"
12090

12191
cd ./docker
12292
docker rmi $OUTPUT_IMAGE

‎devops/scripts/build-inference.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ docker login --username AWS --password $(aws ecr-public get-login-password --reg
88
docker build -f ./devops/dockerfile/model-inference-backend/Dockerfile -t public.ecr.aws/x6k8q1x9/fedml-inference-backend:latest .
99
docker push public.ecr.aws/x6k8q1x9/fedml-inference-backend:latest
1010

11-
docker build -f ./devops/dockerfile/model-inference-converter/Dockerfile -t public.ecr.aws/x6k8q1x9/fedml-inference-converter:latest .
12-
docker push public.ecr.aws/x6k8q1x9/fedml-inference-converter:latest
13-
1411
docker build -f ./devops/dockerfile/model-inference-ingress/Dockerfile -t public.ecr.aws/x6k8q1x9/fedml-inference-ingress:${version} .
1512
docker push public.ecr.aws/x6k8q1x9/fedml-inference-ingress:${version}
1613

‎devops/scripts/push-fedml-docker.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ push_arm_arch_images=$1
44

55
export FEDML_VERSION=`cat python/setup.py |grep version= |awk -F'=' '{print $2}' |awk -F',' '{print $1}'|awk -F'"' '{print $2}'`
66
if [[ $push_arm_arch_images == "" ]]; then
7-
docker push fedml/fedml:latest-torch1.12.1-cuda11.3-cudnn8-devel
8-
docker push fedml/fedml:${FEDML_VERSION}-torch1.12.1-cuda11.3-cudnn8-devel
7+
docker push fedml/fedml:latest-torch1.13.1-cuda11.6-cudnn8-devel
8+
docker push fedml/fedml:${FEDML_VERSION}-torch1.13.1-cuda11.6-cudnn8-devel
99
fi
1010

1111
if [[ $push_arm_arch_images != "" ]]; then
12-
docker push fedml/fedml:latest-torch1.12.1-cuda11.3-cudnn8-devel-arm64
13-
docker push fedml/fedml:${FEDML_VERSION}-torch1.12.1-cuda11.3-cudnn8-devel-arm64
12+
docker push fedml/fedml:latest-arm64-torch1.13.1-cuda11.6-cudnn8-devel
13+
docker push fedml/fedml:${FEDML_VERSION}-arm64-torch1.13.1-cuda11.6-cudnn8-devel-arm64
1414

1515
docker push fedml/fedml:latest-nvidia-jetson-l4t-ml-r35.1.0-py3
1616
docker push fedml/fedml:${FEDML_VERSION}-nvidia-jetson-l4t-ml-r35.1.0-py3
1717

18-
# docker push fedml/fedml:latest-raspberrypi4-32-py37
19-
# docker push fedml/fedml:${FEDML_VERSION}-raspberrypi4-32-py37
18+
# docker push fedml/fedml:latest-raspberrypi4-32-py38
19+
# docker push fedml/fedml:${FEDML_VERSION}-raspberrypi4-32-py38
2020

21-
docker push fedml/fedml:latest-raspberrypi4-64-py37
22-
docker push fedml/fedml:${FEDML_VERSION}-raspberrypi4-64-py37
21+
docker push fedml/fedml:latest-raspberrypi4-64-py38
22+
docker push fedml/fedml:${FEDML_VERSION}-raspberrypi4-64-py38
2323
fi

‎devops/scripts/setup-conda-env.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#echo "nameserver 8.8.8.8" > /etc/resolv.conf
44

5-
echo "conda create -n fedml python=3.7.4"
6-
conda create -y -n fedml-pip python=3.7.4
5+
echo "conda create -n fedml python=3.8"
6+
conda create -y -n fedml-pip python=3.8
77

88
echo "conda activate fedml"
99
conda activate fedml-pip

0 commit comments

Comments
 (0)