diff --git a/.confirm b/.confirm new file mode 100644 index 000000000..e69de29bb diff --git a/docker/common/install_opt_pytorch.sh b/docker/common/install_opt_pytorch.sh index 6e8ee914b..ff274946f 100644 --- a/docker/common/install_opt_pytorch.sh +++ b/docker/common/install_opt_pytorch.sh @@ -38,7 +38,7 @@ else && python3 -m pip install --upgrade pip wheel setuptools requests \ && conda config --env --remove-key channels || true \ && conda config --env --append channels ${VAI_CONDA_CHANNEL} \ - && conda config --remove channels defaults || true \ + && conda config --env --remove channels defaults || true \ && ${command_opt} \ && conda clean -y --force-pkgs-dirs \ && rm -fr ~/.cache \ diff --git a/docker/common/install_opt_tf1.sh b/docker/common/install_opt_tf1.sh index 9534522ef..9734777d9 100644 --- a/docker/common/install_opt_tf1.sh +++ b/docker/common/install_opt_tf1.sh @@ -13,7 +13,7 @@ fi && python3 -m pip install --upgrade pip wheel setuptools \ && conda config --env --remove-key channels \ && conda config --env --append channels ${VAI_CONDA_CHANNEL} \ - && conda config --remove channels defaults || true \ + && conda config --env --remove channels defaults || true \ && cat ~/.condarc \ && mamba env create -f /scratch/${DOCKER_TYPE}_conda/vitis-ai-optimizer_tensorflow.yml \ && conda clean -y --force-pkgs-dirs \ diff --git a/docker/common/install_opt_tf2.sh b/docker/common/install_opt_tf2.sh index 0c2a86a46..d7d4fae06 100644 --- a/docker/common/install_opt_tf2.sh +++ b/docker/common/install_opt_tf2.sh @@ -15,7 +15,7 @@ fi && sudo python3 -m pip install --upgrade pip wheel setuptools \ && conda config --env --remove-key channels \ && conda config --env --append channels ${VAI_CONDA_CHANNEL} \ - && conda config --remove channels defaults || true \ + && conda config --env --remove channels defaults || true \ && mamba env create -f /scratch/${DOCKER_TYPE}_conda/vitis-ai-optimizer_tensorflow2.yml \ && conda clean -y --force-pkgs-dirs \ && sudo rm -fr ~/.cache \ diff --git a/docker/common/install_tf1.sh b/docker/common/install_tf1.sh index 2f45bd523..03b97a36b 100644 --- a/docker/common/install_tf1.sh +++ b/docker/common/install_tf1.sh @@ -14,7 +14,7 @@ if [[ ${DOCKER_TYPE} == "cpu" ]]; then && mkdir -p $VAI_ROOT/conda/pkgs \ && python3 -m pip install --upgrade pip wheel setuptools \ && conda config --env --append channels ${VAI_CONDA_CHANNEL} \ - && conda config --remove channels defaults || true \ + && conda config --env --remove channels defaults || true \ && cat ~/.condarc \ && mamba create -n vitis-ai-tensorflow python=3.6 tensorflow-onnx -c ${VAI_CONDA_CHANNEL} -c conda-forge \ && conda activate vitis-ai-tensorflow \ @@ -39,7 +39,7 @@ else && python3 -m pip install --upgrade pip wheel setuptools \ && conda config --env --remove-key channels \ && conda config --env --add channels ${VAI_CONDA_CHANNEL} \ - && conda config --remove channels defaults || true \ + && conda config --env --remove channels defaults || true \ && cat ~/.condarc \ && mamba env create -v -f /scratch/${DOCKER_TYPE}_conda/vitis-ai-tensorflow.yml \ && conda activate vitis-ai-tensorflow \ diff --git a/docker/common/install_tf2.sh b/docker/common/install_tf2.sh index abcdd0abe..cbba00964 100644 --- a/docker/common/install_tf2.sh +++ b/docker/common/install_tf2.sh @@ -83,7 +83,7 @@ else && sudo python3 -m pip install --upgrade pip wheel setuptools \ && conda config --env --remove-key channels \ && conda config --env --append channels ${VAI_CONDA_CHANNEL} \ - && conda config --remove channels defaults || true \ + && conda config --env --remove channels defaults || true \ && mamba env create -f /scratch/${DOCKER_TYPE}_conda/vitis-ai-tensorflow2.yml \ && conda activate vitis-ai-tensorflow2 \ && pip install --ignore-installed ${tensorflow_ver} \ diff --git a/docker/common/install_torch.sh b/docker/common/install_torch.sh index e0cd13e5d..f5a71eb22 100755 --- a/docker/common/install_torch.sh +++ b/docker/common/install_torch.sh @@ -17,7 +17,8 @@ sudo ln -s /opt/conda $VAI_ROOT/conda; && sudo mkdir -p $VAI_ROOT/conda/pkgs && sudo chmod 777 $VAI_ROOT/conda/pkgs \ && python3 -m pip install --upgrade pip wheel setuptools \ && sudo conda config --env --remove-key channels || true \ - && sudo conda config --env --append channels ${VAI_CONDA_CHANNEL} + && sudo conda config --env --append channels ${VAI_CONDA_CHANNEL} \ + && sudo conda config --env --remove channels defaults || true #&& mamba update --force-reinstall --no-deps -n base pytorch_nndct_rocm -c conda-forge \ torchvision_cmd=" pip install torchvision==0.14.1 " if [[ ${DOCKER_TYPE} == 'gpu' ]]; then @@ -47,7 +48,8 @@ else && mkdir -p $VAI_ROOT/conda/pkgs \ && python3 -m pip install --upgrade pip wheel setuptools \ && conda config --env --remove-key channels || true \ - && conda config --env --append channels ${VAI_CONDA_CHANNEL} + && conda config --env --append channels ${VAI_CONDA_CHANNEL} \ + && conda config --env --remove channels defaults || true mamba env create -v -f /scratch/${DOCKER_TYPE}_conda/vitis-ai-pytorch.yml \ && conda activate vitis-ai-pytorch \ diff --git a/docker/conda/gpu_conda/vitis-ai-pytorch.yml b/docker/conda/gpu_conda/vitis-ai-pytorch.yml index aa5f64baf..884183efe 100644 --- a/docker/conda/gpu_conda/vitis-ai-pytorch.yml +++ b/docker/conda/gpu_conda/vitis-ai-pytorch.yml @@ -3,6 +3,7 @@ name: vitis-ai-pytorch channels: - pytorch - conda-forge + - prometeia dependencies: - python=3.8 diff --git a/docker/conda/gpu_conda/vitis-ai-tensorflow.yml b/docker/conda/gpu_conda/vitis-ai-tensorflow.yml index 50033ca05..4537ba846 100644 --- a/docker/conda/gpu_conda/vitis-ai-tensorflow.yml +++ b/docker/conda/gpu_conda/vitis-ai-tensorflow.yml @@ -2,7 +2,7 @@ name: vitis-ai-tensorflow channels: - conda-forge - - anaconda + - prometeia dependencies: - python=3.6 diff --git a/docker/conda/gpu_conda/vitis-ai-tensorflow2.yml b/docker/conda/gpu_conda/vitis-ai-tensorflow2.yml index 64ae3ca2f..a68692fa3 100644 --- a/docker/conda/gpu_conda/vitis-ai-tensorflow2.yml +++ b/docker/conda/gpu_conda/vitis-ai-tensorflow2.yml @@ -2,6 +2,7 @@ name: vitis-ai-tensorflow2 channels: - conda-forge + - prometeia dependencies: - python=3.8 diff --git a/docker/docker_build.sh b/docker/docker_build.sh index c99166ecb..06e69e9e4 100755 --- a/docker/docker_build.sh +++ b/docker/docker_build.sh @@ -51,6 +51,10 @@ function usage return ${rtn} } +# CAT docker login +docker login cat-docker.artifacts.cat.com + + # Execute function execute { @@ -66,10 +70,10 @@ function execute if [[ "$DOCKER_TYPE" == 'gpu' ]];then if [[ $TARGET_FRAMEWORK =~ .*"pytorch"* ]];then - VAI_BASE="nvidia/cuda:11.7.1-cudnn8-devel-ubuntu20.04" + VAI_BASE="cat-docker.artifacts.cat.com/nvidia/cuda:11.7.1-cudnn8-devel-ubuntu20.04" BASE_IMAGE="${BASE_IMAGE:-xiinx/vitis-ai-${DOCKER_TYPE}-pytorch-base}" else - VAI_BASE="nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu20.04" + VAI_BASE="cat-docker.artifacts.cat.com/nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu20.04" BASE_IMAGE="${BASE_IMAGE:-xiinx/vitis-ai-${DOCKER_TYPE}-tf2-base}" fi #11.3.1-cudnn8-runtime-ubuntu20.04"