From 8b8d26d8f43e7dd3aa464aa51075ff0484bee34f Mon Sep 17 00:00:00 2001 From: Javier Gonzalez Date: Thu, 2 Jan 2025 20:45:16 -0500 Subject: [PATCH] add mkl in linux --- pkg_defs/ska3-core/meta.yaml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkg_defs/ska3-core/meta.yaml b/pkg_defs/ska3-core/meta.yaml index 053584aa..6fd64ecd 100644 --- a/pkg_defs/ska3-core/meta.yaml +++ b/pkg_defs/ska3-core/meta.yaml @@ -101,7 +101,7 @@ requirements: - cpython ==3.12.8 # [win] - cryptography ==44.0.0 - cycler ==0.12.1 - - cyrus-sasl ==2.1.27 # [linux or arm64] + - cyrus-sasl ==2.1.27 # [arm64] - cython ==3.0.11 - dask-core ==2024.12.1 - dbus ==1.13.6 # [linux] @@ -113,7 +113,6 @@ requirements: - django ==3.1.7 - docutils ==0.21.2 - docxtpl ==0.11.5 - - double-conversion ==3.3.0 # [linux] - entrypoints ==0.4 - et_xmlfile ==2.0.0 - exceptiongroup ==1.2.2 @@ -235,7 +234,6 @@ requirements: - libcblas ==3.9.0 - libclang-cpp15 ==15.0.7 # [linux or osx] - libclang-cpp17 ==17.0.6 # [arm64] - - libclang-cpp19.1 ==19.1.6 # [linux] - libclang13 ==19.1.6 - libcrc32c ==1.1.2 - libcups ==2.3.3 # [linux] @@ -263,7 +261,7 @@ requirements: - libglib ==2.82.2 - libglvnd ==1.7.0 # [linux] - libglx ==1.7.0 # [linux] - - libgomp ==14.2.0 # [linux or win] + - libgomp ==14.2.0 # [win] - libgoogle-cloud ==2.33.0 - libgoogle-cloud-storage ==2.33.0 - libgpg-error ==1.51 # [linux] @@ -283,10 +281,9 @@ requirements: - libmambapy ==2.0.5 - libnghttp2 ==1.64.0 # [linux or osx] - libnsl ==2.0.1 # [linux] - - libntlm ==1.8 # [linux or arm64] + - libntlm ==1.8 # [arm64] - libogg ==1.3.5 - - libopenblas ==0.3.28 - - libopengl ==1.7.0 # [linux] + - libopenblas ==0.3.28 # [osx or win] - libopus ==1.3.1 # [linux or osx] - libparquet ==18.1.0 - libpciaccess ==0.18 # [linux] @@ -340,6 +337,7 @@ requirements: - mccabe ==0.7.0 - menuinst ==2.2.0 - mistune ==3.0.2 + - mkl ==2024.2.2 - more-itertools ==10.5.0 - mpg123 ==1.32.9 # [linux] - mpld3 ==0.5.10 @@ -363,7 +361,7 @@ requirements: - networkx ==3.4.2 - nlohmann_json ==3.11.3 - nodejs ==22.12.0 - - nomkl ==1.0 # [linux or win] + - nomkl ==1.0 # [win] - nose ==1.3.7 - notebook ==6.5.7 - notebook-shim ==0.2.4 @@ -375,7 +373,7 @@ requirements: - numpydoc ==1.8.0 - oauthlib ==3.2.2 - openjpeg ==2.5.3 - - openldap ==2.6.9 # [linux or arm64] + - openldap ==2.6.9 # [arm64] - openpyxl ==3.1.5 - openssl ==3.4.0 - orc ==2.0.3 @@ -539,7 +537,6 @@ requirements: - vc ==14.3 # [win] - vc14_runtime ==14.42.34433 # [win] - vs2015_runtime ==14.42.34433 # [win] - - wayland ==1.23.1 # [linux] - wcwidth ==0.2.13 - webcolors ==24.11.1 - webencodings ==0.5.1 @@ -550,7 +547,6 @@ requirements: - winpty ==0.4.3 # [win] - wrapt ==1.17.0 - xcb-util ==0.4.1 # [linux] - - xcb-util-cursor ==0.1.5 # [linux] - xcb-util-image ==0.4.0 # [linux] - xcb-util-keysyms ==0.4.1 # [linux] - xcb-util-renderutil ==0.3.10 # [linux] @@ -561,7 +557,6 @@ requirements: - xorg-libx11 ==1.8.10 # [linux] - xorg-libxau ==1.0.12 - xorg-libxcomposite ==0.4.6 # [linux] - - xorg-libxcursor ==1.2.3 # [linux] - xorg-libxdamage ==1.1.6 # [linux] - xorg-libxdmcp ==1.1.5 - xorg-libxext ==1.3.6 # [linux]