Skip to content

Commit 20b6f5e

Browse files
committed
Merge commit '39a2855aff11070061b2541bae7ffe31b65e102b' into HEAD
2 parents b11afe6 + 39a2855 commit 20b6f5e

77 files changed

Lines changed: 1100 additions & 653 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/header_checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- uses: actions/checkout@v3
3535
- uses: actions/setup-python@v4
3636
with:
37-
python-version: '2.x'
37+
python-version: '3.x'
3838

3939
- name: Print g++/mingw32-make version and path
4040
run: |
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: Build Math libs
4848
shell: powershell
49-
run: mingw32-make -f make/standalone math-libs
49+
run: mingw32-make -f make/standalone math-libs -j2
5050

5151
- name: Run header tests
5252
shell: powershell

.github/workflows/main.yml

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/checkout@v3
3333
- uses: actions/setup-python@v4
3434
with:
35-
python-version: '2.x'
35+
python-version: '3.x'
3636
- uses: r-lib/actions/setup-r@v2
3737
with:
3838
r-version: 4.1.3
@@ -52,7 +52,9 @@ jobs:
5252

5353
- name: Build Math libs
5454
shell: powershell
55-
run: mingw32-make -f make/standalone math-libs
55+
run: |
56+
Add-Content make\local "O=1`n"
57+
mingw32-make -f make/standalone math-libs -j2
5658
- name: Add TBB to PATH
5759
shell: powershell
5860
run: echo "D:/a/math/math/lib/tbb" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -79,7 +81,7 @@ jobs:
7981
- uses: actions/checkout@v3
8082
- uses: actions/setup-python@v4
8183
with:
82-
python-version: '2.x'
84+
python-version: '3.x'
8385
- uses: r-lib/actions/setup-r@v2
8486
with:
8587
r-version: 4.1.3
@@ -99,7 +101,9 @@ jobs:
99101

100102
- name: Build Math libs
101103
shell: powershell
102-
run: mingw32-make -f make/standalone math-libs
104+
run: |
105+
Add-Content make\local "O=1`n"
106+
mingw32-make -f make/standalone math-libs -j2
103107
- name: Add TBB to PATH
104108
shell: powershell
105109
run: echo "D:/a/math/math/lib/tbb" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -109,12 +113,12 @@ jobs:
109113
- name: Run fwd unit tests and all the mix tests except those in mix/fun
110114
shell: powershell
111115
run: |
112-
python.exe runTests.py test/unit/math/fwd
113-
python.exe runTests.py test/unit/math/mix/core
114-
python.exe runTests.py test/unit/math/mix/functor
115-
python.exe runTests.py test/unit/math/mix/meta
116-
python.exe runTests.py test/unit/math/mix/prob
117-
python.exe runTests.py test/unit/math/mix/*_test.cpp
116+
python.exe runTests.py test/unit/math/fwd -j2
117+
python.exe runTests.py test/unit/math/mix/core -j2
118+
python.exe runTests.py test/unit/math/mix/functor -j2
119+
python.exe runTests.py test/unit/math/mix/meta -j2
120+
python.exe runTests.py test/unit/math/mix/prob -j2
121+
python.exe runTests.py test/unit/math/mix/*_test.cpp -j2
118122
119123
- name: Upload gtest_output xml
120124
uses: actions/upload-artifact@v3
@@ -130,7 +134,7 @@ jobs:
130134
- uses: actions/checkout@v3
131135
- uses: actions/setup-python@v4
132136
with:
133-
python-version: '2.x'
137+
python-version: '3.x'
134138
- uses: r-lib/actions/setup-r@v2
135139
with:
136140
r-version: 4.1.3
@@ -150,7 +154,9 @@ jobs:
150154

151155
- name: Build Math libs
152156
shell: powershell
153-
run: mingw32-make -f make/standalone math-libs
157+
run: |
158+
Add-Content make\local "O=1`n"
159+
mingw32-make -f make/standalone math-libs -j2
154160
- name: Add TBB to PATH
155161
shell: powershell
156162
run: echo "D:/a/math/math/lib/tbb" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -176,7 +182,7 @@ jobs:
176182
- uses: actions/checkout@v3
177183
- uses: actions/setup-python@v4
178184
with:
179-
python-version: '2.x'
185+
python-version: '3.x'
180186
- uses: r-lib/actions/setup-r@v2
181187
with:
182188
r-version: 4.1.3
@@ -196,7 +202,9 @@ jobs:
196202

197203
- name: Build Math libs
198204
shell: powershell
199-
run: mingw32-make -f make/standalone math-libs
205+
run: |
206+
Add-Content make\local "O=1`n"
207+
mingw32-make -f make/standalone math-libs -j2
200208
- name: Add TBB to PATH
201209
shell: powershell
202210
run: echo "D:/a/math/math/lib/tbb" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8

0 commit comments

Comments
 (0)