Skip to content

Commit 518ba2b

Browse files
committed
config/script updates for codon cluster
1 parent 4114d3d commit 518ba2b

File tree

6 files changed

+20
-11
lines changed

6 files changed

+20
-11
lines changed

configs/subgraph_configs/ebi_full_monarch.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
"./configs/datasource_configs/otar.json",
4747
"./configs/datasource_configs/monarch.json",
4848
"./configs/datasource_configs/metabolights.json",
49-
"./configs/datasource_configs/mondo_efo.json",
50-
"./configs/datasource_configs/hett_pesticides_appril.json",
51-
"./configs/datasource_configs/hett_pesticides_eu.json",
52-
"./configs/datasource_configs/hett_pesticides_gb.json",
53-
"./configs/datasource_configs/chembl.json"
49+
"./configs/datasource_configs/mondo_efo.json"
5450
]
5551
}

configs/subgraph_configs/hett.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"datasource_configs": [
3939
"./configs/datasource_configs/hett_pesticides_appril.json",
4040
"./configs/datasource_configs/hett_pesticides_eu.json",
41-
"./configs/datasource_configs/hett_pesticides_gb.json",
42-
"./configs/datasource_configs/chembl.json"
41+
"./configs/datasource_configs/hett_pesticides_gb.json"
4342
]
4443
}

nextflow/01_create_subgraph.nf

+1-1
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ process create_solr_nodes_core {
406406
process create_solr_edges_core {
407407
cache "lenient"
408408
memory "64 GB"
409-
time "23h"
409+
time "3d"
410410
cpus "16"
411411

412412
publishDir "${params.tmp}/${params.config}/${params.subgraph}/solr_cores", overwrite: true, saveAs: { filename -> filename.replace("solr/data/", "") }

nextflow/codon_nextflow.config

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
process.executor = 'slurm'
22

3+
process {
4+
withName: build_equiv_groups {
5+
memory = 300.GB
6+
}
7+
}
8+
39
process {
410
withName: materialise {
511
memory = 96.GB
@@ -55,6 +61,7 @@ process {
5561
process {
5662
withName: create_neo {
5763
cpus = 32
64+
memory = 72.GB
5865
}
5966
}
6067

scripts/dataload_codon.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@
1212
for subgraph in config['subgraphs']:
1313
print(f"===== LOADING SUBGRAPH: {subgraph} =====")
1414
os.environ['GREBI_SUBGRAPH'] = subgraph
15-
os.system(f'nextflow {GREBI_HOME}/nextflow/01_create_subgraph.nf -c {GREBI_HOME}/nextflow/codon_nextflow.config')
15+
res = os.system(f'nextflow {GREBI_HOME}/nextflow/01_create_subgraph.nf -c {GREBI_HOME}/nextflow/codon_nextflow.config')
16+
if res != 0:
17+
exit(res)
1618
print(f"===== FINISHED LOADING SUBGRAPH: {subgraph} =====")
1719

18-
os.system(f'nextflow {GREBI_HOME}/nextflow/02_create_dbs.nf -c {GREBI_HOME}/nextflow/codon_nextflow.config')
20+
res = os.system(f'nextflow {GREBI_HOME}/nextflow/02_create_dbs.nf -c {GREBI_HOME}/nextflow/codon_nextflow.config')
21+
if res != 0:
22+
exit(res)
23+

scripts/dataload_codon.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ export GREBI_TMP=/hps/nobackup/parkinso/spot/grebi/tmp
44
export GREBI_CONFIG=ebi
55
export GREBI_IS_EBI=true
66
export GREBI_TIMESTAMP=$(date +%Y_%m_%d__%H_%M)
7+
export GREBI_MAX_ENTITIES=1000000000
78
module load nextflow-22.10.1-gcc-11.2.0-ju5saqw
89
module load python
910
export PYTHONPATH="/homes/spotbot/.local/lib/python3.6/site-packages:$PYTHONPATH"
1011
cd /hps/nobackup/parkinso/spot/grebi/
1112
export PYTHONUNBUFFERED=true
1213
srun -p datamover --time 1:0:0 --mem 8g bash -c "rm -rf /nfs/public/rw/ontoapps/grebi/staging && mkdir /nfs/public/rw/ontoapps/grebi/staging"
13-
srun --time 23:0:0 --mem 8g bash -c "rm -rf work tmp && python3 ${GREBI_HOME}/scripts/dataload_codon.py"
14+
srun --time 3-0:0:0 --mem 8g bash -c "rm -rf work tmp && python3 ${GREBI_HOME}/scripts/dataload_codon.py"
15+
#srun --time 23:0:0 --mem 8g bash -c "python3 ${GREBI_HOME}/scripts/dataload_codon.py"
1416

1517

0 commit comments

Comments
 (0)