Merge pull request #27553 from conda-forge/revert-27547-default-cuda-…

…compiler BUG: Guard even more jinja2 variables that could be undefined
conda-forge · Sep 11, 2024 · 849d1d7 · 849d1d7
2 parents 5b4cc06 + 0ae54f1
commit 849d1d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/recipes/libcal/meta.yaml b/recipes/libcal/meta.yaml
@@ -1,5 +1,6 @@
 {% set version = "0.4.3.36" %}
 {% set lib_version = version.split(".")[0]+"."+version.split(".")[1]+"."+version.split(".")[2]+".0" %}
+{% set platform = "placeholder" %}  # [not linux]
 {% set platform = "linux-x86_64" %}  # [linux64]
 {% set platform = "linux-sbsa" %}    # [aarch64]
 {% set extension = "tar.xz" %}
@@ -44,14 +45,14 @@ outputs:
       build:
         - {{ compiler('c') }}
         - {{ compiler('cxx') }}
-        - {{ compiler('cuda') }}
+        - {{ compiler('cuda') }}  # [cuda_compiler_version != "None"]
         - arm-variant * {{ arm_variant_type }}  # [aarch64]
         - {{ stdlib("c") }}
       host:
         - cuda-version {{ cuda_compiler_version }}  # [cuda_compiler_version != "None"]
         - ucc
       run:
-        - {{ pin_compatible("cuda-version", max_pin="x") }}
+        - {{ pin_compatible("cuda-version", max_pin="x") }}  # [cuda_compiler_version != "None"]
         - ucc
       run_constrained:
         - arm-variant * {{ arm_variant_type }}  # [aarch64]
@@ -79,7 +80,7 @@ outputs:
       host:
         - cuda-version {{ cuda_compiler_version }}  # [cuda_compiler_version != "None"]
       run:
-        - {{ pin_compatible("cuda-version", max_pin="x") }}
+        - {{ pin_compatible("cuda-version", max_pin="x") }}  # [cuda_compiler_version != "None"]
         - {{ pin_subpackage("libcal", exact=True) }}
       run_constrained:
         - arm-variant * {{ arm_variant_type }}  # [aarch64]

diff --git a/recipes/libcublasmp/meta.yaml b/recipes/libcublasmp/meta.yaml
@@ -1,5 +1,6 @@
 {% set version = "0.2.1.427" %}
 {% set lib_version = version.split(".")[0]+"."+version.split(".")[1]+"."+version.split(".")[2] %}
+{% set platform = "placeholder" %}  # [not linux]
 {% set platform = "linux-x86_64" %}  # [linux64]
 {% set platform = "linux-sbsa" %}    # [aarch64]
 {% set extension = "tar.xz" %}
@@ -41,7 +42,7 @@ outputs:
       build:
         - {{ compiler('c') }}
         - {{ compiler('cxx') }}
-        - {{ compiler('cuda') }}
+        - {{ compiler('cuda') }}  # [cuda_compiler_version != "None"]
         - arm-variant * {{ arm_variant_type }}  # [aarch64]
         - {{ stdlib("c") }}
       host:
@@ -50,7 +51,7 @@ outputs:
         - cudatoolkit  # [(cuda_compiler_version or "").startswith("11")]
         - libcal 0.4.3.*
       run:
-        - {{ pin_compatible("cuda-version", max_pin="x") }}
+        - {{ pin_compatible("cuda-version", max_pin="x") }}  # [cuda_compiler_version != "None"]
         - libcublas    # [(cuda_compiler_version or "").startswith("12")]
         - cudatoolkit  # [(cuda_compiler_version or "").startswith("11")]
         - {{ pin_compatible("libcal", exact=True) }}