Use Ninja in Windows CI and explicitly set the VS toolset version. (#1906)

* Use Ninja in Windows CI and explicitly set the VS toolset version.

* Fix daily test CI.

* Add vcpkg binary caching.

* Pass `-A` in CMake only if specified by an environment variable.

---------

Co-authored-by: Seth Shelnutt <[email protected]>

Author: teo-tsirpanis

.github/workflows/ci.yml

@@ -21,10 +21,25 @@ jobs:
       # 11.7 necessary due to: https://github.com/actions/setup-python/issues/682#issuecomment-1604261330
       MACOSX_DEPLOYMENT_TARGET: ${{ matrix.os == 'macos-12' && contains(fromJSON('["3.7", "3.8"]'), matrix.python-version) && '11.7' || '11' }}
       #MACOSX_DEPLOYMENT_TARGET: "10.11"
+      # On windows-2019 we are using the Visual Studio generator, which is multi-config and places the build artifacts in a subdirectory
     steps:
       - name: Checkout TileDB-Py `dev`
         uses: actions/checkout@v3
 
+      # By default Visual Studio chooses the earliest installed toolset version
+      # for the main build and vcpkg chooses the latest. Force it to use the
+      # latest (14.39 currently).
+      - name: Setup MSVC toolset (VS 2022)
+        uses: TheMrMilchmann/setup-msvc-dev@v3
+        if: matrix.os == 'windows-latest'
+        with:
+          arch: x64
+          toolset: 14.39
+
+      - name: Install Ninja (VS 2022)
+        uses: seanmiddleditch/gha-setup-ninja@v4
+        if: matrix.os == 'windows-latest'
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:
@@ -80,6 +95,7 @@ jobs:
           fi
         env:
           TILEDB_FORCE_ALL_DEPS: True
+          CMAKE_GENERATOR: "Ninja"
         if: matrix.os == 'windows-latest'
 
       - name: "Download TileDB From Tarball And Build TileDB-Py (macOS)"

.github/workflows/daily-test-build-numpy.yml

@@ -35,10 +35,36 @@ jobs:
       # 11.7 necessary due to: https://github.com/actions/setup-python/issues/682#issuecomment-1604261330
       #MACOSX_DEPLOYMENT_TARGET: "10.15"
       MACOSX_DEPLOYMENT_TARGET: ${{ matrix.os == 'macos-11' && contains(fromJson('["3.7", "3.8"]'), matrix.python-version) && '11.7' || '11' }}
+      VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
     steps:
       - name: Checkout TileDB-Py `dev`
         uses: actions/checkout@v3
 
+      # By default Visual Studio chooses the earliest installed toolset version
+      # for the main build and vcpkg chooses the latest. Force it to use the
+      # latest (14.39 currently).
+      - name: Setup MSVC toolset (VS 2022)
+        uses: TheMrMilchmann/setup-msvc-dev@v3
+        if: matrix.os == 'windows-latest'
+        with:
+          arch: x64
+          toolset: 14.39
+
+      - name: Install Ninja (VS 2022)
+        uses: seanmiddleditch/gha-setup-ninja@v4
+        if: matrix.os == 'windows-latest'
+
+      - name: Enable vcpkg binary caching
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
+      - name: "Set CMAKE_GENERATOR"
+        run: export CMAKE_GENERATOR="Ninja"
+        if: matrix.os == 'windows-latest'
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
@@ -67,6 +93,7 @@ jobs:
 
       - name: Build TileDB-Py
         run: |
+          echo "CMAKE_GENERATOR=$CMAKE_GENERATOR"
           python setup.py build_ext --inplace --werror
           python setup.py develop
 

.github/workflows/daily-test-build.yml

@@ -29,6 +29,9 @@ jobs:
 
   test:
     runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash
     strategy:
       matrix:
         os: [ubuntu-latest, macos-12, windows-latest]
@@ -39,8 +42,34 @@ jobs:
     env:
       TILEDB_VERSION: ${{ matrix.libtiledb_version }}
       MACOSX_DEPLOYMENT_TARGET: "11"
+      VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
 
     steps:
+      # By default Visual Studio chooses the earliest installed toolset version
+      # for the main build and vcpkg chooses the latest. Force it to use the
+      # latest (14.39 currently).
+      - name: Setup MSVC toolset (VS 2022)
+        uses: TheMrMilchmann/setup-msvc-dev@v3
+        if: matrix.os == 'windows-latest'
+        with:
+          arch: x64
+          toolset: 14.39
+
+      - name: Enable vcpkg binary caching
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
+      - name: Install Ninja (VS 2022)
+        uses: seanmiddleditch/gha-setup-ninja@v4
+        if: matrix.os == 'windows-latest'
+
+      - name: "Set CMAKE_GENERATOR"
+        run: echo "CMAKE_GENERATOR=Ninja" >> $GITHUB_ENV
+        if: matrix.os == 'windows-latest'
+
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
@@ -73,6 +102,7 @@ jobs:
 
       - name: Build TileDB-Py
         run: |
+          echo "CMAKE_GENERATOR=$CMAKE_GENERATOR"
           python setup.py build_ext --inplace --werror
           python setup.py develop
         env:

setup.py

@@ -43,6 +43,7 @@
 # Allow to override TILEDB_FORCE_ALL_DEPS with environment variable
 TILEDB_FORCE_ALL_DEPS = "TILEDB_FORCE_ALL_DEPS" in os.environ
 TILEDB_DISABLE_SERIALIZATION = "TILEDB_DISABLE_SERIALIZATION" in os.environ
+CMAKE_ARCHITECTURE = os.environ.get("CMAKE_ARCHITECTURE", None)
 CMAKE_GENERATOR = os.environ.get("CMAKE_GENERATOR", None)
 
 # Directory containing this file
@@ -240,7 +241,10 @@ def build_libtiledb(src_dir):
     cmake_cmd.append("-DCMAKE_BUILD_TYPE={}".format(build_type))
 
     if os.name == "nt":
-        cmake_cmd.extend(["-A", "x64", "-DMSVC_MP_FLAG=/MP4"])
+        cmake_cmd.extend(["-DMSVC_MP_FLAG=/MP4"])
+
+    if CMAKE_ARCHITECTURE:
+        cmake_cmd.extend(["-A", CMAKE_ARCHITECTURE])
 
     if CMAKE_GENERATOR:
         cmake_cmd.extend(["-G", CMAKE_GENERATOR])