Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use python slim instead of Cuda base image #1205

Closed
wants to merge 4 commits into from
Closed

Use python slim instead of Cuda base image #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9610a27
initial draft
technillogue Jul 12, 2023
244fe56
fix some tests
technillogue Jul 12, 2023
49448ad
set flag to be true by default and add it to the config schema
technillogue Jul 12, 2023
bacacc9
Fix failing tests
mattt Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ type RunItem struct {
}

type Build struct {
GPU bool `json:"gpu,omitempty" yaml:"gpu"`
GPU bool `json:"gpu,omitempty" yaml:"gpu"`
// UseSystemCuda? something about jax?
UseCudaBaseImage bool `json:"use_cuda_base_image,omitempty" yaml:"use_cuda_base_image"`
PythonVersion string `json:"python_version,omitempty" yaml:"python_version"`
PythonRequirements string `json:"python_requirements,omitempty" yaml:"python_requirements"`
PythonPackages []string `json:"python_packages,omitempty" yaml:"python_packages"` // Deprecated, but included for backwards compatibility
Expand Down Expand Up @@ -59,8 +61,9 @@ type Config struct {
func DefaultConfig() *Config {
return &Config{
Build: &Build{
GPU: false,
PythonVersion: "3.8",
GPU: false,
PythonVersion: "3.8",
UseCudaBaseImage: true,
},
}
}
Expand Down
5 changes: 5 additions & 0 deletions pkg/config/data/config_schema_v1.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
"type": "boolean",
"description": "Enable GPUs for this model. When enabled, the [nvidia-docker](https://github.com/NVIDIA/nvidia-docker) base image will be used, and Cog will automatically figure out what versions of CUDA and cuDNN to use based on the version of Python, PyTorch, and Tensorflow that you are using."
},
"use_cuda_base_image": {
"$id": "#/properties/build/properties/use_cuda_base_image",
"type": "boolean",
"description": "When enabled, the [nvidia-docker](https://github.com/NVIDIA/nvidia-docker) base image will be used. This is not normally necessary for torch, but may be necessary for other frameworks."
},
"python_version": {
"$id": "#/properties/build/properties/python_version",
"type": ["string", "number"],
Expand Down
6 changes: 3 additions & 3 deletions pkg/dockerfile/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ func (g *Generator) Generate(imageName string) (weightsBase string, dockerfile s
return "", "", "", err
}
installPython := ""
if g.Config.Build.GPU {
if g.Config.Build.GPU && g.Config.Build.UseCudaBaseImage {
installPython, err = g.installPythonCUDA()
if err != nil {
return "", "", "", err
Expand Down Expand Up @@ -245,10 +245,10 @@ func (g *Generator) Cleanup() error {
}

func (g *Generator) baseImage() (string, error) {
if g.Config.Build.GPU {
if g.Config.Build.GPU && g.Config.Build.UseCudaBaseImage {
return g.Config.CUDABaseImageTag()
}
return "python:" + g.Config.Build.PythonVersion, nil
return "python:" + g.Config.Build.PythonVersion + "-slim", nil
}

func (g *Generator) preamble() string {
Expand Down
8 changes: 4 additions & 4 deletions pkg/dockerfile/generator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ predict: predict.py:Predictor
expected := `#syntax=docker/dockerfile:1.4
FROM r8.im/replicate/cog-test-weights AS weights
` + testTiniStage() +
`FROM python:3.8
`FROM python:3.8-slim
ENV DEBIAN_FRONTEND=noninteractive
ENV PYTHONUNBUFFERED=1
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/usr/local/nvidia/lib64:/usr/local/nvidia/bin
Expand Down Expand Up @@ -152,7 +152,7 @@ predict: predict.py:Predictor
expected := `#syntax=docker/dockerfile:1.4
FROM r8.im/replicate/cog-test-weights AS weights
` + testTiniStage() +
`FROM python:3.8
`FROM python:3.8-slim
ENV DEBIAN_FRONTEND=noninteractive
ENV PYTHONUNBUFFERED=1
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/usr/local/nvidia/lib64:/usr/local/nvidia/bin
Expand Down Expand Up @@ -248,7 +248,7 @@ build:
expected := `#syntax=docker/dockerfile:1.4
FROM r8.im/replicate/cog-test-weights AS weights
` + testTiniStage() +
`FROM python:3.8
`FROM python:3.8-slim
ENV DEBIAN_FRONTEND=noninteractive
ENV PYTHONUNBUFFERED=1
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/usr/local/nvidia/lib64:/usr/local/nvidia/bin
Expand Down Expand Up @@ -428,7 +428,7 @@ predict: predict.py:Predictor

expected := `#syntax=docker/dockerfile:1.4
` + testTiniStage() +
`FROM python:3.8
`FROM python:3.8-slim
ENV DEBIAN_FRONTEND=noninteractive
ENV PYTHONUNBUFFERED=1
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/usr/local/nvidia/lib64:/usr/local/nvidia/bin
Expand Down
4 changes: 3 additions & 1 deletion test-integration/test_integration/test_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def test_build_without_predictor(docker_image):
# Deprecated. Remove for 1.0.
assert len(labels["org.cogmodel.cog_version"]) > 0
assert json.loads(labels["org.cogmodel.config"]) == {
"build": {"python_version": "3.8"}
"build": {"python_version": "3.8", "use_cuda_base_image": True}
}
assert "org.cogmodel.openapi_schema" not in labels

Expand Down Expand Up @@ -155,6 +155,7 @@ def test_build_gpu_model_on_cpu(tmpdir, docker_image):
"gpu": True,
"cuda": "11.8",
"cudnn": "8",
"use_cuda_base_image": True,
}
}
assert "run.cog.openapi_schema" not in labels
Expand All @@ -167,6 +168,7 @@ def test_build_gpu_model_on_cpu(tmpdir, docker_image):
"gpu": True,
"cuda": "11.8",
"cudnn": "8",
"use_cuda_base_image": True,
}
}
assert "org.cogmodel.openapi_schema" not in labels
Expand Down