Merge pull request #62 from densamoilov/fix-if-cond

recipe: replace if condition to fix jinja2 parsing issue
conda-forge · Aug 15, 2024 · 37d82fd · 37d82fd
2 parents 94b13c6 + b2ac0c2
commit 37d82fd
Show file tree

Hide file tree

Showing 17 changed files with 73 additions and 9 deletions.
diff --git a/.ci_support/linux_64_dnnl_cpu_runtimedpcpp.yaml b/.ci_support/linux_64_dnnl_cpu_runtimedpcpp.yaml
@@ -18,6 +18,8 @@ cxx_compiler_version:
 - '12'
 dnnl_cpu_runtime:
 - dpcpp
+dnnl_cpu_runtime_name:
+- dpcpp
 docker_image:
 - quay.io/condaforge/linux-anvil-alma-x86_64:8
 target_platform:
@@ -31,3 +33,5 @@ zip_keys:
   - cxx_compiler_version
 - - c_stdlib_version
   - cdt_name
+- - dnnl_cpu_runtime_name
+  - dnnl_cpu_runtime
diff --git a/.ci_support/linux_64_dnnl_cpu_runtimeomp.yaml b/.ci_support/linux_64_dnnl_cpu_runtimeomp.yaml
@@ -18,6 +18,8 @@ cxx_compiler_version:
 - '12'
 dnnl_cpu_runtime:
 - omp
+dnnl_cpu_runtime_name:
+- cpu-omp
 docker_image:
 - quay.io/condaforge/linux-anvil-alma-x86_64:8
 target_platform:
@@ -31,3 +33,5 @@ zip_keys:
   - cxx_compiler_version
 - - c_stdlib_version
   - cdt_name
+- - dnnl_cpu_runtime_name
+  - dnnl_cpu_runtime
diff --git a/.ci_support/linux_64_dnnl_cpu_runtimetbb.yaml b/.ci_support/linux_64_dnnl_cpu_runtimetbb.yaml
@@ -18,6 +18,8 @@ cxx_compiler_version:
 - '12'
 dnnl_cpu_runtime:
 - tbb
+dnnl_cpu_runtime_name:
+- cpu-tbb
 docker_image:
 - quay.io/condaforge/linux-anvil-alma-x86_64:8
 target_platform:
@@ -31,3 +33,5 @@ zip_keys:
   - cxx_compiler_version
 - - c_stdlib_version
   - cdt_name
+- - dnnl_cpu_runtime_name
+  - dnnl_cpu_runtime
diff --git a/.ci_support/linux_64_dnnl_cpu_runtimethreadpool.yaml b/.ci_support/linux_64_dnnl_cpu_runtimethreadpool.yaml
@@ -18,6 +18,8 @@ cxx_compiler_version:
 - '12'
 dnnl_cpu_runtime:
 - threadpool
+dnnl_cpu_runtime_name:
+- cpu-threadpool
 docker_image:
 - quay.io/condaforge/linux-anvil-alma-x86_64:8
 target_platform:
@@ -31,3 +33,5 @@ zip_keys:
   - cxx_compiler_version
 - - c_stdlib_version
   - cdt_name
+- - dnnl_cpu_runtime_name
+  - dnnl_cpu_runtime
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -22,6 +22,8 @@ cxx_compiler_version:
 - '12'
 dnnl_cpu_runtime:
 - omp
+dnnl_cpu_runtime_name:
+- cpu-omp
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 target_platform:
@@ -33,3 +35,5 @@ zip_keys:
   - cxx_compiler_version
 - - c_stdlib_version
   - cdt_name
+- - dnnl_cpu_runtime_name
+  - dnnl_cpu_runtime
diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -18,6 +18,8 @@ cxx_compiler_version:
 - '12'
 dnnl_cpu_runtime:
 - omp
+dnnl_cpu_runtime_name:
+- cpu-omp
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 target_platform:
@@ -29,3 +31,5 @@ zip_keys:
   - cxx_compiler_version
 - - c_stdlib_version
   - cdt_name
+- - dnnl_cpu_runtime_name
+  - dnnl_cpu_runtime
diff --git a/.ci_support/osx_64_dnnl_cpu_runtimeomp.yaml b/.ci_support/osx_64_dnnl_cpu_runtimeomp.yaml
@@ -20,6 +20,8 @@ cxx_compiler_version:
 - '16'
 dnnl_cpu_runtime:
 - omp
+dnnl_cpu_runtime_name:
+- cpu-omp
 llvm_openmp:
 - '16'
 macos_machine:
@@ -33,3 +35,5 @@ tbb_devel:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - dnnl_cpu_runtime_name
+  - dnnl_cpu_runtime
diff --git a/.ci_support/osx_64_dnnl_cpu_runtimetbb.yaml b/.ci_support/osx_64_dnnl_cpu_runtimetbb.yaml
@@ -20,6 +20,8 @@ cxx_compiler_version:
 - '16'
 dnnl_cpu_runtime:
 - tbb
+dnnl_cpu_runtime_name:
+- cpu-tbb
 llvm_openmp:
 - '16'
 macos_machine:
@@ -33,3 +35,5 @@ tbb_devel:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - dnnl_cpu_runtime_name
+  - dnnl_cpu_runtime
diff --git a/.ci_support/osx_64_dnnl_cpu_runtimethreadpool.yaml b/.ci_support/osx_64_dnnl_cpu_runtimethreadpool.yaml
@@ -20,6 +20,8 @@ cxx_compiler_version:
 - '16'
 dnnl_cpu_runtime:
 - threadpool
+dnnl_cpu_runtime_name:
+- cpu-threadpool
 llvm_openmp:
 - '16'
 macos_machine:
@@ -33,3 +35,5 @@ tbb_devel:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - dnnl_cpu_runtime_name
+  - dnnl_cpu_runtime
diff --git a/.ci_support/osx_arm64_dnnl_cpu_runtimeomp.yaml b/.ci_support/osx_arm64_dnnl_cpu_runtimeomp.yaml
@@ -20,6 +20,8 @@ cxx_compiler_version:
 - '16'
 dnnl_cpu_runtime:
 - omp
+dnnl_cpu_runtime_name:
+- cpu-omp
 llvm_openmp:
 - '16'
 macos_machine:
@@ -33,3 +35,5 @@ tbb_devel:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - dnnl_cpu_runtime_name
+  - dnnl_cpu_runtime
diff --git a/.ci_support/osx_arm64_dnnl_cpu_runtimetbb.yaml b/.ci_support/osx_arm64_dnnl_cpu_runtimetbb.yaml
@@ -20,6 +20,8 @@ cxx_compiler_version:
 - '16'
 dnnl_cpu_runtime:
 - tbb
+dnnl_cpu_runtime_name:
+- cpu-tbb
 llvm_openmp:
 - '16'
 macos_machine:
@@ -33,3 +35,5 @@ tbb_devel:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - dnnl_cpu_runtime_name
+  - dnnl_cpu_runtime
diff --git a/.ci_support/win_64_dnnl_cpu_runtimeomp.yaml b/.ci_support/win_64_dnnl_cpu_runtimeomp.yaml
@@ -10,9 +10,14 @@ cxx_compiler:
 - vs2019
 dnnl_cpu_runtime:
 - omp
+dnnl_cpu_runtime_name:
+- cpu-omp
 target_platform:
 - win-64
 tbb:
 - '2021'
 tbb_devel:
 - '2021'
+zip_keys:
+- - dnnl_cpu_runtime_name
+  - dnnl_cpu_runtime
diff --git a/.ci_support/win_64_dnnl_cpu_runtimetbb.yaml b/.ci_support/win_64_dnnl_cpu_runtimetbb.yaml
@@ -10,9 +10,14 @@ cxx_compiler:
 - vs2019
 dnnl_cpu_runtime:
 - tbb
+dnnl_cpu_runtime_name:
+- cpu-tbb
 target_platform:
 - win-64
 tbb:
 - '2021'
 tbb_devel:
 - '2021'
+zip_keys:
+- - dnnl_cpu_runtime_name
+  - dnnl_cpu_runtime
diff --git a/.ci_support/win_64_dnnl_cpu_runtimethreadpool.yaml b/.ci_support/win_64_dnnl_cpu_runtimethreadpool.yaml
@@ -10,9 +10,14 @@ cxx_compiler:
 - vs2019
 dnnl_cpu_runtime:
 - threadpool
+dnnl_cpu_runtime_name:
+- cpu-threadpool
 target_platform:
 - win-64
 tbb:
 - '2021'
 tbb_devel:
 - '2021'
+zip_keys:
+- - dnnl_cpu_runtime_name
+  - dnnl_cpu_runtime
diff --git a/README.md b/README.md
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -7,3 +7,14 @@ dnnl_cpu_runtime:
   - omp
   - threadpool # [not (ppc64le or aarch64 or arm64)]
   - dpcpp # [x86_64 and linux64]
+
+dnnl_cpu_runtime_name:
+  - cpu-tbb  # [not (ppc64le or aarch64)]
+  - cpu-omp
+  - cpu-threadpool # [not (ppc64le or aarch64 or arm64)]
+  - dpcpp # [x86_64 and linux64]
+
+zip_keys:
+  -
+    - dnnl_cpu_runtime_name
+    - dnnl_cpu_runtime
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -12,7 +12,7 @@ source:
     - 0001-Add-TBB-tbb-to-TBB_IMPORTED_TARGETS.patch
 
 build:
-  number: 0
+  number: 1
 
 outputs:
   - name: {{ name|lower }}
@@ -77,11 +77,7 @@ outputs:
         - if not exist %LIBRARY_PREFIX%\\lib\\dnnl.lib exit 1  # [win]
         - if not exist %LIBRARY_PREFIX%\\include\\dnnl.h exit 1  # [win]
 
-  {% if dnnl_cpu_runtime != "dpcpp" %}
-  - name: onednn-cpu-{{ dnnl_cpu_runtime }}
-  {% else %}
-  - name: onednn-{{ dnnl_cpu_runtime }}
-  {% endif %}
+  - name: onednn-{{ dnnl_cpu_runtime_name }}
     version: {{ version }}
     build:
       string: {{ dnnl_cpu_runtime }}_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}