From 254ef948e5f24bbfbbc860a48e0d9b743c2ef285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=B6rsch?= Date: Fri, 9 Mar 2018 15:43:55 +0100 Subject: [PATCH] config: Use gurobi instead of gurobi_persistent The memory requirements of gurobi_persistent are significantly higher! Trade cpu speed with memory. --- Snakefile | 5 +++-- config.yaml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Snakefile b/Snakefile index e7b2fd58..998954db 100644 --- a/Snakefile +++ b/Snakefile @@ -142,9 +142,10 @@ def partition(w): def memory(w): if w.clusters.endswith('m'): - return 61000 + return 18000 + 180 * int(w.clusters[:-1]) else: - return 4890+310 * int(w.clusters) + return 8000 + 190 * int(w.clusters) + # return 4890+310 * int(w.clusters) rule solve_network: input: "networks/{network}_s{simpl}_{clusters}_lv{lv}_{opts}.nc" diff --git a/config.yaml b/config.yaml index c6eddc88..bc70169e 100644 --- a/config.yaml +++ b/config.yaml @@ -129,7 +129,7 @@ solving: # max_iterations: 1 # nhours: 10 solver: - name: gurobi_persistent + name: gurobi threads: 4 method: 2 crossover: 0 # -1 (Choose freely)