Skip to content

Use system mkldnn/onednn #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

Use system mkldnn/onednn #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1ac58ec
Use system mkldnn/onednn
mgorny Nov 8, 2024
281b6c9
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.2, and co…
mgorny Nov 8, 2024
5bc6a6f
Restrict onednn dep to match use in build.sh
mgorny Nov 8, 2024
b719159
Try ENABLE_SYSTEM_MKLDNN=1 on Windows too
mgorny Nov 11, 2024
b84733a
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.3, and co…
mgorny Nov 11, 2024
f7a1d0e
Use onednn from my channel
mgorny Nov 13, 2024
52f1554
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.3, and co…
mgorny Nov 13, 2024
114dd73
Allow linux to timeout
hmaarrfk Nov 13, 2024
6b938b4
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.3, and co…
Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions ...c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib_version:
cdt_name:
- cos7
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down Expand Up @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...lib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib_version:
cdt_name:
- cos7
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down Expand Up @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...lib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib_version:
cdt_name:
- cos7
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down Expand Up @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib_version:
cdt_name:
- cos7
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down Expand Up @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib_version:
cdt_name:
- cos7
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down Expand Up @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...lib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib_version:
cdt_name:
- cos7
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down Expand Up @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...lib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib_version:
cdt_name:
- cos7
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down Expand Up @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib_version:
cdt_name:
- cos7
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down Expand Up @@ -68,7 +68,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...lib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down Expand Up @@ -72,7 +72,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...lib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down Expand Up @@ -72,7 +72,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
3 changes: 1 addition & 2 deletions ...c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down Expand Up @@ -72,7 +72,6 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
- docker_image
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '10.15'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '10.15'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '10.15'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '10.15'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implgenericnumpy2python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '10.15'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '10.15'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '10.15'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '10.15'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '10.15'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_blas_implmklnumpy2python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '10.15'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2python3.13.____cp313.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib:
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
azure:
free_disk_space: true
settings_linux:
timeoutInMinutes: 1
# settings_linux:
# timeoutInMinutes: 1
build_platform:
linux_aarch64: linux_64
osx_arm64: osx_64
Expand Down
1 change: 1 addition & 0 deletions recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ set "CMAKE_GENERATOR_PLATFORM="
set "CMAKE_PREFIX_PATH=%LIBRARY_PREFIX%"
set "libuv_ROOT=%LIBRARY_PREFIX%"
set "USE_SYSTEM_SLEEF=OFF"
set "USE_SYSTEM_MKLDNN=ON"
set "BUILD_CUSTOM_PROTOBUF=OFF"

%PYTHON% -m pip install . --no-deps -vv
Expand Down
1 change: 1 addition & 0 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export INSTALL_TEST=0
export BUILD_TEST=0

export USE_SYSTEM_SLEEF=1
export USE_SYSTEM_MKLDNN=1
# use our protobuf
export BUILD_CUSTOM_PROTOBUF=OFF
rm -rf $PREFIX/bin/protoc
Expand Down
3 changes: 3 additions & 0 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,6 @@ github_actions_labels: # [linux]
megabuild:
- true # [linux]
- false # [osx]

channel_sources:
- https://mgorny.github.io/conda-channel/mgorny,conda-forge
Loading
Loading