Skip to content

Commit

Permalink
dideweb updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Oliver Watson committed Oct 17, 2023
1 parent a097bf6 commit b840451
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 20 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ docs
inst/doc
/doc/
/Meta/
analysis/dide-context
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Imports:
spdep,
magenta
Remotes:
OJWatson/hrp2malaRia
OJWatson/magenta
URL: https://ojwatson.github.io/arms/
Encoding: UTF-8
LazyData: true
Expand Down
40 changes: 21 additions & 19 deletions analysis/01_dideweb.R
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ didehpc::didehpc_config_global(temp=didehpc::path_mapping("tmp",
"//fi--didenas5/malaria",
"L:"),
credentials=credentials,
cluster = "wpia-hn")
cluster = "fi--didemrchnb")

# Creating a Context
context_name <- "analysis/dide-context"
Expand All @@ -39,36 +39,20 @@ ctx <- context::context_save(
)

# set up a specific config for here as we need to specify the large RAM nodes
config <- didehpc::didehpc_config(use_workers = TRUE, parallel = FALSE, )

config <- didehpc::didehpc_config(use_workers = TRUE, parallel = FALSE)

# Configure the Queue
obj <- didehpc::queue_didehpc(ctx, config = config)


## ----------------------------------------------------o
## 2. Start Cluster Submissions --------------
## 2. Create cluster param submissions --------------
## ----------------------------------------------------o

# read in parms from lhs
parms <- readRDS(here::here("analysis/data-derived/lhs_sample.rds"))
param_list <- vector("list", length = nrow(parms))

## safe submission
try_fail_catch <- function(expr, attempts = 3){
r <- NULL
attempt <- 1
while( is.null(r) && attempt <= 3 ) {
attempt <- attempt + 1
try(
r <- eval(expr)
)
}

}

#### Simulation Set Up ####

# main parameter set up
N <- 100000
tl <- 40
Expand Down Expand Up @@ -145,6 +129,24 @@ for(i in seq_len(nrow(parms))) {

}

## ----------------------------------------------------o
## 3. Make cluster submissions --------------
## ----------------------------------------------------


## safe submission
try_fail_catch <- function(expr, attempts = 3){
r <- NULL
attempt <- 1
while( is.null(r) && attempt <= 3 ) {
attempt <- attempt + 1
try(
r <- eval(expr)
)
}

}
obj$submit_workers(200)

# 1. First do the non linked, i.e. independent loci
sub <- which(parms$linked == 0)
Expand Down
Binary file added scripts/binaries/dde_1.0.2.tar.gz
Binary file not shown.
Binary file added scripts/binaries/dde_1.0.2.zip
Binary file not shown.
Binary file added scripts/binaries/magenta_1.3.0.tar.gz
Binary file not shown.
Binary file added scripts/binaries/magenta_1.3.0.zip
Binary file not shown.
Binary file added scripts/binaries/magenta_1.3.1.zip
Binary file not shown.

0 comments on commit b840451

Please sign in to comment.