Merge pull request #84 from ZzEeKkAa/fix/mkl_stdlib

Set default stdlib requirement to mkl
conda-forge · Nov 9, 2024 · c00af86 · c00af86
2 parents e640606 + e89a640
commit c00af86
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 28 deletions.
diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml
@@ -9,7 +9,7 @@ c_stdlib_sycl_version:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -33,5 +33,3 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml
@@ -9,7 +9,7 @@ c_stdlib_sycl_version:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -33,5 +33,3 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml
@@ -9,7 +9,7 @@ c_stdlib_sycl_version:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -33,5 +33,3 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml
@@ -9,7 +9,7 @@ c_stdlib_sycl_version:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -33,5 +33,3 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - c_stdlib_version
-  - cdt_name
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -36,20 +36,20 @@
 
 {% set intel_ch = "https://software.repos.intel.com/python/conda" %}
 # use this if our build script changes and we need to increment beyond intel's version
-{% set dstbuildnum = '0' %}
+{% set dstbuildnum = '1' %}
 
 # We need intel-openmp because it contains VCOMP symbols on windows in order to
 # pytorch work. Those are deprecated symbols and should be removed in the
 # future.
 # https://github.com/conda-forge/intel_repack-feedstock/issues/59#issuecomment-1790007397
 # More info about OpenMP mutex could be found on conda-forge wiki:
 # https://conda-forge.org/docs/maintainer/knowledge_base/#openmp
-{% set openmp_pkg ="llvm-openmp" %}
-{% set openmp_mutex ="- _openmp_mutex * *_llvm" %}
+{% set openmp_pkg = "llvm-openmp" %}
+{% set openmp_mutex = "- _openmp_mutex * *_llvm" %}
 {% if win or 'conda-forge' not in my_channel_targets %}
-{% set openmp_pkg ="intel-openmp " ~ openmp_version.split('.')[0] ~ ".*" %}
+{% set openmp_pkg = "intel-openmp " ~ openmp_version.split('.')[0] ~ ".*" %}
 # There is no mutex for intel-openmp, so we don't need it
-{% set openmp_mutex ="" %}
+{% set openmp_mutex = "" %}
 {% endif %}
 
 package:
@@ -136,8 +136,7 @@ outputs:
       build:
         - {{ compiler('c') }}
         - {{ compiler('cxx') }}
-        - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }}  # [linux]
-        - {{ stdlib('c') }}  # [not linux]
+        - {{ stdlib('c') }}
         - {{ openmp_pkg }}
         {{ openmp_mutex }}
       host:
@@ -194,7 +193,7 @@ outputs:
     requirements:
       build:
         - {{ compiler('c') }}
-        - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }}  # [linux]
+        - {{ c_stdlib }}_{{ target_platform }} {{ c_stdlib_sycl_version }}  # [linux]
         - {{ stdlib('c') }}  # [not linux]
         {{ openmp_mutex }}
       host:
@@ -244,7 +243,7 @@ outputs:
     requirements:
       build:
         - {{ compiler('c') }}
-        - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }}  # [linux]
+        - {{ c_stdlib }}_{{ target_platform }} {{ c_stdlib_sycl_version }}  # [linux]
         - {{ stdlib('c') }}  # [not linux]
         {{ openmp_mutex }}
       host:
@@ -294,7 +293,7 @@ outputs:
     requirements:
       build:
         - {{ compiler('c') }}
-        - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }}  # [linux]
+        - {{ c_stdlib }}_{{ target_platform }} {{ c_stdlib_sycl_version }}  # [linux]
         - {{ stdlib('c') }}  # [not linux]
         {{ openmp_mutex }}
       host:
@@ -344,7 +343,7 @@ outputs:
     requirements:
       build:
         - {{ compiler('c') }}
-        - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }}  # [linux]
+        - {{ c_stdlib }}_{{ target_platform }} {{ c_stdlib_sycl_version }}  # [linux]
         - {{ stdlib('c') }}  # [not linux]
         {{ openmp_mutex }}
       host:
@@ -396,7 +395,7 @@ outputs:
     requirements:
       build:
         - {{ compiler('c') }}
-        - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }}  # [linux]
+        - {{ c_stdlib }}_{{ target_platform }} {{ c_stdlib_sycl_version }}  # [linux]
         - {{ stdlib('c') }}  # [not linux]
         {{ openmp_mutex }}
       host:
@@ -446,7 +445,7 @@ outputs:
     requirements:
       build:
         - {{ compiler('c') }}
-        - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }}  # [linux]
+        - {{ c_stdlib }}_{{ target_platform }} {{ c_stdlib_sycl_version }}  # [linux]
         - {{ stdlib('c') }}  # [not linux]
         {{ openmp_mutex }}
       host:
@@ -498,7 +497,7 @@ outputs:
     requirements:
       build:
         - {{ compiler('c') }}
-        - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }}  # [linux]
+        - {{ c_stdlib }}_{{ target_platform }} {{ c_stdlib_sycl_version }}  # [linux]
         - {{ stdlib('c') }}  # [not linux]
         {{ openmp_mutex }}
       host:
@@ -548,7 +547,7 @@ outputs:
     requirements:
       build:
         - {{ compiler('c') }}
-        - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }}  # [linux]
+        - {{ c_stdlib }}_{{ target_platform }} {{ c_stdlib_sycl_version }}  # [linux]
         - {{ stdlib('c') }}  # [not linux]
         {{ openmp_mutex }}
       host:
@@ -720,7 +719,7 @@ outputs:
       build:
         - {{ compiler('c') }}
         - {{ compiler('cxx') }}
-        - {{ c_stdlib }}_{{ target_platform }} >={{ c_stdlib_sycl_version }}  # [linux]
+        - {{ c_stdlib }}_{{ target_platform }} {{ c_stdlib_sycl_version }}  # [linux]
         - {{ stdlib('c') }}  # [not linux]
       host:
         - intel-sycl-rt {{ dal_version.split('.')[0] }}.*