From c6ec8744a1dd7c9a427e0317f90bfc6a25d4f922 Mon Sep 17 00:00:00 2001 From: Theodore Chang Date: Sat, 14 Oct 2023 16:27:28 +0200 Subject: [PATCH] Add mkl on win --- .github/workflows/master-all.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master-all.yml b/.github/workflows/master-all.yml index ca7d127bc..cb5fd63cd 100644 --- a/.github/workflows/master-all.yml +++ b/.github/workflows/master-all.yml @@ -139,8 +139,9 @@ jobs: timeout-minutes: 100 strategy: matrix: - vtk: [ ON, OFF ] avx: [ ON, OFF ] + vtk: [ ON, OFF ] + mkl: [ ON, OFF ] steps: - name: Clone uses: actions/checkout@v4 @@ -157,17 +158,29 @@ jobs: run: | C:/msys64/usr/bin/wget.exe -q https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-win.7z 7z x VTK-9.2.6-win.7z + - name: MKL + if: matrix.mkl == 'ON' + run: | + C:/msys64/usr/bin/wget.exe -q https://registrationcenter-download.intel.com/akdlm/IRC_NAS/2b9cdf66-5291-418e-a7e8-f90515cc9098/w_onemkl_p_2023.2.0.49500_offline.exe + C:/msys64/usr/bin/wget.exe -q https://registrationcenter-download.intel.com/akdlm/IRC_NAS/1720594b-b12c-4aca-b7fb-a7d317bac5cb/w_fortran-compiler_p_2023.2.1.7_offline.exe + ./w_onemkl_p_2023.2.0.49500_offline.exe -s -a --silent --eula accept + ./w_fortran-compiler_p_2023.2.1.7_offline.exe -s -a --silent --eula accept - name: Compile run: | go build Checker/updater.go mkdir build && cd build - cmake -DCMAKE_BUILD_TYPE=Release -DUSE_AVX=${{ matrix.avx }} -DBUILD_MULTITHREAD=ON -DUSE_EXTERNAL_VTK=${{ matrix.vtk }} -DVTK_DIR=D:/a/suanPan/suanPan/lib/cmake/vtk-9.2/ -DCMAKE_INSTALL_PREFIX=dist .. + cmake -DCMAKE_BUILD_TYPE=Release -DUSE_AVX=${{ matrix.avx }} -DBUILD_MULTITHREAD=ON -DUSE_EXTERNAL_VTK=${{ matrix.vtk }} -DVTK_DIR=D:/a/suanPan/suanPan/lib/cmake/vtk-9.2/ -DUSE_MKL=${{ matrix.mkl }} -DMKLROOT="C:/Program Files (x86)/Intel/oneAPI/mkl/latest" -DLINK_DYNAMIC_MKL=OFF -DUSE_INTEL_OPENMP=OFF -DCMAKE_INSTALL_PREFIX=dist .. cmake --build . --target install --config Release -j 4 - name: Pack shell: bash run: | cp updater.exe build/dist/bin - file_name="suanPan-win-openblas" + file_name="suanPan-win" + if [ "${{ matrix.mkl }}" == "ON" ]; then + file_name+="-mkl" + else + file_name+="-openblas" + fi if [ "${{ matrix.vtk }}" == "ON" ]; then file_name+="-vtk" fi