Skip to content

Fix dot on MKL builds #399

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

Merged
merged 2 commits into from
Jul 11, 2025
Merged

Fix dot on MKL builds #399

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f1b8be
Fix dot on MKL builds
isuruf Jul 7, 2025
3ea6797
backport another PY_SSIZE_T_CLEAN patch
h-vetinari Jul 9, 2025
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
1 change: 1 addition & 0 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,7 @@ outputs:
# We have had issues with openmp .dylibs being doubly loaded in certain cases. These two tests catch the (observed) issue
- python -c "import torch; import numpy"
- python -c "import numpy; import torch"
- python -c "import numpy as np;import torch;x = torch.tensor([2], dtype=torch.complex128);assert torch.dot(x, x).real == 4.0"
# distributed support is enabled by default on linux; for mac, we enable it manually in build.sh
- python -c "import torch; assert torch.distributed.is_available()" # [linux or osx]
- python -c "import torch; assert torch.backends.cuda.is_built()" # [cuda_compiler_version != "None"]
Expand Down
21 changes: 16 additions & 5 deletions recipe/patches/0005-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 1572b5d176f17e2a4ebe7c859e8c2aa19607190a Mon Sep 17 00:00:00 2001
From c36fe22f0b7a8d95ba04b6c3c8358a70a552ff71 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Wed, 18 Dec 2024 03:59:00 +0000
Subject: [PATCH 05/16] Use BLAS_USE_CBLAS_DOT for OpenBLAS builds
Subject: [PATCH] Use BLAS_USE_CBLAS_DOT for OpenBLAS builds

There are two calling conventions for *dotu functions

Expand All @@ -27,11 +27,11 @@ assists with the BLAS switching mechanism as we are not relying on
a particular `cdotu` implementation with the cost of two additional
functional calls.
---
cmake/Dependencies.cmake | 1 +
1 file changed, 1 insertion(+)
cmake/Dependencies.cmake | 2 ++
1 file changed, 2 insertions(+)

diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index 4bc52c05d87..c356c7cdfe2 100644
index 5227204b041..d800e950540 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -182,6 +182,7 @@ elseif(BLAS STREQUAL "OpenBLAS")
Expand All @@ -42,3 +42,14 @@ index 4bc52c05d87..c356c7cdfe2 100644
elseif(BLAS STREQUAL "BLIS")
find_package(BLIS REQUIRED)
include_directories(SYSTEM ${BLIS_INCLUDE_DIR})
@@ -204,6 +205,7 @@ elseif(BLAS STREQUAL "MKL")
set(BLAS_INFO "mkl")
set(BLAS_FOUND 1)
set(BLAS_LIBRARIES ${MKL_LIBRARIES})
+ set(BLAS_USE_CBLAS_DOT TRUE)
else()
message(WARNING "MKL could not be found. Defaulting to Eigen")
set(CAFFE2_USE_EIGEN_FOR_BLAS ON)
--
2.47.1

Loading