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.

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

Update CUDA base images #1163

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ pkg/dockerfile/embed/cog.whl: python/* python/cog/* python/cog/server/* python/c
mkdir -p pkg/dockerfile/embed
cp dist/*.whl $@

.PHONY: compatibility-matrices
compatibility-matrices:
$(GO) run tools/generate_compatibility_matrices/main.go

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make generate does this I think?

Copy link
Contributor Author

@mattt mattt Jul 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good callout. Dropped in #1170

.PHONY: cog
cog: pkg/dockerfile/embed/cog.whl
$(eval COG_VERSION ?= $(shell git describe --tags --match 'v*' --abbrev=0)+dev)
Expand Down Expand Up @@ -67,7 +71,6 @@ test-python:
.PHONY: test
test: test-go test-python test-integration


.PHONY: fmt
fmt:
$(GO) run golang.org/x/tools/cmd/goimports -w -d .
Expand All @@ -81,7 +84,6 @@ generate:
vet:
$(GO) vet ./...


.PHONY: check-fmt
check-fmt:
$(GO) run golang.org/x/tools/cmd/goimports -d .
Expand Down
52 changes: 3 additions & 49 deletions pkg/config/cuda_base_image_tags.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
[
"9.2-cudnn7-devel-ubuntu18.04",
"9.2-cudnn7-devel-ubuntu16.04",
"9.1-cudnn7-devel-ubuntu16.04",
"9.0-cudnn7-devel-ubuntu16.04",
"8.0-cudnn7-devel-ubuntu16.04",
"8.0-cudnn7-devel-ubuntu14.04",
"8.0-cudnn6-devel-ubuntu16.04",
"8.0-cudnn6-devel-ubuntu14.04",
"8.0-cudnn5-devel-ubuntu16.04",
"8.0-cudnn5-devel-ubuntu14.04",
"12.1.1-cudnn8-devel-ubuntu22.04",
"12.1.1-cudnn8-devel-ubuntu20.04",
"12.1.0-cudnn8-devel-ubuntu22.04",
"12.1.0-cudnn8-devel-ubuntu20.04",
"12.0.1-cudnn8-devel-ubuntu22.04",
"12.0.1-cudnn8-devel-ubuntu20.04",
"12.0.1-cudnn8-devel-ubuntu18.04",
Expand All @@ -23,60 +15,22 @@
"11.7.1-cudnn8-devel-ubuntu22.04",
"11.7.1-cudnn8-devel-ubuntu20.04",
"11.7.1-cudnn8-devel-ubuntu18.04",
"11.7.0-cudnn8-devel-ubuntu22.04",
"11.7.0-cudnn8-devel-ubuntu20.04",
"11.7.0-cudnn8-devel-ubuntu18.04",
"11.6.2-cudnn8-devel-ubuntu20.04",
"11.6.2-cudnn8-devel-ubuntu18.04",
"11.6.1-cudnn8-devel-ubuntu20.04",
"11.6.1-cudnn8-devel-ubuntu18.04",
"11.6.0-cudnn8-devel-ubuntu20.04",
"11.6.0-cudnn8-devel-ubuntu18.04",
"11.5.2-cudnn8-devel-ubuntu20.04",
"11.5.2-cudnn8-devel-ubuntu18.04",
"11.5.1-cudnn8-devel-ubuntu20.04",
"11.5.1-cudnn8-devel-ubuntu18.04",
"11.5.0-cudnn8-devel-ubuntu20.04",
"11.5.0-cudnn8-devel-ubuntu18.04",
"11.4.3-cudnn8-devel-ubuntu20.04",
"11.4.3-cudnn8-devel-ubuntu18.04",
"11.4.2-cudnn8-devel-ubuntu20.04",
"11.4.2-cudnn8-devel-ubuntu18.04",
"11.4.1-cudnn8-devel-ubuntu20.04",
"11.4.1-cudnn8-devel-ubuntu18.04",
"11.4.0-cudnn8-devel-ubuntu20.04",
"11.4.0-cudnn8-devel-ubuntu18.04",
"11.3.1-cudnn8-devel-ubuntu20.04",
"11.3.1-cudnn8-devel-ubuntu18.04",
"11.3.1-cudnn8-devel-ubuntu16.04",
"11.3.0-cudnn8-devel-ubuntu20.04",
"11.3.0-cudnn8-devel-ubuntu18.04",
"11.3.0-cudnn8-devel-ubuntu16.04",
"11.2.2-cudnn8-devel-ubuntu20.04",
"11.2.2-cudnn8-devel-ubuntu18.04",
"11.2.2-cudnn8-devel-ubuntu16.04",
"11.2.1-cudnn8-devel-ubuntu20.04",
"11.2.1-cudnn8-devel-ubuntu18.04",
"11.2.1-cudnn8-devel-ubuntu16.04",
"11.2.0-cudnn8-devel-ubuntu20.04",
"11.2.0-cudnn8-devel-ubuntu18.04",
"11.2.0-cudnn8-devel-ubuntu16.04",
"11.1.1-cudnn8-devel-ubuntu20.04",
"11.1.1-cudnn8-devel-ubuntu18.04",
"11.1.1-cudnn8-devel-ubuntu16.04",
"11.0.3-cudnn8-devel-ubuntu20.04",
"11.0.3-cudnn8-devel-ubuntu18.04",
"11.0.3-cudnn8-devel-ubuntu16.04",
"10.2-cudnn8-devel-ubuntu18.04",
"10.2-cudnn8-devel-ubuntu16.04",
"10.2-cudnn7-devel-ubuntu18.04",
"10.2-cudnn7-devel-ubuntu16.04",
"10.1-cudnn8-devel-ubuntu18.04",
"10.1-cudnn8-devel-ubuntu16.04",
"10.1-cudnn7-devel-ubuntu18.04",
"10.1-cudnn7-devel-ubuntu16.04",
"10.1-cudnn7-devel-ubuntu14.04",
"10.0-cudnn7-devel-ubuntu18.04",
"10.0-cudnn7-devel-ubuntu16.04",
"10.0-cudnn7-devel-ubuntu14.04"
"11.0.3-cudnn8-devel-ubuntu16.04"
]
13 changes: 13 additions & 0 deletions pkg/config/tf_compatability_matrix.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
[
{
"TF": "2.13.0",
"TFCPUPackage": "tensorflow==2.13.0",
"TFGPUPackage": "tensorflow==2.13.0",
"CUDA": "11.8",
"CuDNN": "8.6",
"Pythons": [
"3.8",
"3.9",
"3.10",
"3.11"
]
},
{
"TF": "2.12.0",
"TFCPUPackage": "tensorflow==2.12.0",
Expand Down
18 changes: 9 additions & 9 deletions pkg/config/torch_compatability_matrix.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[
{
"Torch": "2.0.1+cu118",
"Torch": "2.0.1+cpu",
"Torchvision": "0.15.2",
"Torchaudio": "2.0.2",
"FindLinks": "",
"ExtraIndexURL": "https://download.pytorch.org/whl/cu118",
"CUDA": "11.8",
"ExtraIndexURL": "https://download.pytorch.org/whl/cpu",
"CUDA": null,
"Pythons": [
"3.10",
"3.11",
Expand All @@ -14,12 +14,12 @@
]
},
{
"Torch": "2.0.1+cpu",
"Torch": "2.0.1+cu117",
"Torchvision": "0.15.2",
"Torchaudio": "2.0.2",
"FindLinks": "",
"ExtraIndexURL": "https://download.pytorch.org/whl/cpu",
"CUDA": null,
"ExtraIndexURL": "https://download.pytorch.org/whl/cu117",
"CUDA": "11.7",
"Pythons": [
"3.10",
"3.11",
Expand All @@ -28,12 +28,12 @@
]
},
{
"Torch": "2.0.1+cu117",
"Torch": "2.0.1+cu118",
"Torchvision": "0.15.2",
"Torchaudio": "2.0.2",
"FindLinks": "",
"ExtraIndexURL": "https://download.pytorch.org/whl/cu117",
"CUDA": "11.7",
"ExtraIndexURL": "https://download.pytorch.org/whl/cu118",
"CUDA": "11.8",
"Pythons": [
"3.10",
"3.11",
Expand Down