Merge branch 'develop' into ilr-simplex

Author: WardBrian

.github/workflows/main.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-24.04-arm]
+        os: [windows-11-arm, windows-latest, ubuntu-24.04-arm]
         config: [
           { label: misc, tests: 'test/unit/*_test.cpp test/unit/math/*_test.cpp test/unit/math/memory' },
           { label: prim, tests: 'test/unit/math/prim' },
@@ -41,27 +41,23 @@ jobs:
       with:
         python-version: '3.x'
 
-    - uses: r-lib/actions/setup-r@v2
+    - name: Download and install Rtools45
       if: runner.os == 'Windows'
-      with:
-        r-version: 'release'
-        rtools-version: '44'
-
-    - name: Set path for Rtools44
-      if: runner.os == 'Windows'
-      run: echo "C:/rtools44/usr/bin;C:/rtools44/x86_64-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+      run: |
+        $ARCH = if ('${{ matrix.os }}' -eq 'windows-11-arm') { 'aarch64' } else { 'x86_64' }
+        $RTOOLS = if ('${{ matrix.os }}' -eq 'windows-11-arm') { "rtools45-$ARCH" } else { 'rtools45' }
+        Invoke-WebRequest -Uri https://github.com/r-hub/rtools45/releases/download/latest/$RTOOLS.exe -OutFile "$RTOOLS.exe"
+        Start-Process -FilePath "$RTOOLS.exe" -ArgumentList "/install /norestart /verysilent /SUPPRESSMSGBOXES" -NoNewWindow -Wait
+        echo "C:/$RTOOLS/usr/bin;C:/$RTOOLS/$ARCH-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+        echo "$(pwd)/lib/tbb" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
 
     - name: Build Math libs
       shell: pwsh
       run: |
         Add-Content make\local "CPPFLAGS=-w -Wno-psabi -Wno-misleading-indentation`n"
+        Add-Content make\local "STAN_THREADS=true`n"
         make -f make/standalone math-libs -j2
 
-    - name: Add TBB to PATH
-      if: runner.os == 'Windows'
-      shell: pwsh
-      run: echo "D:/a/math/math/lib/tbb" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-
     - name: Run ${{ matrix.config.label }} unit tests
       shell: pwsh
       run: |
@@ -80,7 +76,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-24.04-arm]
+        os: [windows-11-arm, windows-latest, ubuntu-24.04-arm]
         group: [1, 2, 3, 4, 5]
 
     steps:
@@ -89,27 +85,23 @@ jobs:
       with:
         python-version: '3.x'
 
-    - uses: r-lib/actions/setup-r@v2
+    - name: Download and install Rtools45
       if: runner.os == 'Windows'
-      with:
-        r-version: 'release'
-        rtools-version: '44'
-
-    - name: Set path for Rtools44
-      if: runner.os == 'Windows'
-      run: echo "C:/rtools44/usr/bin;C:/rtools44/x86_64-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+      run: |
+        $ARCH = if ('${{ matrix.os }}' -eq 'windows-11-arm') { 'aarch64' } else { 'x86_64' }
+        $RTOOLS = if ('${{ matrix.os }}' -eq 'windows-11-arm') { "rtools45-$ARCH" } else { 'rtools45' }
+        Invoke-WebRequest -Uri https://github.com/r-hub/rtools45/releases/download/latest/$RTOOLS.exe -OutFile "$RTOOLS.exe"
+        Start-Process -FilePath "$RTOOLS.exe" -ArgumentList "/install /norestart /verysilent /SUPPRESSMSGBOXES" -NoNewWindow -Wait
+        echo "C:/$RTOOLS/usr/bin;C:/$RTOOLS/$ARCH-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+        echo "$(pwd)/lib/tbb" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
 
     - name: Build Math libs
       shell: pwsh
       run: |
         Add-Content make\local "CPPFLAGS=-w -Wno-psabi -Wno-misleading-indentation`n"
+        Add-Content make\local "STAN_THREADS=true`n"
         make -f make/standalone math-libs -j2
 
-    - name: Add TBB to PATH
-      if: runner.os == 'Windows'
-      shell: pwsh
-      run: echo "D:/a/math/math/lib/tbb" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-
     - name: Run mix/fun unit tests
       shell: pwsh
       run: |

stan/math/prim/meta/holder.hpp

@@ -231,8 +231,8 @@ namespace math {
  * expressions will be deleted.
  * @tparam T type of argument expression
  * @tparam Ptrs types of pointers
- * @param a argument expression
- * @param ptrs pointers to objects the constructed object will own.
+ * @param arg argument expression
+ * @param pointers pointers to objects the constructed object will own.
  * @return holder operation
  */
 template <typename T, typename... Ptrs,

test/unit/math/rev/fun/to_var_value_test.cpp

@@ -95,7 +95,7 @@ TEST(AgradRevMatrix, to_var_value_matrix_test) {
   Eigen::MatrixXd val(2, 3);
   val << 1, 2, 3, 4, 5, 6;
   Eigen::MatrixXd adj(2, 3);
-  val << 4, 5, 6, 7, 8, 9;
+  adj << 4, 5, 6, 7, 8, 9;
   Eigen::Matrix<stan::math::var, Eigen::Dynamic, Eigen::Dynamic> mat_var = val;
   stan::math::var_value<Eigen::MatrixXd> var_value
       = stan::math::to_var_value(mat_var);
@@ -109,7 +109,7 @@ TEST(AgradRevMatrix, to_var_value_vector_test) {
   Eigen::VectorXd val(3);
   val << 1, 2, 3;
   Eigen::VectorXd adj(3);
-  val << 7, 8, 9;
+  adj << 7, 8, 9;
   Eigen::Matrix<stan::math::var, Eigen::Dynamic, 1> mat_var = val;
   stan::math::var_value<Eigen::VectorXd> var_value
       = stan::math::to_var_value(mat_var);
@@ -123,7 +123,7 @@ TEST(AgradRevMatrix, to_var_value_row_vector_test) {
   Eigen::RowVectorXd val(3);
   val << 1, 2, 3;
   Eigen::RowVectorXd adj(3);
-  val << 7, 8, 9;
+  adj << 7, 8, 9;
   Eigen::Matrix<stan::math::var, 1, Eigen::Dynamic> mat_var = val;
   stan::math::var_value<Eigen::RowVectorXd> var_value
       = stan::math::to_var_value(mat_var);