Install python dependencies in windows draft-release CI (#1008)

* Install python dependencies in windows draft-release CI * Update Thrust/CUB minimum to 1.16.0, and download 1.17.2 (latest 1.x) if not found This resolves a VS 2019 + Thrust 1.14.0 (CUDA 11.8) issue which was not effecting VS 2022. There is not yet a Thrust/CUB non-rc 2.x release on GitHub to switch to / more testing is required * Modify Draft-Release workflow triggers to also run on pull_requests which modify the workflow * Use 2 CUDA architectures for draft-release test suite builds This is to avoid heap space exhaustion on windows when linking the test suite. See #646
FLAMEGPU · Dec 13, 2022 · 00cb4b2 · 00cb4b2
1 parent 56b90e7
commit 00cb4b2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/.github/workflows/Draft-Release.yml b/.github/workflows/Draft-Release.yml
@@ -6,6 +6,10 @@ on:
   push:
     tags:
       - 'v*.*.*'
+  # Or on pull_requests which mutate this CI workflow, using pr rather than push:branch to ensure that the merged state will be OK, as that is what is important here.
+  pull_request:
+    paths:
+      - ".github/workflows/Draft-Release.yml"
   # Or trigger on manual dispatch. This will not produce a release, but will perform the thorough build. 
   workflow_dispatch:
 
@@ -22,9 +26,9 @@ defaults:
 # + Thorough Windows builds
 #   + Oldest and newest cuda, lots of arch, vis off, tests on
 # + Wheel producing manylinux builds
-#   + CUDA 11.0 and 11.2, py 3.7-10, vis on/off, py only.
+#   + CUDA 11.0 and 11.2, py 3.7-11, vis on/off, py only.
 # + Wheel producing Windows builds
-#   + CUDA 11.0 and 11.2, py 3.7-10, vis on/off, py only.
+#   + CUDA 11.0 and 11.2, py 3.7-11, vis on/off, py only.
 # + Draft github release workflow.
 
 jobs:
@@ -38,11 +42,11 @@ jobs:
         # CUDA_ARCH values are reduced compared to wheels due to CI memory issues while compiling the test suite.
         cudacxx:
           - cuda: "11.8"
-            cuda_arch: "35;60;90"
+            cuda_arch: "35;90"
             hostcxx: gcc-9
             os: ubuntu-20.04
           - cuda: "11.0"
-            cuda_arch: "35;60;80"
+            cuda_arch: "35;80"
             hostcxx: gcc-8
             os: ubuntu-20.04
         python:
@@ -98,7 +102,6 @@ jobs:
       with:
         python-version: ${{ env.PYTHON }}
 
-    # @todo - is some/all of this still required when using select Python?
     - name: Install python dependencies
       if: ${{ env.PYTHON != '' && env.FLAMEGPU_BUILD_PYTHON == 'ON' }}
       run: |
@@ -184,11 +187,11 @@ jobs:
         # CUDA_ARCH values are reduced compared to wheels due to CI memory issues while compiling the test suite.
         cudacxx:
           - cuda: "11.8.0"
-            cuda_arch: "35;60;90"
+            cuda_arch: "35;90"
             hostcxx: "Visual Studio 16 2019"
             os: windows-2019
           - cuda: "11.0.3"
-            cuda_arch: "35;60;80"
+            cuda_arch: "35;80"
             hostcxx: "Visual Studio 16 2019"
             os: windows-2019
         python: 
@@ -236,6 +239,14 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: ${{ env.PYTHON }}
+
+    - name: Install python dependencies
+      if: ${{ env.PYTHON != '' && env.FLAMEGPU_BUILD_PYTHON == 'ON' }}
+      run: |
+        python3 -m pip install --upgrade wheel build setuptools
+
+    - name: Add custom problem matchers for annotations
+      run: echo "::add-matcher::.github/problem-matchers.json"
 
     # Must pass -G -A for windows, and -DPython3_ROOT_DIR/-DPYTHON3_EXECUTABLE as a github action workaround
     - name: Configure cmake
@@ -501,6 +512,14 @@ jobs:
       with:
         python-version: ${{ env.PYTHON }}
 
+    - name: Install python dependencies
+      if: ${{ env.PYTHON != '' && env.FLAMEGPU_BUILD_PYTHON == 'ON' }}
+      run: |
+        python3 -m pip install --upgrade wheel build setuptools
+
+    - name: Add custom problem matchers for annotations
+      run: echo "::add-matcher::.github/problem-matchers.json"
+
     # Must pass -G -A for windows, and -DPython3_ROOT_DIR/-DPYTHON3_EXECUTABLE as a github action workaround
     - name: Configure cmake
       run: >
@@ -541,7 +560,7 @@ jobs:
       - build-windows
       - wheel-manylinux2014
       - wheel-windows
-    if: ${{ success() && startsWith(github.ref, 'refs/tags/v') && github.event_name != 'workflow_dispatch' }}
+    if: ${{ success() && startsWith(github.ref, 'refs/tags/v') && github.event_name != 'workflow_dispatch' && github.event_name != 'pull_request' }}
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v3

diff --git a/cmake/dependencies/Thrust.cmake b/cmake/dependencies/Thrust.cmake
@@ -8,11 +8,10 @@ include(FetchContent)
 cmake_policy(SET CMP0079 NEW)
 
 # Set the minimum supported cub/thrust version, and the version to fetch
-# Thrust version must be >= 1.9.10 for good cmake integration. 
-# Thrust 1.9.8 is a miniumum as it includes a bugfix that was causing issues.
-set(MIN_REQUIRED_THRUST_VERSION 1.11.0)
+# Thrust version must be >= 1.9.10 for good cmake integration, and >= 1.16.0 to avoid windows.h related issues and CMake Thrust version handling logic.
+set(MIN_REQUIRED_THRUST_VERSION 1.16.0)
 set(MIN_REQUIRED_CUB_VERSION ${MIN_REQUIRED_THRUST_VERSION})
-set(THRUST_DOWNLOAD_VERSION 1.14.0)
+set(THRUST_DOWNLOAD_VERSION 1.17.2)
 
 # Use the FindCUDATooklit package (CMake > 3.17) to get the CUDA version and CUDA include directories for cub/thrust location hints
 find_package(CUDAToolkit REQUIRED)