Skip to content

Commit 076e0db

Browse files
committed
try to make ci work
1 parent 7373850 commit 076e0db

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.github/workflows/python_wheel.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,9 @@ jobs:
186186

187187
steps:
188188
- uses: actions/checkout@v4
189-
- uses: git-for-windows/setup-git-for-windows-sdk
190-
with:
191-
flavor: minimal
192189

193190
- name: Install GCC and make
194-
run: C:\msys64\usr\bin\bash.exe -lc "pacman -Sy --noconfirm make mingw-w64-x86_64-toolchain mingw-w64-x86_64-fftw"
191+
run: C:\msys64\usr\bin\bash.exe -lc "pacman -Sy --noconfirm make mingw-w64-x86_64-toolchain mingw-w64-x86_64-fftw git"
195192

196193
- name: Build and Test Python 3.8
197194
uses: actions/setup-python@v5

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ function(set_finufft_options target)
161161
target_include_directories(${target} PUBLIC ${FFTW_INCLUDE_DIR})
162162
endif ()
163163

164+
# XSIMD is a header only library, so we just need to include the headers
165+
target_include_directories(${target} PUBLIC ${XSIMD_INCLUDE_DIR})
164166
endfunction()
165167

166168
if (FINUFFT_USE_CPU)

cmake/setupXSIMD.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CPMAddPackage(
2-
NAME findxtl
2+
NAME xtl
33
GIT_REPOSITORY "https://github.com/xtensor-stack/xtl.git"
44
GIT_TAG ${XTL_VERSION}
55
EXCLUDE_FROM_ALL YES
@@ -8,7 +8,7 @@ CPMAddPackage(
88
)
99

1010
CPMAddPackage(
11-
NAME findxsimd
11+
NAME xsimd
1212
GIT_REPOSITORY "https://github.com/xtensor-stack/xsimd.git"
1313
GIT_TAG ${XSIMD_VERSION}
1414
EXCLUDE_FROM_ALL YES
@@ -17,3 +17,6 @@ CPMAddPackage(
1717
"XSIMD_SKIP_INSTALL YES"
1818
"XSIMD_ENABLE_XTL_COMPLEX YES"
1919
)
20+
21+
get_property(XSIMD_SOURCE_DIR TARGET xsimd PROPERTY SOURCE_DIR)
22+
set(XSIMD_INCLUDE_DIR ${XSIMD_SOURCE_DIR}/include)

0 commit comments

Comments
 (0)