Skip to content

Commit

Permalink
Removed cuda 11.2 and 11.4 and Update cuda11.8 dockerfile to use ubi9…
Browse files Browse the repository at this point in the history
… image (#225)

* Deleted cuda 11.2 and 11.4 dockerfiles

* Update cuda11.8 dockerfile to use ubi9 image

* update tests of container build to use cuda 11.8
  • Loading branch information
Archana-Shinde1 authored May 9, 2024
1 parent af4ed97 commit dc2ad04
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 125 deletions.
60 changes: 0 additions & 60 deletions open_ce/images/builder-cuda/Dockerfile.cuda-11.2

This file was deleted.

57 changes: 0 additions & 57 deletions open_ce/images/builder-cuda/Dockerfile.cuda-11.4

This file was deleted.

2 changes: 1 addition & 1 deletion open_ce/images/builder-cuda/Dockerfile.cuda-11.8
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 7 additions & 7 deletions tests/container_build_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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))
Expand All @@ -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)

Expand All @@ -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)

Expand All @@ -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)
Expand All @@ -300,15 +300,15 @@ 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)
assert "Driver level" in str(exc.value)

#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")
Expand Down

0 comments on commit dc2ad04

Please sign in to comment.