diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51fb07ec11e3ebf3c5c669e2844fffd83c8e5806..bc53eea36eb16cccb33006b4d6bf4eb669ab2fb8 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 c8d7458cf6438bda005a5d63ba291db5c9716886..65fa50f97a7401dd37e2d38c037871817e796f56 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)