Skip to content

Separate Windows ci(gh-action) workflow and some improvs #3097

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
9prady9 merged 2 commits into from
Mar 8, 2021
Merged

Separate Windows ci(gh-action) workflow and some improvs #3097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67706b1
Separate Windows ci(gh-action) workflow and some improvs
9prady9 Feb 26, 2021
04822dd
Mark couple of cmake variables as advanced that I missed earlier
9prady9 Feb 26, 2021
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
67 changes: 4 additions & 63 deletions .github/workflows/cpu_build.yml → .github/workflows/unix_cpu_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: CPU
runs-on: ${{ matrix.os }}
env:
NINJA_VER: 1.10.0
NINJA_VER: 1.10.2
CMAKE_VER: 3.5.1
strategy:
fail-fast: false
Expand Down Expand Up @@ -66,8 +66,10 @@ jobs:
- name: Install Common Dependencies for Ubuntu
if: matrix.os == 'ubuntu-16.04' || matrix.os == 'ubuntu-18.04'
run: |
sudo add-apt-repository ppa:mhier/libboost-latest
sudo apt-get -qq update
sudo apt-get install -y libfreeimage-dev \
sudo apt-get install -y libboost1.74-dev \
libfreeimage-dev \
libglfw3-dev \
libfftw3-dev \
liblapacke-dev
Expand Down Expand Up @@ -103,7 +105,6 @@ jobs:
mkdir build && cd build
${CMAKE_PROGRAM} -G Ninja \
-DCMAKE_MAKE_PROGRAM:FILEPATH=${GITHUB_WORKSPACE}/ninja \
-DBOOST_ROOT:PATH=${BOOST_ROOT_1_72_0} \
-DAF_BUILD_CUDA:BOOL=OFF -DAF_BUILD_OPENCL:BOOL=OFF \
-DAF_BUILD_UNIFIED:BOOL=OFF -DAF_BUILD_EXAMPLES:BOOL=ON \
-DAF_BUILD_FORGE:BOOL=ON \
Expand All @@ -116,63 +117,3 @@ jobs:
run: |
cd ${GITHUB_WORKSPACE}/build
ctest -D Experimental --track ${CTEST_DASHBOARD} -T Test -T Submit -R cpu -j2

window_build_cpu:
name: CPU (OpenBLAS, windows-latest)
runs-on: windows-latest
env:
VCPKG_HASH: b79f7675aaa82eb6c5a96ae764fb1ce379a9d5d6 # March 29, 2020 - [hdf5] add tools and fortran feature
NINJA_VER: 1.10.0
steps:
- name: Checkout Repository
uses: actions/checkout@master

- name: VCPKG Cache
uses: actions/cache@v1
id: vcpkg-cache
with:
path: vcpkg
key: vcpkg-deps-${{ env.VCPKG_HASH }}

- name: Install VCPKG Common Deps
if: steps.vcpkg-cache.outputs.cache-hit != 'true'
run: |
git clone --recursive https://github.com/microsoft/vcpkg
Set-Location -Path .\vcpkg
git reset --hard $env:VCPKG_HASH
.\bootstrap-vcpkg.bat
.\vcpkg.exe install --triplet x64-windows fftw3 freeimage freetype glfw3 openblas
Remove-Item .\downloads,.\buildtrees,.\packages -Recurse -Force

- name: Download Ninja
run: |
Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/download/v$env:NINJA_VER/ninja-win.zip" -OutFile ninja.zip
Expand-Archive -Path ninja.zip -DestinationPath .

- name: CMake Configure
run: |
$cwd = (Get-Item -Path ".\").FullName
$ref = $env:GITHUB_REF | %{ if ($_ -match "refs/pull/[0-9]+/merge") { $_;} }
$prnum = $ref | %{$_.Split("/")[2]}
$branch = git branch --show-current
$buildname = if($prnum -eq $null) { $branch } else { "PR-$prnum" }
$dashboard = if($prnum -eq $null) { "Continuous" } else { "Experimental" }
$buildname = "$buildname-cpu-openblas"
mkdir build && cd build
cmake .. -G "Visual Studio 16 2019" -A x64 `
-DCMAKE_TOOLCHAIN_FILE:FILEPATH="$env:GITHUB_WORKSPACE\vcpkg\scripts\buildsystems\vcpkg.cmake" `
-DFFTW_INCLUDE_DIR:PATH="$env:GITHUB_WORKSPACE\vcpkg\installed/x64-windows\include" `
-DFFTW_LIBRARY:FILEPATH="$env:GITHUB_WORKSPACE\vcpkg\installed\x64-windows\lib\fftw3.lib" `
-DFFTWF_LIBRARY:FILEPATH="$env:GITHUB_WORKSPACE\vcpkg\installed\x64-windows\lib\fftw3f.lib" `
-DBOOST_ROOT:PATH="$env:BOOST_ROOT_1_72_0" `
-DAF_BUILD_CUDA:BOOL=OFF -DAF_BUILD_OPENCL:BOOL=OFF `
-DAF_BUILD_UNIFIED:BOOL=OFF -DAF_BUILD_FORGE:BOOL=ON `
-DBUILDNAME:STRING="$buildname"
echo "CTEST_DASHBOARD=${dashboard}" >> $GITHUB_ENV

- name: Build and Test
run: |
$cwd = (Get-Item -Path ".\").FullName
$Env:PATH += ";$cwd/vcpkg/installed/x64-windows/bin"
Set-Location -Path $cwd/build
ctest -D Experimental --track ${CTEST_DASHBOARD} -T Test -T Submit -C Release -R cpu -E pinverse -j2
69 changes: 69 additions & 0 deletions .github/workflows/win_cpu_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
on:
push:
branches:
- master
pull_request:
branches:
- master

name: ci

jobs:
window_build_cpu:
name: CPU (OpenBLAS, windows-latest)
runs-on: windows-latest
env:
VCPKG_HASH: 0cbc579e1ee21fa4ad0974a9ed926f60c6ed1a4a # FEB 25, 2021 - [rsasynccpp] Add new port (Rstein.AsyncCpp) (#16380)
NINJA_VER: 1.10.2
steps:
- name: Checkout Repository
uses: actions/checkout@master

- name: VCPKG Cache
uses: actions/cache@v1
id: vcpkg-cache
with:
path: vcpkg
key: vcpkg-deps-${{ env.VCPKG_HASH }}

- name: Install VCPKG Common Deps
if: steps.vcpkg-cache.outputs.cache-hit != 'true'
run: |
git clone --recursive https://github.com/microsoft/vcpkg
Set-Location -Path .\vcpkg
git reset --hard $env:VCPKG_HASH
.\bootstrap-vcpkg.bat
.\vcpkg.exe install --triplet x64-windows boost fftw3 freeimage freetype glfw3 openblas
Remove-Item .\downloads,.\buildtrees,.\packages -Recurse -Force

- name: Download Ninja
run: |
Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/download/v$env:NINJA_VER/ninja-win.zip" -OutFile ninja.zip
Expand-Archive -Path ninja.zip -DestinationPath .

- name: CMake Configure
run: |
$cwd = (Get-Item -Path ".\").FullName
$ref = $env:GITHUB_REF | %{ if ($_ -match "refs/pull/[0-9]+/merge") { $_;} }
$prnum = $ref | %{$_.Split("/")[2]}
$branch = git branch --show-current
$buildname = if($prnum -eq $null) { $branch } else { "PR-$prnum" }
$dashboard = if($prnum -eq $null) { "Continuous" } else { "Experimental" }
$buildname = "$buildname-cpu-openblas"
mkdir build && cd build
cmake .. -G "Visual Studio 16 2019" -A x64 `
-DCMAKE_TOOLCHAIN_FILE:FILEPATH="$env:GITHUB_WORKSPACE\vcpkg\scripts\buildsystems\vcpkg.cmake" `
-DFFTW_INCLUDE_DIR:PATH="$env:GITHUB_WORKSPACE\vcpkg\installed/x64-windows\include" `
-DFFTW_LIBRARY:FILEPATH="$env:GITHUB_WORKSPACE\vcpkg\installed\x64-windows\lib\fftw3.lib" `
-DFFTWF_LIBRARY:FILEPATH="$env:GITHUB_WORKSPACE\vcpkg\installed\x64-windows\lib\fftw3f.lib" `
-DAF_BUILD_CUDA:BOOL=OFF -DAF_BUILD_OPENCL:BOOL=OFF `
-DAF_BUILD_UNIFIED:BOOL=OFF -DAF_BUILD_FORGE:BOOL=ON `
-DBUILDNAME:STRING="$buildname"
echo "CTEST_DASHBOARD=${dashboard}" >> $env:GITHUB_ENV

- name: Build and Test
run: |
$cwd = (Get-Item -Path ".\").FullName
$Env:PATH += ";$cwd/vcpkg/installed/x64-windows/bin"
Set-Location -Path $cwd/build
ctest -D Experimental --track ${CTEST_DASHBOARD} -T Test -T Submit -C Release -R cpu -E pinverse -j2
2 changes: 2 additions & 0 deletions CMakeModules/AFconfigure_forge_dep.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ if(AF_BUILD_FORGE)
FG_USE_WINDOW_TOOLKIT
FG_USE_SYSTEM_CL2HPP
FG_ENABLE_HUNTER
FG_RENDERING_BACKEND
SPHINX_EXECUTABLE
glfw3_DIR
glm_DIR
)
Expand Down
1 change: 1 addition & 0 deletions CMakeModules/FindcuDNN.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ if(cuDNN_INCLUDE_DIRS)
${CMAKE_INSTALL_PREFIX}
PATH_SUFFIXES lib lib64 bin lib/x64 bin/x64
DOC "cudnn${cudnn_lib_name_infix} Windows DLL." )
mark_as_advanced(cuDNN${LIB_INFIX}_DLL_LIBRARY)
endif()
endmacro()

Expand Down