diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..aeec42d --- /dev/null +++ b/LICENSE @@ -0,0 +1,14 @@ +SCALACL LICENSE + +Copyright (c) 2010-2015 Olivier Chafik, unless otherwise specified. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + + 3. Neither the name of Scalaxy nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md index 2f38299..f2ca4f8 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ -[![Build Status](https://travis-ci.org/nativelibs4java/ScalaCL.svg?branch=feature_travis-build)](https://travis-ci.org/nativelibs4java/ScalaCL) [![Join the chat at https://gitter.im/nativelibs4java/ScalaCL](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/nativelibs4java/ScalaCL?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -ScalaCL... v3 (yeah, yet another rewrite from scratch FTW!) +[![Build Status](https://travis-ci.org/nativelibs4java/ScalaCL.svg?branch=master)](https://travis-ci.org/nativelibs4java/ScalaCL) [![Join the chat at https://gitter.im/nativelibs4java/ScalaCL](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/nativelibs4java/ScalaCL?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -BARELY FUNCTIONAL YET, WORK IN PROGRESS (see [ScalaCL](https://code.google.com/p/scalacl/) if you want something that _works_, albeit only on Scala 2.9.x). +ScalaCL lets you run Scala code on GPUs through OpenCL ([BSD-licensed](./LICENSE)). -Features of the new design: +WORK IN PROGRESS (see [ScalaCL](https://code.google.com/p/scalacl/) if you want something that _works_, albeit only on Scala 2.9.x). + +See [slides from ScalaCL + Reified talk @ scala.io 2013](https://docs.google.com/presentation/d/1R61HTC6HMzmv7y6UqCSmVhy7kNk04l9cDg2vYHECZ98/edit#slide=id.g243771a0_0396). + +Features of the new design (v3, rewritten from scratch again!): - Much better asynchronicity support (now requires OpenCL 1.1), and much better performance in general - Support for captures of constants *and* OpenCL arrays - Support for lazy clones for fast zipping diff --git a/project/ScalaCLBuild.scala b/project/ScalaCLBuild.scala index a65620e..bb5290b 100644 --- a/project/ScalaCLBuild.scala +++ b/project/ScalaCLBuild.scala @@ -154,8 +154,8 @@ object ScalaCLBuild extends Build { List( ( "com.nativelibs4java" %% "scalaxy-streams" % "0.4-SNAPSHOT", - "../Scalaxy", - "git://github.com/nativelibs4java/Scalaxy.git" + "../scalaxy-streams", + "git://github.com/nativelibs4java/scalaxy-streams.git" ), ( "com.nativelibs4java" %% "scalaxy-reified" % "0.4-SNAPSHOT",