Skip to content
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

Jump to bottom

[clfft] fix arm build #27093

Merged
merged 1 commit into from
Oct 5, 2022
Merged

[clfft] fix arm build #27093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 25 additions & 0 deletions ports/clfft/fix-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff --git a/src/library/generator.transpose.cpp b/src/library/generator.transpose.cpp
index a04a43a..5c15882 100644
--- a/src/library/generator.transpose.cpp
+++ b/src/library/generator.transpose.cpp
@@ -1089,8 +1089,18 @@ clfftStatus genSwapKernelGeneral(const FFTGeneratedTransposeNonSquareAction::Sig

//std::string funcName = "swap_nonsquare_" + std::to_string(smaller_dim) + "_" + std::to_string(dim_ratio);
std::string funcName = "swap_nonsquare_";
- std::string smaller_dim_str = static_cast<std::ostringstream*>(&(std::ostringstream() << smaller_dim))->str();
- std::string dim_ratio_str = static_cast<std::ostringstream*>(&(std::ostringstream() << dim_ratio))->str();
+ std::string smaller_dim_str;
+ {
+ std::ostringstream oss;
+ oss << smaller_dim;
+ smaller_dim_str = oss.str();
+ }
+ std::string dim_ratio_str;
+ {
+ std::ostringstream oss;
+ oss << dim_ratio;
+ dim_ratio_str = oss.str();
+ }
if(params.fft_N[0] > params.fft_N[1])
funcName = funcName + smaller_dim_str + "_" + dim_ratio_str;
else
1 change: 1 addition & 0 deletions ports/clfft/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
tweak-install.patch
fix-build.patch
)

vcpkg_cmake_configure(
Expand Down
2 changes: 1 addition & 1 deletion ports/clfft/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "clfft",
"version": "2.12.2",
"port-version": 5,
"port-version": 6,
"description": "clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library.",
"homepage": "https://github.com/clMathLibraries/clFFT",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1450,7 +1450,7 @@
},
"clfft": {
"baseline": "2.12.2",
"port-version": 5
"port-version": 6
},
"cli": {
"baseline": "2.0.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/clfft.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4acb8a5a455beee82cacccf5b72e6c6aa8d8c6a7",
"version": "2.12.2",
"port-version": 6
},
{
"git-tree": "b935ce5f9e186f9be8fe85d6d228043bede4cd04",
"version": "2.12.2",
Expand Down