Merge remote-tracking branch 'upstream/master' into fetch_datasets

1 files changed, 60 insertions, 15 deletions

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 25f61ce7..05c88289 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,26 +1,26 @@
 jobs:
   
-  - job: 'Test'
-    displayName: "Build and test"
+  - job: 'OSx'
+    displayName: "Build and test OSx"
     timeoutInMinutes: 0
     cancelTimeoutInMinutes: 60
     pool:
       vmImage: macOS-10.15
     variables:
-      pythonVersion: '3.6'
+      pythonVersion: '3.7'
       cmakeBuildType: Release
 
     steps:
-    - bash: echo "##vso[task.prependpath]$CONDA/bin"
-      displayName: Add conda to PATH
-  
-    - bash: sudo conda create --yes --quiet --name gudhi_build_env
-      displayName: Create Anaconda environment
-  
+    # Use a specific Python version
+    - task: UsePythonVersion@0
+      displayName: Use Python $(pythonVersion)
+      inputs:
+        versionSpec: $(pythonVersion)
+        addToPath: true
+        architecture: 'x64'
+
     - bash: |
-        source activate gudhi_build_env
         git submodule update --init
-        sudo conda install --yes --quiet --name gudhi_build_env python=$(pythonVersion)
         python -m pip install --user -r ext/gudhi-deploy/build-requirements.txt
         python -m pip install --user -r ext/gudhi-deploy/test-requirements.txt
         python -m pip uninstall -y pykeops
@@ -28,11 +28,56 @@ jobs:
         brew install graphviz doxygen boost eigen gmp mpfr tbb cgal || true
       displayName: 'Install build dependencies'
     - bash: |
-        source activate gudhi_build_env
         mkdir build
         cd build
-        cmake -DCMAKE_BUILD_TYPE:STRING=$(cmakeBuildType) -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=ON -DPython_ADDITIONAL_VERSIONS=3 -DWITH_GUDHI_REMOTE_TEST=ON ..
-        make -j 4
+        cmake -DCMAKE_BUILD_TYPE:STRING=$(cmakeBuildType) -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=ON -DWITH_GUDHI_REMOTE_TEST=ON ..
+        make
         make doxygen
-        ctest -j 4 --output-on-failure # -E sphinx remove sphinx build as it fails
+        ctest --output-on-failure
       displayName: 'Build, test and documentation generation'
+
+  - job: 'Windows'
+    displayName: "Build and test Windows"
+    timeoutInMinutes: 0
+    cancelTimeoutInMinutes: 60
+    pool:
+      vmImage: windows-latest
+    variables:
+      pythonVersion: '3.7'
+      cmakeVcpkgFlags: -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_TOOLCHAIN_FILE=c:\vcpkg\scripts\buildsystems\vcpkg.cmake
+      cmakeFlags: -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF
+
+    steps:
+    # Use a specific Python version
+    - task: UsePythonVersion@0
+      displayName: Use Python $(pythonVersion)
+      inputs:
+        versionSpec: $(pythonVersion)
+        addToPath: true
+        architecture: 'x64'
+
+    - script: |
+        git submodule update --init
+        python -m pip install --user -r ext/gudhi-deploy/build-requirements.txt
+        # No PyKeOps on windows, let's workaround this one.
+        for /F "tokens=*" %%A in (ext\gudhi-deploy\test-requirements.txt) do python -m pip install  %%A
+        vcpkg install boost-filesystem:x64-windows boost-test:x64-windows boost-program-options:x64-windows tbb:x64-windows eigen3:x64-windows cgal:x64-windows
+      displayName: 'Install build dependencies'
+    - script: |
+        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
+        mkdir build
+        cd build
+        cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=Release $(cmakeVcpkgFlags) $(cmakeFlags) ..
+        MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64
+        ctest --output-on-failure -C Release -E diff_files
+        cmake  -DWITH_GUDHI_PYTHON=ON -DWITH_GUDHI_REMOTE_TEST=ON .
+        cd src\python
+        copy "C:\vcpkg\installed\x64-windows\bin\mpfr-6.dll" ".\gudhi\"
+        copy "C:\vcpkg\installed\x64-windows\bin\gmp.dll" ".\gudhi\"
+        copy "C:\vcpkg\installed\x64-windows\bin\tbb.dll" ".\gudhi\"
+        copy "C:\vcpkg\installed\x64-windows\bin\tbbmalloc.dll" ".\gudhi\"
+        python setup.py build_ext --inplace
+        SET PYTHONPATH=%CD%;%PYTHONPATH%
+        echo %PYTHONPATH%
+        ctest --output-on-failure -C Release
+      displayName: 'Build and test'