Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '18'
- '19'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -21,15 +21,15 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '18'
- '19'
expat:
- '2'
fontconfig:
- '2'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '13'
- '14'
glib:
- '2'
gsl:
Expand All @@ -55,7 +55,7 @@ libpng:
libtiff:
- '4.7'
llvm_openmp:
- '18'
- '19'
macos_machine:
- x86_64-apple-darwin13.4.0
pango:
Expand Down
8 changes: 4 additions & 4 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '18'
- '19'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -21,15 +21,15 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '18'
- '19'
expat:
- '2'
fontconfig:
- '2'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '13'
- '14'
glib:
- '2'
gsl:
Expand All @@ -55,7 +55,7 @@ libpng:
libtiff:
- '4.7'
llvm_openmp:
- '18'
- '19'
macos_machine:
- arm64-apple-darwin20.0.0
pango:
Expand Down
1 change: 1 addition & 0 deletions .gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions .scripts/create_conda_build_artifacts.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/create_conda_build_artifacts.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/run_docker_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 0 additions & 43 deletions recipe/0019-Copy-dz-gemmtr.f-from-lapack-to-Rblas.patch

This file was deleted.

144 changes: 144 additions & 0 deletions recipe/0019-Remove-dgemmtr-and-zgemmtr.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
From 025a7ea822ebff6a9d1fb1484c2de7acc8bc938e Mon Sep 17 00:00:00 2001
From: Isabel Paredes <isabel.paredes@quantstack.net>
Date: Thu, 17 Jul 2025 18:59:06 +0200
Subject: [PATCH] Remove dgemmtr and zgemmtr

---
src/extra/blas/Rblas.def | 2 --
src/modules/lapack/cmplx.f | 28 ++++++++++++++--------------
src/modules/lapack/dlapack.f | 14 +++++++-------
3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/extra/blas/Rblas.def b/src/extra/blas/Rblas.def
index b2eb43a82f..06ec1d8e1c 100644
--- a/src/extra/blas/Rblas.def
+++ b/src/extra/blas/Rblas.def
@@ -7,7 +7,6 @@ EXPORTS
ddot_
dgbmv_
dgemm_
- dgemmtr_
dgemv_
dger_
dnrm2_
@@ -48,7 +47,6 @@ EXPORTS
zdscal_
zgbmv_
zgemm_
- zgemmtr_
zgemv_
zgerc_
zgeru_
diff --git a/src/modules/lapack/cmplx.f b/src/modules/lapack/cmplx.f

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of changing this file, we should remove cmplx.f and dlapack.f from Makefile.win as they are not needed when using an external blas library like we do.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing the files seemed to cause too many undefined symbols errors, and removing more seemed to have broken the build 🫤

I updated the patch again to make minimal changes while still removing these two symbols. It seems to be working now.

index 3bb15052ae..5d44e48f5d 100644
--- a/src/modules/lapack/cmplx.f
+++ b/src/modules/lapack/cmplx.f
@@ -35308,7 +35308,7 @@
EXTERNAL LSAME, IZAMAX
* ..
* .. External Subroutines ..
- EXTERNAL ZCOPY, ZDSCAL, ZGEMMTR, ZGEMV, ZLACGV,
+ EXTERNAL ZCOPY, ZDSCAL, ZGEMV, ZLACGV,
$ ZSWAP
* ..
* .. Intrinsic Functions ..
@@ -35650,9 +35650,9 @@
*
* (note that conjg(W) is actually stored)
*
- CALL ZGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
- $ -CONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
- $ CONE, A( 1, 1 ), LDA )
+* ZGEMMTR not implemented
+ INFO = -1
+ RETURN
*
* Put U12 in standard form by partially undoing the interchanges
* in columns k+1:n looping backwards from k+1 to n
@@ -35997,9 +35997,9 @@
*
* (note that conjg(W) is actually stored)
*
- CALL ZGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
- $ K-1, -CONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
- $ CONE, A( K, K ), LDA )
+* ZGEMMTR not implemented
+ INFO = -1
+ RETURN
*
* Put L21 in standard form by partially undoing the interchanges
* of rows in columns 1:k-1 looping backwards from k-1 to 1
@@ -51658,7 +51658,7 @@
EXTERNAL LSAME, IZAMAX
* ..
* .. External Subroutines ..
- EXTERNAL ZCOPY, ZGEMMTR, ZGEMV, ZSCAL, ZSWAP
+ EXTERNAL ZCOPY, ZGEMV, ZSCAL, ZSWAP
* ..
* .. Intrinsic Functions ..
INTRINSIC ABS, DBLE, DIMAG, MAX, MIN, SQRT
@@ -51928,9 +51928,9 @@
*
* A11 := A11 - U12*D*U12**T = A11 - U12*W**T
*
- CALL ZGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
- $ -CONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
- $ CONE, A( 1, 1 ), LDA )
+* ZGEMMTR not implemented
+ INFO = -1
+ RETURN
*
* Put U12 in standard form by partially undoing the interchanges
* in columns k+1:n looping backwards from k+1 to n
@@ -52207,9 +52207,9 @@
*
* A22 := A22 - L21*D*L21**T = A22 - L21*W**T
*
- CALL ZGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
- $ K-1, -CONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
- $ CONE, A( K, K ), LDA )
+* ZGEMMTR not implemented
+ INFO = -1
+ RETURN
*
* Put L21 in standard form by partially undoing the interchanges
* of rows in columns 1:k-1 looping backwards from k-1 to 1
diff --git a/src/modules/lapack/dlapack.f b/src/modules/lapack/dlapack.f
index 284657d6b9..f0bd3e0867 100644
--- a/src/modules/lapack/dlapack.f
+++ b/src/modules/lapack/dlapack.f
@@ -92173,7 +92173,7 @@
EXTERNAL LSAME, IDAMAX
* ..
* .. External Subroutines ..
- EXTERNAL DCOPY, DGEMMTR, DGEMV, DSCAL, DSWAP
+ EXTERNAL DCOPY, DGEMV, DSCAL, DSWAP
* ..
* .. Intrinsic Functions ..
INTRINSIC ABS, MAX, MIN, SQRT
@@ -92439,9 +92439,9 @@
*
* A11 := A11 - U12*D*U12**T = A11 - U12*W**T
*
- CALL DGEMMTR( 'Upper', 'No transpose', 'Transpose', K, N-K,
- $ -ONE, A( 1, K+1 ), LDA, W( 1, KW+1 ), LDW,
- $ ONE, A( 1, 1 ), LDA )
+* DGEMMTR not implemented
+ INFO = -1
+ RETURN
*
* Put U12 in standard form by partially undoing the interchanges
* in columns k+1:n looping backwards from k+1 to n
@@ -92718,9 +92718,9 @@
*
* A22 := A22 - L21*D*L21**T = A22 - L21*W**T
*
- CALL DGEMMTR( 'Lower', 'No transpose', 'Transpose', N-K+1,
- $ K-1, -ONE, A( K, 1 ), LDA, W( K, 1 ), LDW,
- $ ONE, A( K, K ), LDA )
+* DGEMMTR not implemented
+ INFO = -1
+ RETURN
*
* Put L21 in standard form by partially undoing the interchanges
* of rows in columns 1:k-1 looping backwards from k-1 to 1
3 changes: 2 additions & 1 deletion recipe/build-r-base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,8 @@ Mingw_w64_makefiles() {
echo "USE_CAIRO = YES" >> "${SRC_DIR}/src/gnuwin32/MkRules.local"
echo "CAIRO_LIBS = \"-lcairo -lfontconfig\"" >> "${SRC_DIR}/src/gnuwin32/MkRules.local"
echo "USE_LIBCURL = YES" >> "${SRC_DIR}/src/gnuwin32/MkRules.local"
echo "CURL_LIBS = -lcurl" >> "${SRC_DIR}/src/gnuwin32/MkRules.local"
echo "CURL_LIBS = -lcurl -L\"${PREFIX}/Library/lib\"" >> "${SRC_DIR}/src/gnuwin32/MkRules.local"
echo "CURL_PATH = ${PREFIX}/Library/" >> "${SRC_DIR}/src/gnuwin32/MkRules.local"
echo "USE_ICU = YES" >> "${SRC_DIR}/src/gnuwin32/MkRules.local"
echo "ICU_PATH = ${PREFIX}/Library/" >> "${SRC_DIR}/src/gnuwin32/MkRules.local"
echo "ICU_LIBS = -licuin -licuuc -licudt -L\"${PREFIX}/Library/lib\"" >> "${SRC_DIR}/src/gnuwin32/MkRules.local"
Expand Down
4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ source:
- 0014-Use-conda-s-tzdata-package.patch
- 0015-Win32-Fix-COMPILED_BY-for-custom-GCC-pkgversion.patch
- 0018-Fix-path-to-TCL-TK.patch
- 0019-Copy-dz-gemmtr.f-from-lapack-to-Rblas.patch # [win]
- 0019-Remove-dgemmtr-and-zgemmtr.patch # [win]

build:
number: 0
number: 1
no_link:
- lib/R/doc/html/packages.html

Expand Down