FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Separate Windows ci(gh-action) workflow and some improvs · arrayfire/arrayfire@58573ed · GitHub

Commit 58573ed

Browse files
committed
Separate Windows ci(gh-action) workflow and some improvs
Splitting the windows ci job into a separate workflow enables the ci to re-run windows specific jobs independent of unix jobs. Updated Ninja dependency to 1.10.2 fix release in all ci(gh-actions) Refactored boost dependency to be installed via packages managers as GitHub Actions is removing pre-installed versions from March 8, 2021 Update VCPKG hash to newer version to enable fast and better ports.
1 parent f6ed89c commit 58573ed

2 files changed

Lines changed: 73 additions & 63 deletions

File tree

Lines changed: 4 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: CPU
1414
runs-on: ${{ matrix.os }}
1515
env:
16-
NINJA_VER: 1.10.0
16+
NINJA_VER: 1.10.2
1717
CMAKE_VER: 3.5.1
1818
strategy:
1919
fail-fast: false
@@ -66,8 +66,10 @@ jobs:
6666
- name: Install Common Dependencies for Ubuntu
6767
if: matrix.os == 'ubuntu-16.04' || matrix.os == 'ubuntu-18.04'
6868
run: |
69+
sudo add-apt-repository ppa:mhier/libboost-latest
6970
sudo apt-get -qq update
70-
sudo apt-get install -y libfreeimage-dev \
71+
sudo apt-get install -y libboost1.74-dev \
72+
libfreeimage-dev \
7173
libglfw3-dev \
7274
libfftw3-dev \
7375
liblapacke-dev
@@ -103,7 +105,6 @@ jobs:
103105
mkdir build && cd build
104106
${CMAKE_PROGRAM} -G Ninja \
105107
-DCMAKE_MAKE_PROGRAM:FILEPATH=${GITHUB_WORKSPACE}/ninja \
106-
-DBOOST_ROOT:PATH=${BOOST_ROOT_1_72_0} \
107108
-DAF_BUILD_CUDA:BOOL=OFF -DAF_BUILD_OPENCL:BOOL=OFF \
108109
-DAF_BUILD_UNIFIED:BOOL=OFF -DAF_BUILD_EXAMPLES:BOOL=ON \
109110
-DAF_BUILD_FORGE:BOOL=ON \
@@ -116,63 +117,3 @@ jobs:
116117
run: |
117118
cd ${GITHUB_WORKSPACE}/build
118119
ctest -D Experimental --track ${CTEST_DASHBOARD} -T Test -T Submit -R cpu -j2
119-
120-
window_build_cpu:
121-
name: CPU (OpenBLAS, windows-latest)
122-
runs-on: windows-latest
123-
env:
124-
VCPKG_HASH: b79f7675aaa82eb6c5a96ae764fb1ce379a9d5d6 # March 29, 2020 - [hdf5] add tools and fortran feature
125-
NINJA_VER: 1.10.0
126-
steps:
127-
- name: Checkout Repository
128-
uses: actions/checkout@master
129-
130-
- name: VCPKG Cache
131-
uses: actions/cache@v1
132-
id: vcpkg-cache
133-
with:
134-
path: vcpkg
135-
key: vcpkg-deps-${{ env.VCPKG_HASH }}
136-
137-
- name: Install VCPKG Common Deps
138-
if: steps.vcpkg-cache.outputs.cache-hit != 'true'
139-
run: |
140-
git clone --recursive https://github.com/microsoft/vcpkg
141-
Set-Location -Path .\vcpkg
142-
git reset --hard $env:VCPKG_HASH
143-
.\bootstrap-vcpkg.bat
144-
.\vcpkg.exe install --triplet x64-windows fftw3 freeimage freetype glfw3 openblas
145-
Remove-Item .\downloads,.\buildtrees,.\packages -Recurse -Force
146-
147-
- name: Download Ninja
148-
run: |
149-
Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/download/v$env:NINJA_VER/ninja-win.zip" -OutFile ninja.zip
150-
Expand-Archive -Path ninja.zip -DestinationPath .
151-
152-
- name: CMake Configure
153-
run: |
154-
$cwd = (Get-Item -Path ".\").FullName
155-
$ref = $env:GITHUB_REF | %{ if ($_ -match "refs/pull/[0-9]+/merge") { $_;} }
156-
$prnum = $ref | %{$_.Split("/")[2]}
157-
$branch = git branch --show-current
158-
$buildname = if($prnum -eq $null) { $branch } else { "PR-$prnum" }
159-
$dashboard = if($prnum -eq $null) { "Continuous" } else { "Experimental" }
160-
$buildname = "$buildname-cpu-openblas"
161-
mkdir build && cd build
162-
cmake .. -G "Visual Studio 16 2019" -A x64 `
163-
-DCMAKE_TOOLCHAIN_FILE:FILEPATH="$env:GITHUB_WORKSPACE\vcpkg\scripts\buildsystems\vcpkg.cmake" `
164-
-DFFTW_INCLUDE_DIR:PATH="$env:GITHUB_WORKSPACE\vcpkg\installed/x64-windows\include" `
165-
-DFFTW_LIBRARY:FILEPATH="$env:GITHUB_WORKSPACE\vcpkg\installed\x64-windows\lib\fftw3.lib" `
166-
-DFFTWF_LIBRARY:FILEPATH="$env:GITHUB_WORKSPACE\vcpkg\installed\x64-windows\lib\fftw3f.lib" `
167-
-DBOOST_ROOT:PATH="$env:BOOST_ROOT_1_72_0" `
168-
-DAF_BUILD_CUDA:BOOL=OFF -DAF_BUILD_OPENCL:BOOL=OFF `
169-
-DAF_BUILD_UNIFIED:BOOL=OFF -DAF_BUILD_FORGE:BOOL=ON `
170-
-DBUILDNAME:STRING="$buildname"
171-
echo "CTEST_DASHBOARD=${dashboard}" >> $GITHUB_ENV
172-
173-
- name: Build and Test
174-
run: |
175-
$cwd = (Get-Item -Path ".\").FullName
176-
$Env:PATH += ";$cwd/vcpkg/installed/x64-windows/bin"
177-
Set-Location -Path $cwd/build
178-
ctest -D Experimental --track ${CTEST_DASHBOARD} -T Test -T Submit -C Release -R cpu -E pinverse -j2
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
on:
2+
push:
3+
branches:
4+
- master
5+
pull_request:
6+
branches:
7+
- master
8+
9+
name: ci
10+
11+
jobs:
12+
window_build_cpu:
13+
name: CPU (OpenBLAS, windows-latest)
14+
runs-on: windows-latest
15+
env:
16+
VCPKG_HASH: 0cbc579e1ee21fa4ad0974a9ed926f60c6ed1a4a # FEB 25, 2021 - [rsasynccpp] Add new port (Rstein.AsyncCpp) (#16380)
17+
NINJA_VER: 1.10.2
18+
steps:
19+
- name: Checkout Repository
20+
uses: actions/checkout@master
21+
22+
- name: VCPKG Cache
23+
uses: actions/cache@v1
24+
id: vcpkg-cache
25+
with:
26+
path: vcpkg
27+
key: vcpkg-deps-${{ env.VCPKG_HASH }}
28+
29+
- name: Install VCPKG Common Deps
30+
if: steps.vcpkg-cache.outputs.cache-hit != 'true'
31+
run: |
32+
git clone --recursive https://github.com/microsoft/vcpkg
33+
Set-Location -Path .\vcpkg
34+
git reset --hard $env:VCPKG_HASH
35+
.\bootstrap-vcpkg.bat
36+
.\vcpkg.exe install --triplet x64-windows boost fftw3 freeimage freetype glfw3 openblas
37+
Remove-Item .\downloads,.\buildtrees,.\packages -Recurse -Force
38+
39+
- name: Download Ninja
40+
run: |
41+
Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/download/v$env:NINJA_VER/ninja-win.zip" -OutFile ninja.zip
42+
Expand-Archive -Path ninja.zip -DestinationPath .
43+
44+
- name: CMake Configure
45+
run: |
46+
$cwd = (Get-Item -Path ".\").FullName
47+
$ref = $env:GITHUB_REF | %{ if ($_ -match "refs/pull/[0-9]+/merge") { $_;} }
48+
$prnum = $ref | %{$_.Split("/")[2]}
49+
$branch = git branch --show-current
50+
$buildname = if($prnum -eq $null) { $branch } else { "PR-$prnum" }
51+
$dashboard = if($prnum -eq $null) { "Continuous" } else { "Experimental" }
52+
$buildname = "$buildname-cpu-openblas"
53+
mkdir build && cd build
54+
cmake .. -G "Visual Studio 16 2019" -A x64 `
55+
-DCMAKE_TOOLCHAIN_FILE:FILEPATH="$env:GITHUB_WORKSPACE\vcpkg\scripts\buildsystems\vcpkg.cmake" `
56+
-DFFTW_INCLUDE_DIR:PATH="$env:GITHUB_WORKSPACE\vcpkg\installed/x64-windows\include" `
57+
-DFFTW_LIBRARY:FILEPATH="$env:GITHUB_WORKSPACE\vcpkg\installed\x64-windows\lib\fftw3.lib" `
58+
-DFFTWF_LIBRARY:FILEPATH="$env:GITHUB_WORKSPACE\vcpkg\installed\x64-windows\lib\fftw3f.lib" `
59+
-DAF_BUILD_CUDA:BOOL=OFF -DAF_BUILD_OPENCL:BOOL=OFF `
60+
-DAF_BUILD_UNIFIED:BOOL=OFF -DAF_BUILD_FORGE:BOOL=ON `
61+
-DBUILDNAME:STRING="$buildname"
62+
echo "CTEST_DASHBOARD=${dashboard}" >> $env:GITHUB_ENV
63+
64+
- name: Build and Test
65+
run: |
66+
$cwd = (Get-Item -Path ".\").FullName
67+
$Env:PATH += ";$cwd/vcpkg/installed/x64-windows/bin"
68+
Set-Location -Path $cwd/build
69+
ctest -D Experimental --track ${CTEST_DASHBOARD} -T Test -T Submit -C Release -R cpu -E pinverse -j2

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL