Skip to content

Commit d22d0a2

Browse files
committed
Add QBLAS wrap dependency system
1 parent b4a9429 commit d22d0a2

File tree

5 files changed

+25
-5
lines changed

5 files changed

+25
-5
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,7 @@ compile_commands.json
137137
*.whl
138138
.DS_Store
139139
.idea/
140+
141+
# quddtype
142+
/quaddtype/subprojects/qblas/
143+
.wraplock

quaddtype/meson.build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ incdir_numpy = run_command(py,
2525

2626
# Add OpenMP dependency (optional, for threading)
2727
openmp_dep = dependency('openmp', required: false)
28-
dependencies = [sleef_dep, py_dep]
28+
qblas_dep = dependency('qblas', fallback: ['qblas', 'qblas_dep'])
29+
dependencies = [sleef_dep, py_dep, qblas_dep]
2930
if openmp_dep.found()
3031
dependencies += openmp_dep
3132
endif
@@ -66,12 +67,11 @@ configure_file(
6667
configuration: cdata
6768
)
6869

69-
build_includes = include_directories('.')
70-
70+
build_includes = include_directories('.') # compile time generated headers as per system
7171
includes = include_directories(
7272
[
7373
incdir_numpy,
74-
'numpy_quaddtype/QBLAS/include',
74+
# 'subprojects/qblas/include',
7575
'numpy_quaddtype/src',
7676
]
7777
)

quaddtype/numpy_quaddtype/src/quadblas_interface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <algorithm>
44

55
#ifndef DISABLE_QUADBLAS
6-
#include "../QBLAS/include/quadblas/quadblas.hpp"
6+
#include "../subprojects/qblas/include/quadblas/quadblas.hpp"
77
#endif // DISABLE_QUADBLAS
88

99
extern "C" {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
project('qblas', version: '1.0.0')
2+
3+
qblas_inc = include_directories('include')
4+
5+
qblas_dep = declare_dependency(
6+
include_directories: qblas_inc,
7+
version: meson.project_version()
8+
)

quaddtype/subprojects/qblas.wrap

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[wrap-git]
2+
directory=qblas
3+
url=https://github.com/SwayamInSync/QBLAS.git
4+
revision=9468e24a02b731563eba2aee0350e9219b36c102
5+
patch_directory = qblas
6+
7+
[provide]
8+
qblas = qblas_dep

0 commit comments

Comments
 (0)