Unverified Commit 5c35af26 authored by Andy Simmonett's avatar Andy Simmonett
Browse files

Update Azure VM to newer version

parent a752d258
...@@ -2,9 +2,9 @@ jobs: ...@@ -2,9 +2,9 @@ jobs:
# Configure, build, install, and test job # Configure, build, install, and test job
- job: 'windows_build' - job: 'windows_build'
displayName: 'Windows VS2015' displayName: 'Windows VS2017'
pool: pool:
vmImage: 'vs2015-win2012r2' vmImage: 'vs2017-win2016'
timeoutInMinutes: 360 timeoutInMinutes: 360
variables: variables:
llvm.version: '7.0.1' llvm.version: '7.0.1'
...@@ -54,7 +54,7 @@ jobs: ...@@ -54,7 +54,7 @@ jobs:
# Download OpenCL Headers and build the ICD loader # Download OpenCL Headers and build the ICD loader
- script: | - script: |
setlocal EnableDelayedExpansion setlocal EnableDelayedExpansion
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
mkdir opencl mkdir opencl
cd opencl cd opencl
wget https://www.khronos.org/registry/cl/specs/opencl-icd-1.2.11.0.tgz -O opencl-icd-1.2.11.0.tgz wget https://www.khronos.org/registry/cl/specs/opencl-icd-1.2.11.0.tgz -O opencl-icd-1.2.11.0.tgz
...@@ -67,7 +67,9 @@ jobs: ...@@ -67,7 +67,9 @@ jobs:
move .\OpenCL-Headers-master\CL\*.h .\inc\CL\ move .\OpenCL-Headers-master\CL\*.h .\inc\CL\
mkdir lib > $null mkdir lib > $null
cd lib cd lib
cmake -G Ninja .. cmake -G Ninja .. ^
-DCMAKE_CXX_COMPILER=cl.exe ^
-DCMAKE_C_COMPILER=cl.exe
cmake --build . ^ cmake --build . ^
-- -j %NUMBER_OF_PROCESSORS% -- -j %NUMBER_OF_PROCESSORS%
displayName: "Download and install OpenCL" displayName: "Download and install OpenCL"
...@@ -75,12 +77,14 @@ jobs: ...@@ -75,12 +77,14 @@ jobs:
# Configure # Configure
- script: | - script: |
setlocal EnableDelayedExpansion setlocal EnableDelayedExpansion
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
mkdir build & cd build mkdir build & cd build
cmake -G Ninja ^ cmake -G Ninja ^
-DOPENCL_INCLUDE_DIR=$(Pipeline.Workspace)/opencl/inc ^ -DOPENCL_INCLUDE_DIR=$(Pipeline.Workspace)/opencl/inc ^
-DOPENCL_LIBRARY=$(Pipeline.Workspace)/opencl/lib/OpenCL.lib ^ -DOPENCL_LIBRARY=$(Pipeline.Workspace)/opencl/lib/OpenCL.lib ^
-DCMAKE_BUILD_TYPE=$(cmake.build.type) ^ -DCMAKE_BUILD_TYPE=$(cmake.build.type) ^
-DCMAKE_CXX_COMPILER=cl.exe ^
-DCMAKE_C_COMPILER=cl.exe ^
-DCMAKE_INSTALL_PREFIX=../install ^ -DCMAKE_INSTALL_PREFIX=../install ^
-DOPENMM_BUILD_EXAMPLES=OFF ^ -DOPENMM_BUILD_EXAMPLES=OFF ^
-DOPENMM_BUILD_OPENCL_TESTS=OFF ^ -DOPENMM_BUILD_OPENCL_TESTS=OFF ^
...@@ -89,7 +93,7 @@ jobs: ...@@ -89,7 +93,7 @@ jobs:
workingDirectory: $(Build.BinariesDirectory) workingDirectory: $(Build.BinariesDirectory)
# Build # Build
- script: | - script: |
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
cmake --build . ^ cmake --build . ^
--config $(cmake.build.type) ^ --config $(cmake.build.type) ^
-- -j %NUMBER_OF_PROCESSORS% -- -j %NUMBER_OF_PROCESSORS%
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment