Merge remote-tracking branch 'origin/develop' into feature/variadic-integrate-1d

Author: bbbales2

.github/workflows/main.yml

@@ -63,8 +63,8 @@ jobs:
       with:
         name: gtest_outputs_xml
         path: '**/*_test.xml'
-  fwd-mix:
-    name: fwd and mix tests
+  fwd-non-fun-mix:
+    name: fwd tests and non-fun mix tests
     runs-on: windows-latest
 
     steps:
@@ -93,11 +93,56 @@ jobs:
     - name: Add TBB to PATH
       shell: powershell
       run: echo "D:/a/math/math/lib/tbb" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-    - name: Run fwd and mix unit tests
+    - name: Run fwd unit tests and all the mix tests except those in mix/fun
       shell: powershell
       run: |
-        python.exe runTests.py -j2 test/unit/math/fwd
-        python.exe runTests.py -j2 test/unit/math/mix
+        python.exe runTests.py test/unit/math/fwd
+        python.exe runTests.py test/unit/math/mix/core
+        python.exe runTests.py test/unit/math/mix/functor
+        python.exe runTests.py test/unit/math/mix/meta
+        python.exe runTests.py test/unit/math/mix/prob
+        python.exe runTests.py test/unit/math/mix/*_test.cpp
+
+    - name: Upload gtest_output xml
+      uses: actions/upload-artifact@v2
+      if: failure()
+      with:
+        name: gtest_outputs_xml
+        path: '**/*_test.xml'
+  mix-fun:
+    name: mix/fun tests
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '2.x'
+    - name: Download RTools
+      run: Invoke-WebRequest -Uri https://cran.rstudio.com/bin/windows/Rtools/Rtools35.exe -OutFile ./R35.exe
+    - name: Install RTools
+      shell: powershell
+      run: Start-Process -FilePath ./R35.exe -ArgumentList /VERYSILENT -NoNewWindow -Wait
+    - name: PATH Setup
+      shell: powershell
+      run: echo "C:/Rtools/bin;C:/Rtools/mingw_64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+    - name: Print g++ & make version and path
+      shell: powershell
+      run: |
+        g++ --version
+        Get-Command g++ | Select-Object -ExpandProperty Definition
+        mingw32-make --version
+        Get-Command mingw32-make | Select-Object -ExpandProperty Definition
+    - name: Build Math libs
+      shell: powershell
+      run: mingw32-make -f make/standalone math-libs
+    - name: Add TBB to PATH
+      shell: powershell
+      run: echo "D:/a/math/math/lib/tbb" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+    - name: Run mix/fun unit tests
+      shell: powershell
+      run: |
+        python.exe runTests.py test/unit/math/mix/fun
         
     - name: Upload gtest_output xml
       uses: actions/upload-artifact@v2

runTests.py

@@ -139,7 +139,7 @@ def isWin():
 
 
 batchSize = 20 if isWin() else 200
-
+jumboSize = 5 if isWin() else 15
 
 def mungeName(name):
     """Set up the makefile target name"""
@@ -188,7 +188,7 @@ def generateJumboTests(paths):
             stopErr("The --jumbo flag is only allowed with top level folders.", 10)
     for jf in jumbo_files_to_create:
         tests_in_subfolder = sorted([x for x in os.listdir(jf) if x.endswith(testsfx)])
-        chunked_tests = divide_chunks(tests_in_subfolder, 15)
+        chunked_tests = divide_chunks(tests_in_subfolder, jumboSize)
         i = 0
         for tests in chunked_tests:
             i = i + 1