Skip to content

Commit 0ec0e01

Browse files
committed
Bump version 1.6.1 → 1.6.2, fix LAPACK detection fallback for conda environments
1 parent 33d34a8 commit 0ec0e01

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

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.1',
3+
version : '1.6.2',
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.1"
7+
version = "1.6.2"
88
description = "Python implementation of the sscha code"
99
authors = [{name = "Lorenzo Monacelli"}] # Put here email
1010
readme = "README.md"

0 commit comments

Comments
 (0)