-
-
Notifications
You must be signed in to change notification settings - Fork 49
r-base 4.5.0 #369
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
r-base 4.5.0 #369
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
51ba893
updated v4.5.0
regro-cf-autotick-bot d6bd251
Fix error: Autoconf version 2.72 or higher is required
IsabelParedes 0407abe
Debug m4
IsabelParedes 8c7ac16
Add verbosity
IsabelParedes 6951c18
Set M4 env var
IsabelParedes c029f8c
MNT: Re-rendered with conda-build 25.4.2, conda-smithy 3.48.1, and co…
987fa86
Restore build recipe
IsabelParedes 701681a
Trigger ci
IsabelParedes b37a4fb
Try m2-autoconf2.72
IsabelParedes 4184be5
Revert last commit
IsabelParedes 90ce3da
Reset build number
IsabelParedes 240a22d
Try `m2-autoconf2.72` again
xhochy c16cf96
Don't store build artifacts
xhochy 5463f8d
MNT: Re-rendered with conda-build 25.4.2, conda-smithy 3.48.1, and co…
xhochy 85e8a08
Limit CI matrix (for debugging)
xhochy cb48662
Set autom4te path
xhochy ea9d3ad
MNT: Re-rendered with conda-build 25.4.2, conda-smithy 3.48.1, and co…
xhochy b7368d0
Fix condition for AUTOM4TE
xhochy bacf6ce
Call explicit versioned autoconf
xhochy 4229726
Support older BLAS implementations on win
xhochy 5afc1de
Try internal blas/lapack for win
IsabelParedes cf79fe8
Revert last commit
IsabelParedes 5b28f07
Try following instructions
IsabelParedes 819b212
Add new syms to atlas also
IsabelParedes 2d75f5e
Restore ci files
IsabelParedes c51d294
MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.50.0, and co…
3ffc755
Restore matrix
IsabelParedes 2a107b5
MNT: Re-rendered with conda-build 25.5.0, conda-smithy 3.50.0, and co…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| From 8e5073ecbdaaee3e6c20012ab964879268964719 Mon Sep 17 00:00:00 2001 | ||
| From: Isabel Paredes <isabel.paredes@quantstack.net> | ||
| Date: Wed, 4 Jun 2025 14:24:42 +0200 | ||
| Subject: [PATCH] Copy [dz]gemmtr.f from lapack to Rblas | ||
|
|
||
| --- | ||
| src/extra/blas/Makefile.win | 12 ++++++++++-- | ||
| 1 file changed, 10 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/src/extra/blas/Makefile.win b/src/extra/blas/Makefile.win | ||
| index 7a60c0c7f1..1d1cfedb81 100644 | ||
| --- a/src/extra/blas/Makefile.win | ||
| +++ b/src/extra/blas/Makefile.win | ||
| @@ -8,7 +8,7 @@ all: ../../../$(BINDIR)/Rblas.dll | ||
| ## So to use latter, copy [dz]gemmtr.f from ../../modules/lapack | ||
| ## and add dgemmtr.o zgemmtr.o to the dependencies. | ||
| ifeq "$(USE_ATLAS)" "YES" | ||
| -../../../$(BINDIR)/Rblas.dll: ../../gnuwin32/dllversion.o | ||
| +../../../$(BINDIR)/Rblas.dll: ../../gnuwin32/dllversion.o dgemmtr.o zgemmtr.o | ||
| @$(ECHO) -------- Building $@ -------- | ||
| $(DLL) -s -shared $(DLLFLAGS) -o $@ $^ Rblas.def \ | ||
| -L../../../$(IMPDIR) -lR -L"$(ATLAS_PATH)" -lf77blas -latlas | ||
| @@ -18,7 +18,7 @@ else ifeq "$(USE_OPENBLAS)" "YES" | ||
| $(DLL) -s -shared $(DLLFLAGS) -o $@ $^ Rblas.def \ | ||
| -L../../../$(IMPDIR) -lR $(shell $(PKG_CONFIG) --libs openblas) | ||
| else | ||
| -../../../$(BINDIR)/Rblas.dll: blas.o blas2.o cmplxblas.o cmplxblas2.o ../../gnuwin32/dllversion.o | ||
| +../../../$(BINDIR)/Rblas.dll: blas.o blas2.o cmplxblas.o cmplxblas2.o dgemmtr.o zgemmtr.o ../../gnuwin32/dllversion.o | ||
| @$(ECHO) -------- Building $@ -------- | ||
| $(DLL) -s -shared $(DLLFLAGS) -o $@ $^ Rblas.def -L../../../$(IMPDIR) -lR $(FLIBS) | ||
| endif | ||
| @@ -26,3 +26,11 @@ endif | ||
| distclean clean: | ||
| @$(RM) ../../../$(BINDIR)/Rblas.dll *~ blas.o cmplxblas.o | ||
|
|
||
| + | ||
| +dgemmtr.o: | ||
| + cp ../../modules/lapack/dgemmtr.f . | ||
| + $(FC) $(FFLAGS) -c dgemmtr.f -o $@ | ||
| + | ||
| +zgemmtr.o: | ||
| + cp ../../modules/lapack/zgemmtr.f . | ||
| + $(FC) $(FFLAGS) -c zgemmtr.f -o $@ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's going to be a lot slower than intended.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then we need to update the blas version used here. I guess this means we need to get in conda-forge/blas-feedstock#114 first, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to update to 3.12.1 or backport the dgemmtr routines to 3.9
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The other option is to remove these symbols altogether. They are only used in lapack.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is removing the symbols preferable to the included patch which adds the symbols and it's working?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, removing them is preferable. can you send a PR to remove them?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @isuruf !
New PR here #379