Skip to content

fix: More accurately check machine architecture #266

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.

Sign up for GitHub

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

Merged
mhovd merged 1 commit into from
Jun 19, 2025
Merged

fix: More accurately check machine architecture #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Suggests:
reticulate,
rmarkdown,
testthat
RoxygenNote: 7.2.3
RoxygenNote: 7.3.2
Encoding: UTF-8
Config/testthat/edition: 3
VignetteBuilder: knitr
9 changes: 7 additions & 2 deletions R/PMconfig.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@ getPMpath <- function() {
}

getBits <- function() {
#figure out 32 or 64 bit
if (length(grep("64-bit", utils::sessionInfo())) > 0) { return(64) } else { return(32) }
if (.Machine$sizeof.pointer == 8) {
return(64)
} else if (.Machine$sizeof.pointer == 4) {
return(32)
} else {
stop("Unknown architecture")
}
}

getFixedColNames <- function() {
Expand Down
2 changes: 1 addition & 1 deletion inst/options/PMoptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sep": [","],
"dec": ["."],
"lang": ["C."],
"lang": ["C"],
"compilation_statements": ["gfortran -march=native -w -O3 -o <exec> <files>", "gfortran -march=native -w -fopenmp -fmax-stack-var-size=32768 -O3 -o <exec> <files>"],
"server_address": ["http://localhost:5000"],
"backend": ["fortran"],
Expand Down
Loading