From 7f1ab7e5fe1256c5a7b1b7ddd90076548b1fd174 Mon Sep 17 00:00:00 2001
From: Michael Kuron <mkuron@icp.uni-stuttgart.de>
Date: Thu, 23 Jan 2020 14:47:41 +0100
Subject: [PATCH] more test fix
---
.gitlab-ci.yml | 1 +
lbmpy/max_domain_size_info.py | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51fb07e..bc53eea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,6 +79,7 @@ ubuntu:
- pytest-3 -v -m "not longrun"
tags:
- docker
+ - cuda
minimal-conda:
stage: test
diff --git a/lbmpy/max_domain_size_info.py b/lbmpy/max_domain_size_info.py
index c8d7458..65fa50f 100644
--- a/lbmpy/max_domain_size_info.py
+++ b/lbmpy/max_domain_size_info.py
@@ -107,9 +107,11 @@ def memory_sizes_of_current_machine():
if get_cpu_info:
cpu_info = get_cpu_info()
- result.update({'L1': cpu_info['l1_data_cache_size'],
- 'L2': cpu_info['l2_cache_size'],
- 'L3': cpu_info['l3_cache_size']})
+ if 'l1_data_cache_size' in cpu_info:
+ result['L1'] = cpu_info['l1_data_cache_size']
+ result['L2'] = cpu_info['l2_cache_size']
+ if 'l3_cache_size' in cpu_info:
+ result['L3'] = cpu_info['l3_cache_size']
if device:
size = device.total_memory() / (1024 * 1024)
--
GitLab