Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add mir-lapack dependency #106

Merged
merged 1 commit into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/d.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,16 @@ jobs:
- name: Run tests with coverage
run: dub -q test --build=unittest-cov

- name: Install Lapack
if: contains( matrix.os, 'ubuntu')
run: |
sudo apt-get update
sudo apt-get install libopenblas-dev
shell: bash

- name: Run Blas Tests with coverage
if: contains( matrix.os, 'ubuntu')
run: dub -q test --build=unittest-cov-blas --config=openblas

- name: Codecov
uses: codecov/[email protected]
115 changes: 115 additions & 0 deletions dub.sdl
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ dependency "mir-algorithm" version=">=3.20.1"

toolchainRequirements frontend=">=2.097"

configuration "library" {
targetType "library"
# default or user specified mir-lapack sub-configuration is used
}
buildType "unittest" {
buildOptions "unittests" "debugMode" "debugInfo"
versions "mir_stat_test"
Expand Down Expand Up @@ -51,3 +55,114 @@ buildType "unittest-release" {
configuration "dips" {
dflags "-preview=dip1000" "-preview=dip1008"
}

// lubeck-related configurations
buildType "unittest-blas" {
buildOptions "unittests" "debugMode" "debugInfo"
versions "mir_stat_test_blas"
dflags "-lowmem"
}
buildType "unittest-cov-blas" {
buildOptions "unittests" "coverage" "debugMode" "debugInfo"
versions "mir_stat_test_blas"
dflags "-lowmem"
}
configuration "openblas" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "openblas"
}

configuration "threelib" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "threelib"
}

configuration "cblas" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "cblas"
}

configuration "blas" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "blas"
}

configuration "lapack" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "lapack"
}

configuration "mkl-sequential" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "mkl-sequential"
}

configuration "mkl-sequential-ilp" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "mkl-sequential-ilp"
}

configuration "mkl-tbb-thread" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "mkl-tbb-thread"
}

configuration "mkl-tbb-thread-ilp" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "mkl-tbb-thread-ilp"
}

configuration "mkl-sequential-dll" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "mkl-sequential-dll"
}

configuration "mkl-sequential-ilp-dll" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "mkl-sequential-ilp-dll"
}

configuration "mkl-tbb-thread-dll" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "mkl-tbb-thread-dll"
}

configuration "mkl-tbb-thread-ilp-dll" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "mkl-tbb-thread-ilp-dll"
}

configuration "zerolib" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "zerolib"
}

configuration "unittest-openblas" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "openblas"
}

configuration "unittest-threelib" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "threelib"
}

configuration "unittest-cblas" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "cblas"
}

configuration "unittest-blas" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "blas"
}

configuration "unittest-lapack" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "lapack"
}

configuration "unittest-mkl-sequential" {
dependency "mir-lapack" version=">=1.2.9"
subConfiguration "mir-lapack" "mkl-sequential"
}
16 changes: 14 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
project('mir-stat', 'd', version : '0.1.6', license: 'BSL-1.0')
project('mir-stat', 'd', version : '0.3.1', license: 'Apache-2.0')

description = 'Dlang Statistical Package'

subprojects = ['mir-core', 'mir-algorithm']
subprojects = [
'cblas-d',
'lapack-d',
'mir-algorithm',
'mir-blas',
'mir-core',
'mir-lapack',
'mir-random',
]

if target_machine.system() == 'linux'
subprojects += 'mir-linux-kernel'
endif

has_cpp_headers = false

Expand Down
18 changes: 18 additions & 0 deletions source/mir/math/internal/linearAlgebra.d
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/++
License: $(HTTP www.apache.org/licenses/LICENSE-2.0, Apache-2.0)

Authors: John Michael Hall

Copyright: 2023 Mir Stat Authors.

+/

module mir.math.internal.linearAlgebra;

version(mir_stat_test_blas)
@safe pure nothrow @nogc
unittest
{
import mir.lapack;
}

4 changes: 4 additions & 0 deletions subprojects/cblas-d.wrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[wrap-git]
directory=cblas-d
url=https://github.com/DlangScience/cblas.git
revision=head
4 changes: 4 additions & 0 deletions subprojects/lapack-d.wrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[wrap-git]
directory=lapack-d
url=https://github.com/libmir/lapack.git
revision=head
4 changes: 4 additions & 0 deletions subprojects/mir-blas.wrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[wrap-git]
directory=mir-blas
url=https://github.com/libmir/mir-blas.git
revision=head
4 changes: 4 additions & 0 deletions subprojects/mir-lapack.wrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[wrap-git]
directory=mir-lapack
url=https://github.com/libmir/mir-lapack.git
revision=head
4 changes: 4 additions & 0 deletions subprojects/mir-linux-kernel.wrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[wrap-git]
directory=mir-linux-kernel
url=https://github.com/libmir/mir-linux-kernel.git
revision=head
4 changes: 4 additions & 0 deletions subprojects/mir-random.wrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[wrap-git]
directory=mir-random
url=https://github.com/libmir/mir-random.git
revision=head