Skip to content
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

bugfix in start.R and output.R #693

Merged
merged 1 commit into from
Jun 24, 2024
Merged

bugfix in start.R and output.R #693

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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-

### fixed
-
- **scripts** fixing an error in start.R and output.R which occurred if more than one slurm job was submitted at the same time.


## [4.8.1] - 2024-06-19
Expand Down
6 changes: 3 additions & 3 deletions output.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ runOutputs <- function(comp=NULL, output=NULL, outputdir=NULL, submit=NULL) {
sys.source(script,envir=tmp.env)
rm(tmp.env)
} else {
slurmModes <- yaml::read_yaml(slurmModes)$slurmjobs
if(submit %in% names(slurmModes)) {
command <- slurmModes[submit]
slurm <- yaml::read_yaml(slurmModes)$slurmjobs
if(submit %in% names(slurm)) {
command <- slurm[submit]
command <- gsub("%NAME", rout_name, command)
command <- gsub("%SCRIPT", rCommand, command)
message(command)
Expand Down
6 changes: 3 additions & 3 deletions start.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ runOutputs <- function(runscripts=NULL, submit=NULL) {
sys.source(script,envir=tmp.env)
rm(tmp.env)
} else {
slurmModes <- yaml::read_yaml(slurmModes)$slurmjobs
if(submit %in% names(slurmModes)) {
command <- slurmModes[submit]
slurm <- yaml::read_yaml(slurmModes)$slurmjobs
if(submit %in% names(slurm)) {
command <- slurm[submit]
command <- gsub("%NAME", name, command)
command <- gsub("%SCRIPT", script, command)
message(command)
Expand Down
Loading