Auto merge of #6 - autumnai:develop, r=hobofan

develop

.clog.toml

@@ -0,0 +1,24 @@
+[clog]
+# A repository link with the trailing '.git' which will be used to generate
+# all commit and issue links
+repository = "https://github.com/autumnai/collenchyma-blas"
+
+# specify the style of commit links to generate, defaults to "github" if omitted
+link-style = "github"
+
+# The preferred way to set a constant changelog. This file will be read for old changelog
+# data, then prepended to for new changelog data. It's the equivilant to setting
+# both infile and outfile to the same file.
+#
+# Do not use with outfile or infile fields!
+#
+# Defaults to stdout when omitted
+changelog = "CHANGELOG.md"
+
+# This sets the output format. There are two options "json" or "markdown" and
+# defaults to "markdown" when omitted
+output-format = "markdown"
+
+# If you use tags, you can set the following if you wish to only pick
+# up changes since your latest tag
+# from-latest-tag = true

CHANGELOG.md

@@ -0,0 +1,15 @@
+<a name="0.1.0"></a>
+## 0.1.0 (2015-12-16)
+
+
+#### Bug Fixes
+
+* **travis:**  require stable and beta builds to pass ([95300544](https://github.com/autumnai/collenchyma-nn/commit/95300544608310750b467f984f0506e65416f483))
+
+#### Features
+
+* **blas:**  add L1 BLAS for native ([08d1da0c](https://github.com/autumnai/collenchyma-nn/commit/08d1da0cbe86cb91c8a68a80c36dc7eb26cc9e95))
+* **features:**  add framework feature groups ([74c86c42](https://github.com/autumnai/collenchyma-nn/commit/74c86c4291da55bb48855fcb19f3791c50291874))
+
+
+

Cargo.toml

@@ -14,10 +14,15 @@ keywords        = ["blas", "collenchyma", "computation", "hpc", "plugin"]
 license         = "MIT"
 
 [dependencies]
-collenchyma = { version = "0.0.6", default-features = false }
+collenchyma = { version = "0.0.8", default-features = false }
+lazy_static = "0.1"
 
+# native
 rblas = { version = "0.0.11", optional = true }
 
+# cuda
+cublas = { version = "0.2.0", optional = true }
+
 clippy = { version = "0.0.27", optional = true }
 
 [dev-dependencies]
@@ -27,7 +32,7 @@ rand = "0.3"
 [features]
 default = ["native", "cuda", "opencl"]
 native = ["collenchyma/native", "rblas"]
-cuda = ["collenchyma/cuda"]
+cuda = ["collenchyma/cuda", "cublas"]
 opencl = ["collenchyma/opencl"]
 
 travis = ["native"]

README.md

@@ -1,21 +1,17 @@
 # collenchyma-BLAS • [![Join the chat at https://gitter.im/autumnai/collenchyma](https://img.shields.io/badge/gitter-join%20chat-brightgreen.svg)](https://gitter.im/autumnai/collenchyma?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/autumnai/collenchyma-blas.svg?branch=master)](https://travis-ci.org/autumnai/collenchyma-blas) [![Coverage Status](https://coveralls.io/repos/autumnai/collenchyma-blas/badge.svg?branch=master&service=github)](https://coveralls.io/github/autumnai/collenchyma-blas?branch=master) [![Crates.io](http://meritbadge.herokuapp.com/collenchyma-blas)](https://crates.io/crates/collenchyma-blas) [![License](https://img.shields.io/crates/l/collenchyma-blas.svg)](LICENSE)
 
-collenchyma-BLAS provides full BLAS support for [Collenchyma][collenchyma],
-so you can use BLAS operations on servers, desktops or mobiles with OpenCL, CUDA
-and common host CPU support.
+collenchyma-NN provides full BLAS support for [Collenchyma][collenchyma],
+so you can use Basic Linear Algebra Subprograms on servers, desktops or mobiles,
+GPUs, FPGAs or CPUS, without carrying about OpenCL or CUDA support on the
+machine.
 
-If you would like to write your own backend-agnostic, high-performance library, you can  
-* take this library as an example for basically copy&paste,
-* glance over the docs for a broader overview
-* and [notify us about your library][gitter-collenchyma] - we are happy to feature your Collenchyma plugin
-on the Collenchyma README.
-
-collenchyma-BLAS was started at [Autumn][autumn] to support the Machine Intelligence
-Framework [Leaf][leaf] with backend-agnostic, state-of-the-art performance.
+collenchyma-NN was started at [Autumn][autumn] for the Rust Machine Intelligence
+Framework [Leaf][leaf].
 
 For more information,
 
-* see collenchyma-BLAS's [Documentation](http://autumnai.github.io/collenchyma-blas)
+* see collenchyma-NN's [Documentation](http://autumnai.github.io/collenchyma-nn)
+* visit [Collenchyma][collenchyma] for portable operations and other Plugins.
 * or get in touch on [Twitter][twitter-autumn] or [Gitter][gitter-collenchyma]
 
 [collenchyma]: https://github.com/autumnai/collenchyma
@@ -53,6 +49,18 @@ You can also reach out to the Maintainers
 [mj]: https://twitter.com/mjhirn
 [hobofan]: https://twitter.com/hobofan
 
+## Changelog
+
+You can find the release history in the root file [CHANGELOG.md][changelog].
+
+A changelog is a log or record of all the changes made to a project, such as a website or software project, usually including such records as bug fixes, new features, etc. - [Wikipedia][changelog-quote]
+
+We are using [Clog][clog], the Rust tool for auto-generating CHANGELOG files.
+
+[changelog]: CHANGELOG.md
+[changelog-quote]: https://en.wikipedia.org/wiki/Changelog
+[Clog]: https://github.com/clog-tool/clog-cli
+
 ## License
 
 collenchyma-BLAS is released under the [MIT License][license].

benches/rblas_overhead.rs

@@ -1,5 +1,4 @@
 #![feature(test)]
-#![feature(clone_from_slice)]
 
 extern crate test;
 extern crate collenchyma as co;
@@ -8,20 +7,13 @@ extern crate rblas;
 extern crate rand;
 
 use test::Bencher;
-use co::backend::{Backend, BackendConfig};
-use co::frameworks::Native;
-use co::framework::IFramework;
-use co::tensor::SharedTensor;
+use co::prelude::*;
 use co_blas::plugin::*;
-use rblas::Dot;
 
 use rand::{thread_rng, Rng};
 
 fn backend() -> Backend<Native> {
-    let framework = Native::new();
-    let hardwares = framework.hardwares();
-    let backend_config = BackendConfig::new(framework, hardwares);
-    Backend::new(backend_config).unwrap()
+    Backend::<Native>::default().unwrap()
 }
 
 #[bench]
@@ -32,7 +24,7 @@ fn bench_1000_dot_100_rblas(b: &mut Bencher) {
 
     b.iter(|| {
         for _ in 0..1000 {
-            let res = Dot::dot(&slice_a, &slice_b);
+            let res = rblas::Dot::dot(&slice_a, &slice_b);
             test::black_box(res);
         }
     });
@@ -108,7 +100,7 @@ fn bench_100_dot_1000_rblas(b: &mut Bencher) {
 
     b.iter(|| {
         for _ in 0..100 {
-            let res = Dot::dot(&slice_a, &slice_b);
+            let res = rblas::Dot::dot(&slice_a, &slice_b);
             test::black_box(res);
         }
     });
@@ -184,7 +176,7 @@ fn bench_10_dot_10000_rblas(b: &mut Bencher) {
 
     b.iter(|| {
         for _ in 0..10 {
-            let res = Dot::dot(&slice_a, &slice_b);
+            let res = rblas::Dot::dot(&slice_a, &slice_b);
             test::black_box(res);
         }
     });
@@ -229,7 +221,7 @@ fn bench_5_dot_20000_rblas(b: &mut Bencher) {
 
     b.iter(|| {
         for _ in 0..5 {
-            let res = Dot::dot(&slice_a, &slice_b);
+            let res = rblas::Dot::dot(&slice_a, &slice_b);
             test::black_box(res);
         }
     });