From f53b54821c0f8d98246d0848bcaa61f17d4a4527 Mon Sep 17 00:00:00 2001 From: Daniel Dale Date: Fri, 9 Feb 2024 10:21:35 -0800 Subject: [PATCH] cleanup automated docker CI image build wrappers and bump dockerfile def to use 20240209 nightly for 2.3.0 --- dockers/base-cuda/Dockerfile | 2 +- dockers/docker_images_main.sh | 11 ++++++++--- dockers/docker_images_release.sh | 7 +++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dockers/base-cuda/Dockerfile b/dockers/base-cuda/Dockerfile index 5ec0e3d..23967f5 100644 --- a/dockers/base-cuda/Dockerfile +++ b/dockers/base-cuda/Dockerfile @@ -89,7 +89,7 @@ RUN \ # ... pytorch patch version # pip install torch==1.11.1+cu113 torchvision==0.11.3+cu113 -f https://download.pytorch.org/whl/cu113/torch_stable.html; \ # ... pytorch nightly dev version - pip install --pre torch==2.3.0.dev20240208 torchvision==0.18.0.dev20240208 -f https://download.pytorch.org/whl/nightly/cu121/torch_nightly.html; \ + pip install --pre torch==2.3.0.dev20240209 torchvision==0.18.0.dev20240209 -f https://download.pytorch.org/whl/nightly/cu121/torch_nightly.html; \ # ... test channel # pip install --pre torch torchvision -f https://download.pytorch.org/whl/test/cu121/torch_test.html; \ fi && \ diff --git a/dockers/docker_images_main.sh b/dockers/docker_images_main.sh index c09d79a..5bedf9a 100755 --- a/dockers/docker_images_main.sh +++ b/dockers/docker_images_main.sh @@ -17,7 +17,7 @@ conda deactivate d=`date +%Y%m%d%H%M%S` tmp_docker_build_log_dir="/tmp" -docker_build_log="${tmp_docker_build_log_dir}/fts_build_docker_main_images_${d}.log" +docker_build_log="${tmp_docker_build_log_dir}/fts_update_docker_main_images_${d}.log" maybe_push(){ @@ -25,12 +25,16 @@ maybe_push(){ echo "Beginning upload of built images..." >> $docker_build_log echo "Pushing ${registry_name}:${latest_pt} ..." >> $docker_build_log docker push ${registry_name}:${latest_pt} >> $docker_build_log + echo "Finished pushing ${registry_name}:${latest_pt} ..." >> $docker_build_log echo "Pushing ${registry_name}:${latest_azpl} ..." >> $docker_build_log docker push ${registry_name}:${latest_azpl} >> $docker_build_log + echo "Finished pushing ${registry_name}:${latest_azpl} ..." >> $docker_build_log echo "Pushing ${registry_name}:${pt_2_0_1} ..." >> $docker_build_log docker push ${registry_name}:${pt_2_0_1} >> $docker_build_log + echo "Finished pushing ${registry_name}:${pt_2_0_1} ..." >> $docker_build_log echo "Pushing ${registry_name}:${pt_2_0_1_azpl} ..." >> $docker_build_log docker push ${registry_name}:${pt_2_0_1_azpl} >> $docker_build_log + echo "Finished pushing ${registry_name}:${pt_2_0_1_azpl} ..." >> $docker_build_log else echo "Directed to skip push of built images." >> $docker_build_log fi @@ -45,12 +49,12 @@ maybe_build(){ build_eval(){ # latest PyTorch image supported by release - declare -A iv=(["cuda"]="12.1.0" ["python"]="3.11" ["pytorch"]="2.2.0" ["lightning"]="2.2" ["cust_build"]="1") + declare -A iv=(["cuda"]="12.1.0" ["python"]="3.11" ["pytorch"]="2.3.0" ["lightning"]="2.3" ["cust_build"]="1") export latest_pt="base-cu${iv["cuda"]}-py${iv["python"]}-pt${iv["pytorch"]}-pl${iv["lightning"]}" export latest_azpl="py${iv["python"]}-pt${iv["pytorch"]}-pl${iv["lightning"]}-azpl-init" maybe_build iv "${latest_pt}" "${latest_azpl}" # PyTorch 2.0.1 currently required for complete coverage - declare -A iv=(["cuda"]="11.8.0" ["python"]="3.10" ["pytorch"]="2.0.1" ["lightning"]="2.2" ["cust_build"]="0") + declare -A iv=(["cuda"]="11.8.0" ["python"]="3.10" ["pytorch"]="2.0.1" ["lightning"]="2.3" ["cust_build"]="0") export pt_2_0_1="base-cu${iv["cuda"]}-py${iv["python"]}-pt${iv["pytorch"]}-pl${iv["lightning"]}" export pt_2_0_1_azpl="py${iv["python"]}-pt${iv["pytorch"]}-pl${iv["lightning"]}-azpl-init" maybe_build iv "${pt_2_0_1}" "${pt_2_0_1_azpl}" @@ -66,3 +70,4 @@ cd ${repo_home} echo "Building and/or pushing images for repository home: ${repo_home}" >> $docker_build_log build_eval maybe_push +echo "Finished building and/or updating images for repository home: ${repo_home}" >> $docker_build_log diff --git a/dockers/docker_images_release.sh b/dockers/docker_images_release.sh index 1f1ea68..fc2c341 100755 --- a/dockers/docker_images_release.sh +++ b/dockers/docker_images_release.sh @@ -26,16 +26,22 @@ maybe_push(){ echo "Beginning upload of built images..." >> $docker_build_log echo "Pushing ${registry_name}:${latest_pt} ..." >> $docker_build_log docker push ${registry_name}:${latest_pt} >> $docker_build_log + echo "Finished pushing ${registry_name}:${latest_pt} ..." >> $docker_build_log echo "Pushing ${registry_name}:${latest_azpl} ..." >> $docker_build_log docker push ${registry_name}:${latest_azpl} >> $docker_build_log + echo "Finished pushing ${registry_name}:${latest_azpl} ..." >> $docker_build_log echo "Pushing ${registry_name}:${pt_1_13_1} ..." >> $docker_build_log docker push ${registry_name}:${pt_1_13_1} >> $docker_build_log + echo "Finished pushing ${registry_name}:${pt_1_13_1} ..." >> $docker_build_log echo "Pushing ${registry_name}:${pt_1_13_1_azpl} ..." >> $docker_build_log docker push ${registry_name}:${pt_1_13_1_azpl} >> $docker_build_log + echo "Finished pushing ${registry_name}:${pt_1_13_1_azpl} ..." >> $docker_build_log echo "Pushing ${registry_name}:${pt_2_0_1} ..." >> $docker_build_log docker push ${registry_name}:${pt_2_0_1} >> $docker_build_log + echo "Finished pushing ${registry_name}:${pt_2_0_1} ..." >> $docker_build_log echo "Pushing ${registry_name}:${pt_2_0_1_azpl} ..." >> $docker_build_log docker push ${registry_name}:${pt_2_0_1_azpl} >> $docker_build_log + echo "Finished pushing ${registry_name}:${pt_2_0_1_azpl} ..." >> $docker_build_log else echo "Directed to skip push of built images." >> $docker_build_log fi @@ -76,3 +82,4 @@ cd ${repo_home} echo "Building and/or pushing images for repository home: ${repo_home}" >> $docker_build_log build_eval maybe_push +echo "Finished building and/or updating images for repository home: ${repo_home}" >> $docker_build_log