From 79edd08360ba105ec21c1024c1d7309b09a52162 Mon Sep 17 00:00:00 2001 From: Arseniy Obolenskiy Date: Sat, 7 Mar 2020 11:54:41 +0300 Subject: [PATCH 1/4] Fix Visual Studio build on CI --- .github/workflows/main.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7154bcf68..d8efb6ded 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -89,13 +89,6 @@ jobs: source scripts/run.sh windows-msvc-build: runs-on: windows-latest - strategy: - fail-fast: false - matrix: - cmake_generator: - - Visual Studio 14 2015 - - Visual Studio 15 2017 - - Visual Studio 16 2019 steps: - uses: actions/checkout@v1 - name: Download dependencies @@ -116,15 +109,13 @@ jobs: run: git submodule update --init --recursive - name: Build run: | + set MPI_HOME="C:/Program^ Files^ (x86)/Microsoft^ SDKs/MPI" mkdir build cd build - cmake -G "%CMAKE_GENERATOR%" -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STD=ON -D USE_LATEX=ON -D MPI_C_INCLUDE_PATH:PATH="%MPI_HOME%/Include" -D MPI_C_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" -D MPI_CXX_INCLUDE_PATH:PATH="%MPI_HOME%/Include" -D MPI_CXX_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" .. -A Win32 + cmake -G "Visual Studio 16 2019" -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STD=ON -D USE_LATEX=ON -D MPI_C_INCLUDE_PATH:PATH="%MPI_HOME%/Include" -D MPI_C_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" -D MPI_CXX_INCLUDE_PATH:PATH="%MPI_HOME%/Include" -D MPI_CXX_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" .. -A Win32 cmake --build . cd .. - set OMP_NUM_THREADS=4 - scripts/run.bat - env: - CMAKE_GENERATOR: ${{ matrix.cmake_generator }} + shell: cmd - name: Run tests run: | set OMP_NUM_THREADS=4 From 1037b70425e5f865bf94ebfd1767e9416173631e Mon Sep 17 00:00:00 2001 From: Arseniy Obolenskiy Date: Sat, 7 Mar 2020 12:45:38 +0300 Subject: [PATCH 2/4] Update main.yml --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d8efb6ded..77b295106 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -109,12 +109,13 @@ jobs: run: git submodule update --init --recursive - name: Build run: | - set MPI_HOME="C:/Program^ Files^ (x86)/Microsoft^ SDKs/MPI" mkdir build cd build cmake -G "Visual Studio 16 2019" -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STD=ON -D USE_LATEX=ON -D MPI_C_INCLUDE_PATH:PATH="%MPI_HOME%/Include" -D MPI_C_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" -D MPI_CXX_INCLUDE_PATH:PATH="%MPI_HOME%/Include" -D MPI_CXX_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" .. -A Win32 cmake --build . cd .. + env: + MPI_HOME: C:/Program Files (x86)/Microsoft SDKs/MPI shell: cmd - name: Run tests run: | From 1288069c14f52b0260eb651cde6bdba40f240df5 Mon Sep 17 00:00:00 2001 From: Arseniy Obolenskiy Date: Sat, 7 Mar 2020 12:50:03 +0300 Subject: [PATCH 3/4] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 77b295106..bb7ce17c9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -111,7 +111,7 @@ jobs: run: | mkdir build cd build - cmake -G "Visual Studio 16 2019" -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STD=ON -D USE_LATEX=ON -D MPI_C_INCLUDE_PATH:PATH="%MPI_HOME%/Include" -D MPI_C_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" -D MPI_CXX_INCLUDE_PATH:PATH="%MPI_HOME%/Include" -D MPI_CXX_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" .. -A Win32 + cmake -G "Visual Studio 16 2019" -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STD=ON -D MPI_C_INCLUDE_PATH:PATH="%MPI_HOME%/Include" -D MPI_C_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" -D MPI_CXX_INCLUDE_PATH:PATH="%MPI_HOME%/Include" -D MPI_CXX_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" .. -A Win32 cmake --build . cd .. env: From 6d2bc55eccfd999971ae449fec16215eebf3c63c Mon Sep 17 00:00:00 2001 From: Arseniy Obolenskiy Date: Sat, 7 Mar 2020 16:51:00 +0300 Subject: [PATCH 4/4] Fix return codes --- .github/workflows/main.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb7ce17c9..b020ea23d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -95,25 +95,18 @@ jobs: run: | Invoke-WebRequest https://github.com/Microsoft/Microsoft-MPI/releases/download/v10.0/msmpisetup.exe -OutFile msmpisetup.exe Invoke-WebRequest https://github.com/Microsoft/Microsoft-MPI/releases/download/v10.0/msmpisdk.msi -OutFile msmpisdk.msi - shell: pwsh - - name: Setup environment + - name: Install MPI run: | MSMpiSetup.exe -unattend - set PATH=C:\Program Files\Microsoft MPI\Bin;%PATH% msmpisdk.msi /passive - powershell -file "scripts\appveyor_install_miktex-latest-minimal.ps1" - refreshenv - pdflatex -version shell: cmd - name: Update submodules run: git submodule update --init --recursive - name: Build run: | + set PATH=C:\Program Files\Microsoft MPI\Bin;%PATH% mkdir build - cd build - cmake -G "Visual Studio 16 2019" -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STD=ON -D MPI_C_INCLUDE_PATH:PATH="%MPI_HOME%/Include" -D MPI_C_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" -D MPI_CXX_INCLUDE_PATH:PATH="%MPI_HOME%/Include" -D MPI_CXX_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" .. -A Win32 - cmake --build . - cd .. + cd build && cmake -G "Visual Studio 16 2019" -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STD=ON -D MPI_C_INCLUDE_PATH:PATH="%MPI_HOME%/Include" -D MPI_C_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" -D MPI_CXX_INCLUDE_PATH:PATH="%MPI_HOME%/Include" -D MPI_CXX_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" .. -A Win32 && cmake --build . env: MPI_HOME: C:/Program Files (x86)/Microsoft SDKs/MPI shell: cmd