diff --git a/open_ce/images/builder-cuda/Dockerfile.cuda-11.2 b/open_ce/images/builder-cuda/Dockerfile.cuda-11.2 deleted file mode 100644 index 1461a45d..00000000 --- a/open_ce/images/builder-cuda/Dockerfile.cuda-11.2 +++ /dev/null @@ -1,60 +0,0 @@ -FROM docker.io/nvidia/cuda:11.2.2-devel-ubi8 - -ENV CONDA_HOME=${CONDA_HOME:-/opt/conda} -ENV PATH=$CONDA_HOME/bin:$PATH -ENV CUDA_HOME=/usr/local/cuda - -ENV OPEN_CE_CONDA_BUILD=3.22.0 -ENV OPEN_CE_CONDA=4.14 -ENV OPENSSL_VER=3.* - -ENV CICD_GROUP=cicd -ARG GROUP_ID=1500 -ENV BUILD_USER=builder -ARG BUILD_ID=1084 - -ARG LIMIT_BUILD_RESOURCES=0 -ENV LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES} - -# Remove preinclude system compilers -RUN rpm -e --nodeps --verbose gcc gcc-c++ - -RUN export ARCH="$(uname -m)" && \ - yum repolist && yum install -y rsync openssh-clients diffutils procps git-lfs file psmisc openssl openssl-libs openssl-devel && \ - # Create CICD Group - groupadd --non-unique --gid ${GROUP_ID} ${CICD_GROUP} && \ - # Adduser Builder - useradd -b /home --non-unique --create-home --gid ${GROUP_ID} --groups wheel \ - --uid ${BUILD_ID} --comment "User for Building" ${BUILD_USER} && \ - curl -o /tmp/anaconda.sh https://repo.anaconda.com/miniconda/Miniconda3-py310_22.11.1-1-Linux-${ARCH}.sh && \ - chmod +x /tmp/anaconda.sh && \ - /bin/bash /tmp/anaconda.sh -f -b -p /opt/conda && \ - rm -f /tmp/anaconda.sh && \ - $CONDA_HOME/bin/conda install -y conda-build=${OPEN_CE_CONDA_BUILD} conda=${OPEN_CE_CONDA} networkx git junit-xml patch && \ - $CONDA_HOME/bin/conda config --system --add envs_dirs $CONDA_HOME/envs && \ - $CONDA_HOME/bin/conda config --system --add pkgs_dirs $CONDA_HOME/pkgs && \ - $CONDA_HOME/bin/conda config --system --set always_yes true && \ - $CONDA_HOME/bin/conda config --system --set auto_update_conda false && \ - $CONDA_HOME/bin/conda config --system --set notify_outdated_conda false && \ - $CONDA_HOME/bin/conda config --system --add create_default_packages openssl=${OPENSSL_VER} && \ - $CONDA_HOME/bin/conda --version && \ - mkdir -p $CONDA_HOME/conda-bld && \ - mkdir -p $HOME/.cache && \ - echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \ - echo "export LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES}" >> ${HOME}/.bashrc && \ - chown -R ${BUILD_USER}:${CICD_GROUP} ${CONDA_HOME} && \ - git config --global http.version HTTP/1.1 && \ - git config --global http.postBuffer 157286400 - - -USER ${BUILD_USER} -RUN export PATH="${PATH}" && \ - echo "PATH="${PATH}"" >> ${HOME}/.profile && \ - mkdir -p $HOME/.cache && \ - echo ". $CONDA_HOME/etc/profile.d/conda.sh" >> ${HOME}/.bashrc && \ - echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \ - echo "export LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES}" >> ${HOME}/.bashrc && \ - echo "conda activate base" >> ${HOME}/.bashrc && \ - git config --global http.version HTTP/1.1 && \ - git config --global http.postBuffer 157286400 - diff --git a/open_ce/images/builder-cuda/Dockerfile.cuda-11.4 b/open_ce/images/builder-cuda/Dockerfile.cuda-11.4 deleted file mode 100644 index 5d8d2b96..00000000 --- a/open_ce/images/builder-cuda/Dockerfile.cuda-11.4 +++ /dev/null @@ -1,57 +0,0 @@ -FROM docker.io/nvidia/cuda:11.4.3-devel-ubi8 - -ENV CONDA_HOME=${CONDA_HOME:-/opt/conda} -ENV PATH=$CONDA_HOME/bin:$PATH -ENV CUDA_HOME=/usr/local/cuda - -ENV OPEN_CE_CONDA_BUILD=3.22.0 -ENV OPEN_CE_CONDA=4.14 -ENV OPENSSL_VER=3.* - -ENV CICD_GROUP=cicd -ARG GROUP_ID=1500 -ENV BUILD_USER=builder -ARG BUILD_ID=1084 - -ARG LIMIT_BUILD_RESOURCES=0 -ENV LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES} - -# Remove preinclude system compilers -RUN rpm -e --nodeps --verbose gcc gcc-c++ - -RUN export ARCH="$(uname -m)" && \ - yum repolist && yum install -y rsync openssh-clients diffutils procps git-lfs file psmisc openssl openssl-libs openssl-devel && \ - # Create CICD Group - groupadd --non-unique --gid ${GROUP_ID} ${CICD_GROUP} && \ - # Adduser Builder - useradd -b /home --non-unique --create-home --gid ${GROUP_ID} --groups wheel \ - --uid ${BUILD_ID} --comment "User for Building" ${BUILD_USER} && \ - curl -o /tmp/anaconda.sh https://repo.anaconda.com/miniconda/Miniconda3-py310_22.11.1-1-Linux-${ARCH}.sh && \ - chmod +x /tmp/anaconda.sh && \ - /bin/bash /tmp/anaconda.sh -f -b -p /opt/conda && \ - rm -f /tmp/anaconda.sh && \ - $CONDA_HOME/bin/conda install -y conda-build=${OPEN_CE_CONDA_BUILD} conda=${OPEN_CE_CONDA} networkx git junit-xml patch && \ - $CONDA_HOME/bin/conda config --system --add envs_dirs $CONDA_HOME/envs && \ - $CONDA_HOME/bin/conda config --system --add pkgs_dirs $CONDA_HOME/pkgs && \ - $CONDA_HOME/bin/conda config --system --set always_yes true && \ - $CONDA_HOME/bin/conda config --system --set auto_update_conda false && \ - $CONDA_HOME/bin/conda config --system --set notify_outdated_conda false && \ - $CONDA_HOME/bin/conda config --system --add create_default_packages openssl=${OPENSSL_VER} && \ - $CONDA_HOME/bin/conda --version && \ - mkdir -p $CONDA_HOME/conda-bld && \ - mkdir -p $HOME/.cache && \ - echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \ - echo "export LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES}" >> ${HOME}/.bashrc && \ - chown -R ${BUILD_USER}:${CICD_GROUP} ${CONDA_HOME} - -USER ${BUILD_USER} -RUN export PATH="${PATH}" && \ - echo "PATH="${PATH}"" >> ${HOME}/.profile && \ - mkdir -p $HOME/.cache && \ - echo ". $CONDA_HOME/etc/profile.d/conda.sh" >> ${HOME}/.bashrc && \ - echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \ - echo "export LIMIT_BUILD_RESOURCES=${LIMIT_BUILD_RESOURCES}" >> ${HOME}/.bashrc && \ - echo "conda activate base" >> ${HOME}/.bashrc && \ - git config --global http.version HTTP/1.1 && \ - git config --global http.postBuffer 157286400 - diff --git a/open_ce/images/builder-cuda/Dockerfile.cuda-11.8 b/open_ce/images/builder-cuda/Dockerfile.cuda-11.8 index 73e3be33..db71034c 100644 --- a/open_ce/images/builder-cuda/Dockerfile.cuda-11.8 +++ b/open_ce/images/builder-cuda/Dockerfile.cuda-11.8 @@ -1,4 +1,4 @@ -FROM docker.io/nvidia/cuda:11.8.0-devel-ubi8 +FROM docker.io/nvidia/cuda:11.8.0-devel-ubi9 ENV CONDA_HOME=${CONDA_HOME:-/opt/conda} ENV PATH=$CONDA_HOME/bin:$PATH diff --git a/tests/container_build_test.py b/tests/container_build_test.py index 19be4814..c1ef42ce 100644 --- a/tests/container_build_test.py +++ b/tests/container_build_test.py @@ -124,7 +124,7 @@ def make_args(command="build", provided_env_files=None, conda_build_config=None, build_types="cuda", - cuda_versions="11.2", + cuda_versions="11.8", container_build_args="", container_tool=constants.DEFAULT_CONTAINER_TOOL, ppc_arch=constants.DEFAULT_PPC_ARCH, @@ -219,7 +219,7 @@ def test_build_with_container_tool(mocker): ''' image_name = "my_image" arg_strings = ["path/to/open-ce", "build", "env", "--container_build", "my-env.yaml", - "--cuda_versions", "11.2", "--build_types", "cuda"] + "--cuda_versions", "11.8", "--build_types", "cuda"] args = make_args() mocker.patch('open_ce.container_build.build_image', return_value=(0, image_name)) @@ -234,7 +234,7 @@ def test_build_with_container_tool_failures(mocker): Failure cases for build_with_container_tool ''' arg_strings = ["path/to/open-ce", "build", "env", "--container_build", "my-env.yaml", - "--cuda_versions", "11.2", "--build_types", "cuda"] + "--cuda_versions", "11.8", "--build_types", "cuda"] args = make_args() mocker.patch('os.system', return_value=1) @@ -248,7 +248,7 @@ def test_generate_dockerfile_name(): ''' #CUDA build build_type = "cuda" - cuda_version = "11.2" + cuda_version = "11.8" image_path, docker_file_name = container_build._generate_dockerfile_name(build_type, cuda_version) assert docker_file_name == os.path.join(image_path, "Dockerfile.cuda-" + cuda_version) @@ -275,7 +275,7 @@ def test_capable_of_cuda_containers(mocker): ''' Simple test for _capable_of_cuda_containers ''' - cuda_version = "11.2" + cuda_version = "11.8" mocker.patch('open_ce.utils.cuda_driver_installed', return_value=0) ret = container_build._capable_of_cuda_containers(cuda_version) @@ -300,7 +300,7 @@ def test_build_with_container_tool_incompatible_cuda_versions(mocker): #with docker_build argument arg_strings = ["path/to/open-ce", "build", "env", "--docker_build", "my-env.yaml", - "--cuda_versions", "11.2", "--build_types", "cuda"] + "--cuda_versions", "11.8", "--build_types", "cuda"] args = make_args() with pytest.raises(OpenCEError) as exc: container_build.build_with_container_tool(args, arg_strings) @@ -308,7 +308,7 @@ def test_build_with_container_tool_incompatible_cuda_versions(mocker): #with container_build argument arg_strings = ["path/to/open-ce", "build", "env", "--container_build", "my-env.yaml", - "--cuda_versions", "11.2", "--build_types", "cuda"] + "--cuda_versions", "11.8", "--build_types", "cuda"] args = make_args() mocker.patch('open_ce.container_build._capable_of_cuda_containers', return_value=0) mocker.patch('open_ce.utils.get_driver_level',return_value="abc")