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

Ehnance testing adding owl-top and owl-zoo #31

Draft
wants to merge 22 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 3 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
28 changes: 16 additions & 12 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,25 +45,29 @@ jobs:
with:
ocaml-version: ${{ matrix.ocaml-version }}

- name: Use GCC on osx
if: ${{ matrix.os == 'macos-latest' }}
env:
CC: gcc

- name: Install openblas on windows
if: ${{ runner.os == 'Windows' }}
run: |
echo pwd
git clone https://github.com/xianyi/OpenBLAS.git || true
cd OpenBLAS
make CC=x86_64-w64-mingw32-gcc FC=x86_64-w64-mingw32-gfortran
make CC=x86_64-w64-mingw32-gcc FC=x86_64-w64-mingw32-gfortran PREFIX=/usr/x86_64-w64-mingw32/sys-root/mingw install

- name: Install dependencies
run: |
opam pin add eigen.dev . -n
opam depext eigen
opam depext eigen owl owl-top owl-zoo
opam install eigen --deps-only

- name: Build project
run: opam exec -- dune build -p eigen

- name: Install openblas on windows
if: ${{ runner.os == 'Windows' }}
run: |
echo pwd
git clone https://github.com/xianyi/OpenBLAS.git || true
cd OpenBLAS
make CC=x86_64-w64-mingw32-gcc FC=x86_64-w64-mingw32-gfortran TARGET=HASWELL
make CC=x86_64-w64-mingw32-gcc FC=x86_64-w64-mingw32-gfortran TARGET=HASWELL PREFIX=/usr/x86_64-w64-mingw32/sys-root/mingw install

- name: Build and test owl
run: |
opam depext owl
opam install -t owl
opam install -t owl owl-top owl-zoo
8 changes: 8 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# 0.4.0 (12-11-2020)

* Fix bug in linking cmxs files ([#27](https://github.com/owlbarn/eigen/issues/27) @nojb @nilsbecker @dbuenzli)

# 0.3.0 (22-10-2020)

* Release 0.3.0, windows compatibility (thanks to @kkirstein)

1 change: 1 addition & 0 deletions eigen/dune
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,6 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
(include_dirs ../eigen_cpp/lib)
(flags :standard %s)
)
(c_library_flags :standard -lstdc++)
)
|} eigen_flags
2 changes: 2 additions & 0 deletions test/dune-project
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
(lang dune 2.7)
(name test)
11 changes: 11 additions & 0 deletions test/test/byte.ml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
open Owl

let x = Mat.uniform 3 4
let y = Mat.uniform 4 5

let z1 = Mat.dot x y
let z2 = Arr.contract2 [|(1,0)|] x y

let () =
let open Owl.Dense.Ndarray.Generic in
Format.printf "%a %a" pp_dsnda z1 pp_dsnda z2
11 changes: 11 additions & 0 deletions test/test/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
(test
(name native)
(modules native)
(libraries owl)
(modes native))

(test
(name byte)
(modules byte)
(libraries owl)
(modes byte))
11 changes: 11 additions & 0 deletions test/test/native.ml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
open Owl

let x = Mat.uniform 3 4
let y = Mat.uniform 4 5

let z1 = Mat.dot x y
let z2 = Arr.contract2 [|(1,0)|] x y

let () =
let open Owl.Dense.Ndarray.Generic in
Format.printf "%a %a" pp_dsnda z1 pp_dsnda z2