diff --git a/404.html b/404.html index 8b79b14..e8dcebb 100644 --- a/404.html +++ b/404.html @@ -33,7 +33,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/CODE_OF_CONDUCT.html b/CODE_OF_CONDUCT.html index a32457a..63c6731 100644 --- a/CODE_OF_CONDUCT.html +++ b/CODE_OF_CONDUCT.html @@ -17,7 +17,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/CONTRIBUTING.html b/CONTRIBUTING.html index d5dc676..47157a5 100644 --- a/CONTRIBUTING.html +++ b/CONTRIBUTING.html @@ -17,7 +17,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/SUPPORT.html b/SUPPORT.html index 058114e..62b2bd6 100644 --- a/SUPPORT.html +++ b/SUPPORT.html @@ -17,7 +17,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/articles/index.html b/articles/index.html index 7022201..f51f1e9 100644 --- a/articles/index.html +++ b/articles/index.html @@ -17,7 +17,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/articles/slurmjobs.html b/articles/slurmjobs.html index 9b3f18e..597103a 100644 --- a/articles/slurmjobs.html +++ b/articles/slurmjobs.html @@ -34,7 +34,7 @@ slurmjobs - 1.2.1 + 1.2.2 @@ -85,7 +85,7 @@

Leonardo University
lcolladotor@gmail.com -

29 February 2024

+

2 April 2024

Source: vignettes/slurmjobs.Rmd @@ -161,7 +161,7 @@

Citing slurmjobs#> doi:10.18129/B9.bioc.slurmjobs #> <https://doi.org/10.18129/B9.bioc.slurmjobs>, #> https://github.com/LieberInstitute/slurmjobs/slurmjobs - R package -#> version 1.2.1, <http://www.bioconductor.org/packages/slurmjobs>. +#> version 1.2.2, <http://www.bioconductor.org/packages/slurmjobs>. #> #> LieberInstitute (2024). "slurmjobs: Helper Functions for SLURM Jobs." #> _bioRxiv_. doi:10.1101/TODO <https://doi.org/10.1101/TODO>, @@ -207,7 +207,7 @@

Creating Shell Scripts to sbatch job_single( name = "my_shell_script", memory = "10G", cores = 2, create_shell = FALSE ) -#> 2024-02-29 18:26:15.709725 creating the logs directory at: logs +#> 2024-04-02 20:30:32.853889 creating the logs directory at: logs #> #!/bin/bash #> #SBATCH -p shared #> #SBATCH --mem=10G @@ -227,7 +227,7 @@

Creating Shell Scripts to sbatch #> echo "User: ${USER}" #> echo "Job id: ${SLURM_JOB_ID}" #> echo "Job name: ${SLURM_JOB_NAME}" -#> echo "Node name: ${SLURMD_NODENAME}" +#> echo "Node name: ${HOSTNAME}" #> echo "Task id: ${SLURM_ARRAY_TASK_ID}" #> #> ## Load the R module @@ -242,7 +242,7 @@

Creating Shell Scripts to sbatch #> echo "**** Job ends ****" #> date #> -#> ## This script was made using slurmjobs version 1.2.1 +#> ## This script was made using slurmjobs version 1.2.2 #> ## available from http://research.libd.org/slurmjobs/

Similarly, we can specify task_num to create an array job– in this case, one with 10 tasks.

@@ -251,7 +251,7 @@

Creating Shell Scripts to sbatch name = "my_array_job", memory = "5G", cores = 1, create_shell = FALSE, task_num = 10 ) -#> 2024-02-29 18:26:15.780543 creating the logs directory at: logs +#> 2024-04-02 20:30:32.925053 creating the logs directory at: logs #> #!/bin/bash #> #SBATCH -p shared #> #SBATCH --mem=5G @@ -272,7 +272,7 @@

Creating Shell Scripts to sbatch #> echo "User: ${USER}" #> echo "Job id: ${SLURM_JOB_ID}" #> echo "Job name: ${SLURM_JOB_NAME}" -#> echo "Node name: ${SLURMD_NODENAME}" +#> echo "Node name: ${HOSTNAME}" #> echo "Task id: ${SLURM_ARRAY_TASK_ID}" #> #> ## Load the R module @@ -287,7 +287,7 @@

Creating Shell Scripts to sbatch #> echo "**** Job ends ****" #> date #> -#> ## This script was made using slurmjobs version 1.2.1 +#> ## This script was made using slurmjobs version 1.2.2 #> ## available from http://research.libd.org/slurmjobs/

Another function, job_loop(), can be used to create more complex array jobs as compared with job_single(). It’s @@ -342,7 +342,7 @@

Creating Shell Scripts to sbatch #> echo "User: ${USER}" #> echo "Job id: ${SLURM_JOB_ID}" #> echo "Job name: ${SLURM_JOB_NAME}" -#> echo "Node name: ${SLURMD_NODENAME}" +#> echo "Node name: ${HOSTNAME}" #> echo "Task id: ${SLURM_ARRAY_TASK_ID}" #> #> ## Load the R module @@ -359,7 +359,7 @@

Creating Shell Scripts to sbatch #> #> } > $log_path 2>&1 #> -#> ## This script was made using slurmjobs version 1.2.1 +#> ## This script was made using slurmjobs version 1.2.2 #> ## available from http://research.libd.org/slurmjobs/

First, note the line Rscript bsp2_test.R --region ${region} --feature ${feature}. @@ -395,7 +395,7 @@

Creating Shell Scripts to sbatch #> #> session_info() #> -#> ## This script was made using slurmjobs version 1.2.1 +#> ## This script was made using slurmjobs version 1.2.2 #> ## available from http://research.libd.org/slurmjobs/

The code related to getopt at the top of the script reads in the unique combination of variable values into a list called @@ -424,8 +424,8 @@

Submitting and Resubmitting Jobs name = "my_array_job", memory = "5G", cores = 1, create_shell = TRUE, task_num = 10 ) -#> 2024-02-29 18:26:15.986825 creating the logs directory at: logs -#> 2024-02-29 18:26:15.988014 creating the shell file my_array_job.sh +#> 2024-04-02 20:30:33.131896 creating the logs directory at: logs +#> 2024-04-02 20:30:33.133023 creating the shell file my_array_job.sh #> To submit the job use: sbatch my_array_job.sh # Suppose that tasks 3, 6, 7, and 8 failed @@ -634,7 +634,7 @@

Reproducibility rmarkdown (Allaire, Xie, Dervieux, McPherson, Luraschi, Ushey, Atkins, Wickham, -Cheng, Chang, and Iannone, 2023) +Cheng, Chang, and Iannone, 2024)
  • sessioninfo (Wickham, Chang, Flight, Müller, and Hester, 2021)
  • @@ -653,9 +653,9 @@

    Reproducibilitylibrary("knitr") knit("slurmjobs.Rmd", tangle = TRUE)

    Date the vignette was generated.

    -
    #> [1] "2024-02-29 18:26:16 UTC"
    +
    #> [1] "2024-04-02 20:30:34 UTC"

    Wallclock time spent generating the vignette.

    -
    #> Time difference of 1.965 secs
    +
    #> Time difference of 2.007 secs

    R session information.

    #> ─ Session info ───────────────────────────────────────────────────────────────────────────────────────────────────────
     #>  setting  value
    @@ -667,7 +667,7 @@ 

    Reproducibility#> collate en_US.UTF-8 #> ctype en_US.UTF-8 #> tz UTC -#> date 2024-02-29 +#> date 2024-04-02 #> pandoc 3.1.1 @ /usr/local/bin/ (via rmarkdown) #> #> ─ Packages ─────────────────────────────────────────────────────────────────────────────────────────────────────────── @@ -676,13 +676,13 @@

    Reproducibility#> bibtex 0.5.1 2023-01-26 [1] RSPM (R 4.3.0) #> BiocManager 1.30.22 2023-08-08 [2] CRAN (R 4.3.2) #> BiocStyle * 2.30.0 2023-10-24 [1] Bioconductor -#> bookdown 0.37 2023-12-01 [1] RSPM (R 4.3.0) -#> bslib 0.6.1 2023-11-28 [2] RSPM (R 4.3.0) +#> bookdown 0.38 2024-03-04 [1] RSPM (R 4.3.0) +#> bslib 0.7.0 2024-03-29 [2] RSPM (R 4.3.0) #> cachem 1.0.8 2023-05-01 [2] RSPM (R 4.3.0) #> cli 3.6.2 2023-12-11 [2] RSPM (R 4.3.0) #> crayon 1.5.2 2022-09-29 [2] RSPM (R 4.3.0) #> desc 1.4.3 2023-12-10 [2] RSPM (R 4.3.0) -#> digest 0.6.34 2024-01-11 [2] RSPM (R 4.3.0) +#> digest 0.6.35 2024-03-11 [2] RSPM (R 4.3.0) #> dplyr * 1.1.4 2023-11-17 [1] RSPM (R 4.3.0) #> evaluate 0.23 2023-11-01 [2] RSPM (R 4.3.0) #> fansi 1.0.6 2023-12-08 [2] RSPM (R 4.3.0) @@ -690,7 +690,7 @@

    Reproducibility#> fs 1.6.3 2023-07-20 [2] RSPM (R 4.3.0) #> generics 0.1.3 2022-07-05 [1] RSPM (R 4.3.0) #> glue 1.7.0 2024-01-09 [2] RSPM (R 4.3.0) -#> htmltools 0.5.7 2023-11-03 [2] RSPM (R 4.3.0) +#> htmltools 0.5.8 2024-03-25 [2] RSPM (R 4.3.0) #> httr 1.4.7 2023-08-15 [2] RSPM (R 4.3.0) #> jquerylib 0.1.4 2021-04-26 [2] RSPM (R 4.3.0) #> jsonlite 1.8.8 2023-12-04 [2] RSPM (R 4.3.0) @@ -706,25 +706,25 @@

    Reproducibility#> plyr 1.8.9 2023-10-02 [1] RSPM (R 4.3.0) #> purrr 1.0.2 2023-08-10 [2] RSPM (R 4.3.0) #> R6 2.5.1 2021-08-19 [2] RSPM (R 4.3.0) -#> ragg 1.2.7 2023-12-11 [2] RSPM (R 4.3.0) +#> ragg 1.3.0 2024-03-13 [2] RSPM (R 4.3.0) #> Rcpp 1.0.12 2024-01-09 [2] RSPM (R 4.3.0) #> RefManageR * 1.4.0 2022-09-30 [1] RSPM (R 4.3.0) #> rlang 1.1.3 2024-01-10 [2] RSPM (R 4.3.0) -#> rmarkdown 2.25 2023-09-18 [2] RSPM (R 4.3.0) -#> sass 0.4.8 2023-12-06 [2] RSPM (R 4.3.0) +#> rmarkdown 2.26 2024-03-05 [2] RSPM (R 4.3.0) +#> sass 0.4.9 2024-03-15 [2] RSPM (R 4.3.0) #> sessioninfo * 1.2.2 2021-12-06 [2] RSPM (R 4.3.0) -#> slurmjobs * 1.2.1 2024-02-29 [1] local +#> slurmjobs * 1.2.2 2024-04-02 [1] local #> stringi 1.8.3 2023-12-11 [2] RSPM (R 4.3.0) #> stringr 1.5.1 2023-11-14 [2] RSPM (R 4.3.0) -#> systemfonts 1.0.5 2023-10-09 [2] RSPM (R 4.3.0) +#> systemfonts 1.0.6 2024-03-07 [2] RSPM (R 4.3.0) #> textshaping 0.3.7 2023-10-09 [2] RSPM (R 4.3.0) #> tibble 3.2.1 2023-03-20 [2] RSPM (R 4.3.0) -#> tidyselect 1.2.0 2022-10-10 [1] RSPM (R 4.3.0) +#> tidyselect 1.2.1 2024-03-11 [1] RSPM (R 4.3.0) #> timechange 0.3.0 2024-01-18 [1] RSPM (R 4.3.0) #> utf8 1.2.4 2023-10-22 [2] RSPM (R 4.3.0) #> vctrs 0.6.5 2023-12-01 [2] RSPM (R 4.3.0) #> withr 3.0.0 2024-01-16 [2] RSPM (R 4.3.0) -#> xfun 0.42 2024-02-08 [2] RSPM (R 4.3.0) +#> xfun 0.43 2024-03-25 [2] RSPM (R 4.3.0) #> xml2 1.3.6 2023-12-04 [2] RSPM (R 4.3.0) #> yaml 2.3.8 2023-12-11 [2] RSPM (R 4.3.0) #> @@ -740,19 +740,19 @@

    BibliographyBiocStyle (Oleś, 2023) with knitr (Xie, 2023) and rmarkdown -(Allaire, Xie, Dervieux et al., 2023) running behind the scenes.

    +(Allaire, Xie, Dervieux et al., 2024) running behind the scenes.

    Citations made with RefManageR (McLean, 2017).

    -[1] +[1] J. Allaire, Y. Xie, C. Dervieux, et al. rmarkdown: Dynamic Documents -for R. R package version 2.25. 2023. URL: +for R. R package version 2.26. 2024. URL: https://github.com/rstudio/rmarkdown.

    [2] LieberInstitute. slurmjobs: Helper Functions for SLURM Jobs. https://github.com/LieberInstitute/slurmjobs/slurmjobs - -R package version 1.2.1. 2024. DOI: +R package version 1.2.2. 2024. DOI: 10.18129/B9.bioc.slurmjobs. URL: http://www.bioconductor.org/packages/slurmjobs. diff --git a/authors.html b/authors.html index ccd6b74..347fdc1 100644 --- a/authors.html +++ b/authors.html @@ -17,7 +17,7 @@ slurmjobs - 1.2.1 + 1.2.2 @@ -66,14 +66,14 @@

    Citation

    LieberInstitute (2024). slurmjobs: Helper Functions for SLURM Jobs. -doi:10.18129/B9.bioc.slurmjobs, https://github.com/LieberInstitute/slurmjobs/slurmjobs - R package version 1.2.1, http://www.bioconductor.org/packages/slurmjobs. +doi:10.18129/B9.bioc.slurmjobs, https://github.com/LieberInstitute/slurmjobs/slurmjobs - R package version 1.2.2, http://www.bioconductor.org/packages/slurmjobs.

    @Manual{,
       title = {slurmjobs: Helper Functions for SLURM Jobs},
       author = {{LieberInstitute}},
       year = {2024},
       url = {http://www.bioconductor.org/packages/slurmjobs},
    -  note = {https://github.com/LieberInstitute/slurmjobs/slurmjobs - R package version 1.2.1},
    +  note = {https://github.com/LieberInstitute/slurmjobs/slurmjobs - R package version 1.2.2},
       doi = {10.18129/B9.bioc.slurmjobs},
     }

    LieberInstitute (2024). diff --git a/index.html b/index.html index a6b1681..986b7fa 100644 --- a/index.html +++ b/index.html @@ -37,7 +37,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/news/index.html b/news/index.html index df8e4fa..9b0c23f 100644 --- a/news/index.html +++ b/news/index.html @@ -17,7 +17,7 @@ slurmjobs - 1.2.1 + 1.2.2 @@ -50,6 +50,10 @@

    Changelog

    Source: NEWS.md +
    + +
    • Use the HOSTNAME instead of SLURMD_NODENAME environment variable to determine host running a SLURM job
    • +

    BUG FIXES

    diff --git a/pkgdown.yml b/pkgdown.yml index 5490a89..fb4efd6 100644 --- a/pkgdown.yml +++ b/pkgdown.yml @@ -3,5 +3,5 @@ pkgdown: 2.0.7 pkgdown_sha: ~ articles: slurmjobs: slurmjobs.html -last_built: 2024-02-29T18:26Z +last_built: 2024-04-02T20:30Z diff --git a/reference/array_submit.html b/reference/array_submit.html index 73e9fd0..9788a66 100644 --- a/reference/array_submit.html +++ b/reference/array_submit.html @@ -23,7 +23,7 @@ slurmjobs - 1.2.1 + 1.2.2
    @@ -136,9 +136,9 @@

    Examples

    create_shell = TRUE, task_num = 100 ) -#> 2024-02-29 18:26:12.191638 creating the logs directory at: logs -#> 2024-02-29 18:26:12.193129 creating the shell file array_submit_example_2024-02-29.sh -#> To submit the job use: sbatch array_submit_example_2024-02-29.sh +#> 2024-04-02 20:30:29.270351 creating the logs directory at: logs +#> 2024-04-02 20:30:29.271871 creating the shell file array_submit_example_2024-04-02.sh +#> To submit the job use: sbatch array_submit_example_2024-04-02.sh ## Now we can submit the job for a set of task IDs (or omit 'task_ids' ## to automatically grab those same failed task IDs) diff --git a/reference/array_submit_example_2024-04-02.sh b/reference/array_submit_example_2024-04-02.sh new file mode 100644 index 0000000..3d16224 --- /dev/null +++ b/reference/array_submit_example_2024-04-02.sh @@ -0,0 +1,37 @@ +#!/bin/bash +#SBATCH -p shared +#SBATCH --mem=10G +#SBATCH --job-name=array_submit_example_2024-04-02 +#SBATCH -c 1 +#SBATCH -t 1-00:00:00 +#SBATCH -o logs/array_submit_example_2024-04-02.%a.txt +#SBATCH -e logs/array_submit_example_2024-04-02.%a.txt +#SBATCH --mail-type=ALL +#SBATCH --array=1-100%20 + +set -e + +echo "**** Job starts ****" +date + +echo "**** JHPCE info ****" +echo "User: ${USER}" +echo "Job id: ${SLURM_JOB_ID}" +echo "Job name: ${SLURM_JOB_NAME}" +echo "Node name: ${HOSTNAME}" +echo "Task id: ${SLURM_ARRAY_TASK_ID}" + +## Load the R module +module load conda_R/4.3 + +## List current modules for reproducibility +module list + +## Edit with your job command +Rscript -e "options(width = 120); sessioninfo::session_info()" + +echo "**** Job ends ****" +date + +## This script was made using slurmjobs version 1.2.2 +## available from http://research.libd.org/slurmjobs/ diff --git a/reference/get_list_indexing.html b/reference/get_list_indexing.html index 215291c..9b997b2 100644 --- a/reference/get_list_indexing.html +++ b/reference/get_list_indexing.html @@ -22,7 +22,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/reference/get_short_flags.html b/reference/get_short_flags.html index 9ee8a68..98b067d 100644 --- a/reference/get_short_flags.html +++ b/reference/get_short_flags.html @@ -20,7 +20,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/reference/index.html b/reference/index.html index 93926fd..b0754bf 100644 --- a/reference/index.html +++ b/reference/index.html @@ -17,7 +17,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/reference/job_info.html b/reference/job_info.html index a4d78c8..7134b96 100644 --- a/reference/job_info.html +++ b/reference/job_info.html @@ -19,7 +19,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/reference/job_info_df.html b/reference/job_info_df.html index 4d2ba2c..10972d5 100644 --- a/reference/job_info_df.html +++ b/reference/job_info_df.html @@ -18,7 +18,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/reference/job_loop.html b/reference/job_loop.html index 553b0a7..0c0ceb1 100644 --- a/reference/job_loop.html +++ b/reference/job_loop.html @@ -18,7 +18,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/reference/job_report.html b/reference/job_report.html index a175d2c..df1daf1 100644 --- a/reference/job_report.html +++ b/reference/job_report.html @@ -23,7 +23,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/reference/job_single.html b/reference/job_single.html index 091c446..4b04e77 100644 --- a/reference/job_single.html +++ b/reference/job_single.html @@ -20,7 +20,7 @@ slurmjobs - 1.2.1 + 1.2.2 @@ -190,7 +190,7 @@

    Examples

    #> echo "User: ${USER}" #> echo "Job id: ${SLURM_JOB_ID}" #> echo "Job name: ${SLURM_JOB_NAME}" -#> echo "Node name: ${SLURMD_NODENAME}" +#> echo "Node name: ${HOSTNAME}" #> echo "Task id: ${SLURM_ARRAY_TASK_ID}" #> #> ## Load the R module @@ -205,7 +205,7 @@

    Examples

    #> echo "**** Job ends ****" #> date #> -#> ## This script was made using slurmjobs version 1.2.1 +#> ## This script was made using slurmjobs version 1.2.2 #> ## available from http://research.libd.org/slurmjobs/ #> job_single("~/jhpce_job.sh", create_logdir = FALSE) @@ -228,7 +228,7 @@

    Examples

    #> echo "User: ${USER}" #> echo "Job id: ${SLURM_JOB_ID}" #> echo "Job name: ${SLURM_JOB_NAME}" -#> echo "Node name: ${SLURMD_NODENAME}" +#> echo "Node name: ${HOSTNAME}" #> echo "Task id: ${SLURM_ARRAY_TASK_ID}" #> #> ## Load the R module @@ -243,7 +243,7 @@

    Examples

    #> echo "**** Job ends ****" #> date #> -#> ## This script was made using slurmjobs version 1.2.1 +#> ## This script was made using slurmjobs version 1.2.2 #> ## available from http://research.libd.org/slurmjobs/ #> @@ -271,7 +271,7 @@

    Examples

    #> echo "User: ${USER}" #> echo "Job id: ${SLURM_JOB_ID}" #> echo "Job name: ${SLURM_JOB_NAME}" -#> echo "Node name: ${SLURMD_NODENAME}" +#> echo "Node name: ${HOSTNAME}" #> echo "Task id: ${SLURM_ARRAY_TASK_ID}" #> #> ## Load the R module @@ -286,7 +286,7 @@

    Examples

    #> echo "**** Job ends ****" #> date #> -#> ## This script was made using slurmjobs version 1.2.1 +#> ## This script was made using slurmjobs version 1.2.2 #> ## available from http://research.libd.org/slurmjobs/ #> @@ -312,7 +312,7 @@

    Examples

    #> echo "User: ${USER}" #> echo "Job id: ${SLURM_JOB_ID}" #> echo "Job name: ${SLURM_JOB_NAME}" -#> echo "Node name: ${SLURMD_NODENAME}" +#> echo "Node name: ${HOSTNAME}" #> echo "Task id: ${SLURM_ARRAY_TASK_ID}" #> #> ## Load the R module @@ -327,7 +327,7 @@

    Examples

    #> echo "**** Job ends ****" #> date #> -#> ## This script was made using slurmjobs version 1.2.1 +#> ## This script was made using slurmjobs version 1.2.2 #> ## available from http://research.libd.org/slurmjobs/ #> diff --git a/reference/parse_file_or_name.html b/reference/parse_file_or_name.html index 937ce95..3ea554e 100644 --- a/reference/parse_file_or_name.html +++ b/reference/parse_file_or_name.html @@ -20,7 +20,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/reference/parse_slurm_time.html b/reference/parse_slurm_time.html index ed4796e..dcebc85 100644 --- a/reference/parse_slurm_time.html +++ b/reference/parse_slurm_time.html @@ -18,7 +18,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/reference/partition_df.html b/reference/partition_df.html index 5cad8fc..b8ec439 100644 --- a/reference/partition_df.html +++ b/reference/partition_df.html @@ -18,7 +18,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/reference/partition_info.html b/reference/partition_info.html index 7d121e7..4c4ab28 100644 --- a/reference/partition_info.html +++ b/reference/partition_info.html @@ -19,7 +19,7 @@ slurmjobs - 1.2.1 + 1.2.2 diff --git a/reference/vector_as_code.html b/reference/vector_as_code.html index 994ab0d..d248550 100644 --- a/reference/vector_as_code.html +++ b/reference/vector_as_code.html @@ -18,7 +18,7 @@ slurmjobs - 1.2.1 + 1.2.2