Skip to content

Commit a24fbdf

Browse files
author
codethinki
committed
cant do nothing but trying :D
1 parent c3a2806 commit a24fbdf

4 files changed

Lines changed: 31 additions & 15 deletions

File tree

.github/actions/install_core_deps/action.yml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,31 @@ runs:
1616
steps:
1717
# ]----- Backend dependencies
1818
# ArrayFire
19+
- name: Cache ArrayFire (Windows)
20+
id: cache-arrayfire-windows
21+
uses: actions/cache@v4
22+
if: runner.os == 'Windows' && inputs.backend == 'ArrayFire'
23+
with:
24+
path: C:\tools\ArrayFire
25+
key: arrayfire-windows-3.10.0
26+
27+
- name: "Install ArrayFire (Windows)"
28+
if: runner.os == 'Windows' && inputs.backend == 'ArrayFire' && steps.cache-arrayfire-windows.outputs.cache-hit != 'true'
29+
run: |
30+
choco install --no-progress wget -y
31+
cd $HOME
32+
wget --quiet https://arrayfire.gateway.scarf.sh/windows/3.10.0/ArrayFire.exe -O ArrayFire.exe
33+
7z.exe x ArrayFire.exe -o"C:\tools\ArrayFire" -y
34+
rm ArrayFire.exe
35+
shell: bash -el {0}
36+
37+
- name: Set ArrayFire Env (Windows)
38+
if: runner.os == 'Windows' && inputs.backend == 'ArrayFire'
39+
run: |
40+
echo "ArrayFire_DIR=C:\tools\ArrayFire" >> $GITHUB_ENV
41+
echo "C:\tools\ArrayFire\lib" >> $GITHUB_PATH
42+
shell: bash -el {0}
43+
1944
- name: "Install ArrayFire (Linux)"
2045
run: |
2146
sudo apt update
@@ -29,11 +54,6 @@ runs:
2954
run: brew install arrayfire
3055
if: runner.os == 'macOS' && inputs.backend == 'ArrayFire'
3156
shell: bash -el {0}
32-
- name: "Install ArrayFire (Windows)"
33-
run: |
34-
winget install --id ArrayFire.ArrayFire -e --accept-package-agreements --accept-source-agreements
35-
if: runner.os == 'Windows' && inputs.backend == 'ArrayFire'
36-
shell: pwsh
3757
# oneDNN
3858
- name: Install oneDNN with micromamba
3959
uses: mamba-org/setup-micromamba@v1

.github/workflows/ci.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,20 +117,17 @@ jobs:
117117
- name: Configure
118118
shell: pwsh
119119
run: |
120-
cmake --preset base `
121-
-DCMAKE_CXX_COMPILER=cl `
122-
-DCMAKE_C_COMPILER=cl `
120+
cmake --preset msvc_af_cpu `
123121
-DCMAKE_BUILD_TYPE=Release `
124122
-DFL_BUILD_TESTS=ON `
125-
-DFL_BUILD_STANDALONE=ON `
126-
-DFL_USE_ARRAYFIRE=ON
123+
-DFL_BUILD_STANDALONE=ON
127124
128125
- name: Build
129126
shell: pwsh
130127
run: |
131-
cmake --build --preset base
128+
cmake --build --preset msvc_af_cpu
132129
133130
- name: Test
134131
shell: pwsh
135132
run: |
136-
ctest --preset base --output-on-failure
133+
ctest --preset msvc_af_cpu --output-on-failure

CMakePresets.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@
104104
"name": "af-backend-base",
105105
"hidden": true,
106106
"cacheVariables": {
107-
"FL_BUILD_ARRAYFIRE": true,
108107
"FL_USE_ARRAYFIRE": true
109108
}
110109
},

ci/docker/linux/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ RUN pacman -Syu --noconfirm && \
2020
ENV VCPKG_ROOT=/opt/vcpkg
2121

2222
# Install ArrayFire from script
23-
RUN wget https://arrayfire.s3.amazonaws.com/3.10.0/ArrayFire-v3.10.0_Linux_x86_64.sh -O af_installer.sh && \
23+
RUN wget -q --show-progress https://arrayfire.s3.amazonaws.com/3.10.0/ArrayFire-v3.10.0_Linux_x86_64.sh -O af_installer.sh && \
2424
chmod +x af_installer.sh && \
25-
./af_installer.sh --include-subdir --prefix=/opt --skip-license && \
25+
./af_installer.sh --include-subdir --prefix=/opt --skip-license --yes && \
2626
rm af_installer.sh
2727
ENV ArrayFire_DIR=/opt/arrayfire
2828
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/arrayfire/lib64

0 commit comments

Comments
 (0)