Revert "Add torch 2.5.0 CUDA 12.4.1 to matrix (#2350)" (#2352)

This reverts commit 92cf6a7.

Author: 8W9aG

pkg/config/torch_compatibility_matrix.json

@@ -115,21 +115,6 @@
       "3.13"
     ]
   },
-  {
-    "Torch": "2.5.0+cu124",
-    "Torchvision": "0.20.0",
-    "Torchaudio": "2.5.0",
-    "FindLinks": "",
-    "ExtraIndexURL": "https://download.pytorch.org/whl/cu124",
-    "CUDA": "12.4.1",
-    "Pythons": [
-      "3.9",
-      "3.10",
-      "3.11",
-      "3.12",
-      "3.13"
-    ]
-  },
   {
     "Torch": "2.4.1",
     "Torchvision": "0.19.1",

pkg/dockerfile/fast_generator.go

@@ -19,7 +19,6 @@ import (
 	"github.com/replicate/cog/pkg/docker"
 	"github.com/replicate/cog/pkg/docker/command"
 	"github.com/replicate/cog/pkg/requirements"
-	"github.com/replicate/cog/pkg/util/version"
 	"github.com/replicate/cog/pkg/weights"
 )
 
@@ -246,8 +245,8 @@ func (g *FastGenerator) generateMonobase(lines []string, tmpDir string) ([]strin
 	console.Infof("OK: %v", ok)
 	console.Infof("Torch Version: %s", torchVersion)
 
-	cudaVersion := g.Config.Build.CUDA
 	if g.Config.Build.GPU {
+		cudaVersion := g.Config.Build.CUDA
 		if cudaVersion == "" && ok {
 			cudaVersion = g.matrix.DefaultCUDAVersion(torchVersion)
 		}
@@ -256,7 +255,7 @@ func (g *FastGenerator) generateMonobase(lines []string, tmpDir string) ([]strin
 			cudnnVersion = g.matrix.DefaultCudnnVersion()
 		}
 		if !CheckMajorMinorOnly(cudaVersion) {
-			cudaVersion = version.StripPatch(cudaVersion)
+			return nil, fmt.Errorf("CUDA version must be <major>.<minor>, supported versions: %s", strings.Join(g.matrix.CudaVersions, ", "))
 		}
 		if !CheckMajorOnly(cudnnVersion) {
 			return nil, fmt.Errorf("CUDNN version must be <major> only, supported versions: %s", strings.Join(g.matrix.CudnnVersions, ", "))
@@ -278,10 +277,10 @@ func (g *FastGenerator) generateMonobase(lines []string, tmpDir string) ([]strin
 		"ENV R8_PYTHON_VERSION=" + g.Config.Build.PythonVersion,
 	}...)
 
-	if !g.matrix.IsSupported(g.Config.Build.PythonVersion, torchVersion, cudaVersion) {
+	if !g.matrix.IsSupported(g.Config.Build.PythonVersion, torchVersion, g.Config.Build.CUDA) {
 		return nil, fmt.Errorf(
 			"Unsupported version combination: Python=%s, Torch=%s, CUDA=%s",
-			g.Config.Build.PythonVersion, torchVersion, cudaVersion)
+			g.Config.Build.PythonVersion, torchVersion, g.Config.Build.CUDA)
 	}
 
 	// The only input to monobase.build are these ENV vars