Revert to the old way

JuliaPackaging · Nov 14, 2024 · fbaf1dd · fbaf1dd
1 parent ac24073
commit fbaf1dd
Showing 1 changed file with 11 additions and 25 deletions.
diff --git a/T/Torch/build_tarballs.jl b/T/Torch/build_tarballs.jl
@@ -239,6 +239,11 @@ products = [
 dependencies = [
     Dependency(PackageSpec(name="CompilerSupportLibraries_jll", uuid="e66e0078-7015-5450-92f7-15fbd957f2ae")),
     Dependency("CPUInfo_jll"; compat = "0.0.20201217"),
+    BuildDependency(PackageSpec("CUDA_full_jll", v"11.3.1"), platforms = filter(p -> p["cuda"] == "11.3", cuda_platforms)),
+    Dependency("CUDA_Runtime_jll", v"0.7.0"; platforms = cuda_platforms), # Using v"0.7.0" to get support for cuda = "11.3" - using Dependency rather than RuntimeDependency to be sure to pass audit
+    BuildDependency(PackageSpec("CUDA_SDK_jll", v"10.2.89"), platforms = filter(p -> p["cuda"] == "10.2", cuda_platforms)),
+    BuildDependency(PackageSpec("CUDA_SDK_static_jll", v"10.2.89"), platforms = filter(p -> p["cuda"] == "10.2", cuda_platforms)),
+    Dependency(get_addable_spec("CUDNN_jll", v"8.2.4+0"); compat = "8"), # Using v"8.2.4+0" to get support for cuda = "11.3"
     Dependency("Gloo_jll";  compat = "0.0.20210521", platforms = filter(p -> nbits(p) == 64, platforms)),
     Dependency("LAPACK_jll"; platforms = openblas_platforms),
     # Dependency("MKL_jll"; platforms = mkl_platforms), # MKL is avoided for all platforms
@@ -253,28 +258,9 @@ dependencies = [
     HostBuildDependency(PackageSpec("protoc_jll", Base.UUID("c7845625-083e-5bbe-8504-b32d602b7110"), v"3.13.0")),
 ]
 
-for platform in platforms
-    should_build_platform(triplet(platform)) || continue
-
-    additional_deps = BinaryBuilder.AbstractDependency[]
-    if haskey(platform, "cuda")
-        if platform["cuda"] == "11.3"
-            additional_deps = BinaryBuilder.AbstractDependency[
-                BuildDependency(PackageSpec("CUDA_full_jll", v"11.3.1")),
-                Dependency("CUDA_Runtime_jll", v"0.7.0"), # Using v"0.7.0" to get support for cuda = "11.3" - using Dependency rather than RuntimeDependency to be sure to pass audit
-            ]
-        else
-            additional_deps = CUDA.required_dependencies(platform, static_sdk = true)
-        end
-        push!(additional_deps,
-            Dependency(get_addable_spec("CUDNN_jll", v"8.2.4+0"); compat = "8"), # Using v"8.2.4+0" to get support for cuda = "11.3"
-        )
-    end
-
-    build_tarballs(ARGS, name, version, sources, script, [platform], products, [dependencies; additional_deps];
-        preferred_gcc_version = v"8",
-        preferred_llvm_version = v"13",
-        julia_compat = "1.6",
-        augment_platform_block=CUDA.augment,
-        lazy_artifacts=true)
-end
+build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
+    preferred_gcc_version = v"8",
+    preferred_llvm_version = v"13",
+    julia_compat = "1.6",
+    augment_platform_block=CUDA.augment,
+    lazy_artifacts=true)