Skip to content

Commit 2be7966

Browse files
Merge branch 'master' into new/flare-interface
2 parents 0dc0b99 + 3692445 commit 2be7966

5 files changed

Lines changed: 20 additions & 6 deletions

File tree

.github/workflows/python-testsuite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
services:
2222
rabbitmq:
23-
image: rabbitmq:latest
23+
image: rabbitmq:3.12-management
2424
ports:
2525
- 5672:5672
2626

Modules/SchaMinimizer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ def minimization_step(self, custom_function_gradient = None, timer=None):
634634

635635
# Update the structure
636636
if self.minim_struct:
637-
self.dyn.structure.coords[:,:] = new_struct
637+
self.dyn.structure.coords[:,:] = np.real(new_struct)
638638

639639
# Check if we must enforce the symmetries and the sum rule:
640640
if self.enforce_sum_rule and (not self.neglect_symmetries):

meson.build

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('python-sscha',
22
['c','fortran'],
3-
version : '1.6.0',
3+
version : '1.6.1',
44
license: 'GPL',
55
meson_version: '>= 1.1.0', # <- set min version of meson.
66
default_options : [
@@ -34,8 +34,18 @@ project('python-sscha',
3434
blas_dep = mkl_dep
3535
lapack_dep = mkl_dep
3636
else
37-
lapack_dep = dependency('lapack', required: true)
38-
blas_dep = dependency('blas', required: true)
37+
lapack_dep = dependency('lapack', required: false)
38+
blas_dep = dependency('blas', required: false)
39+
40+
if not lapack_dep.found()
41+
lapack_lib = fc.find_library('lapack', required: true)
42+
lapack_dep = declare_dependency(dependencies: lapack_lib)
43+
endif
44+
45+
if not blas_dep.found()
46+
blas_lib = fc.find_library('blas', required: true)
47+
blas_dep = declare_dependency(dependencies: blas_lib)
48+
endif
3949
endif
4050

4151
# Look for the OpenMP library if it is needed for parallelization.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "mesonpy"
44

55
[project]
66
name = "python-sscha"
7-
version = "1.6.0"
7+
version = "1.6.1"
88
description = "Python implementation of the sscha code"
99
authors = [{name = "Lorenzo Monacelli"}] # Put here email
1010
readme = "README.md"

pytest.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[pytest]
2+
markers =
3+
julia: tests requiring the Julia Fourier backend
4+
release: long-running tests excluded from normal CI

0 commit comments

Comments
 (0)