[Scipy-svn] r4153 - trunk/scipy/weave

[scipy-svn at scipy.org]

Author: jarrod.millman
Date: 2008-04-20 03:27:24 -0500 (Sun, 20 Apr 2008)
New Revision: 4153

Modified:
   trunk/scipy/weave/LICENSE.txt
Log:
Todd Veldhuizen has permitted us to release blitz++ under the BSD license


Modified: trunk/scipy/weave/LICENSE.txt
===================================================================
--- trunk/scipy/weave/LICENSE.txt	2008-04-18 19:03:29 UTC (rev 4152)
+++ trunk/scipy/weave/LICENSE.txt	2008-04-20 08:27:24 UTC (rev 4153)
@@ -1,11 +1,57 @@
 weave is distributed under the same license as SciPy which uses a BSD Style 
-license.  weave also includes CXX by Paul Dubois, portions of SCXX by
-Gordon McMillan, and blitz++ by Todd Veldhuizen.  The licenses for all of
-these packages are different, but allow free use for both commercial and
-non-commercial purposes.  The licenses for each are listed below:
+license.  weave includes blitz++ by Todd Veldhuizen who kindly granted us
+permission to use blitz++ with the regular SciPy license (i.e., the revised
+BSD license).  For more details see the email exchange below:
 
 -------------------------------------------------------------------------
+Todd Veldhuizen <tveldhui AT gmail DOT com> Tue, Mar 25, 2008 at 11:55 AM
+To: Jarrod Millman <millman AT berkeley DOT edu>
+Cc: Julian Cummings <cummings AT cacr DOT caltech DOT edu>, Todd Veldhuizen
+<tveldhui AT acm DOT org>
 
+I have no objections to releasing it under a BSD license.
+
+best
+Todd
+
+On 21/03/2008, Jarrod Millman <millman AT berkeley DOT edu> wrote:
+> Julian and Todd,
+>
+>  I'm writing to see if we can get an exception to the Blitz license so
+>  that it can be released with a BSD license within SciPy.  Currently,
+>  the Fedora project is classifying the entire SciPy package as GPLed
+>  because one package, scipy.weave, uses blitz. (the rest of the code is
+>  all BSD).  We were about to launch into the re-factoring step to make
+>  the blitz portion optional, when it occurred to us to just ask you
+>  guys first. :-)
+>
+>  Blitz is included in the scipy.weave package which allows you to
+>  inline C/C++ within Python.  Users have the option of converting NumPy
+>  arrays to blitz arrays for use in C++.  There is also a function
+>  (weave.blitz) that will automatically convert NumPy expressions in
+>  Python to Blitz expressions in C++.  Often this shows notable speed
+>  improvements.  Our re-factoring step will require us to split the
+>  blitz code into the blitz and non-blitz portions.  This is a bit of a
+>  pain, and ends up with more installation issues than if we didn't do
+>  it.
+>
+>  Thanks for your consideration,
+>
+>  --
+>  Jarrod Millman
+>  Computational Infrastructure for Research Labs
+>  10 Giannini Hall, UC Berkeley
+>  phone: 510.643.4014
+>  http://cirl.berkeley.edu/
+-------------------------------------------------------------------------
+
+weave also includes CXX by Paul Dubois, portions of SCXX by Gordon McMillan.
+The licenses for CXX and SCXX are different, but allow free use for
+both commercial and non-commercial purposes.  The licenses for each are
+listed below:
+
+-------------------------------------------------------------------------
+
 SciPy License
 
 Copyright (c) 2001, Enthought, Inc.
@@ -81,93 +127,3 @@
 
 copyright 1999 McMillan Enterprises, Inc.
 www.mcmillan-inc.com
-
--------------------------------------------------------------------------
-
-Blitz License
-
-The `Blitz++ Artistic License'
-(with thanks and apologies to authors of the Perl Artistic License)
-
-Preamble
-
-The intent of this document is to state the conditions under which 
-Blitz++ may be copied, such that the authors maintains some
-semblance of artistic control over the development of the package,
-while giving the users of the package the right to use and
-distribute Blitz++ in a more-or-less customary fashion, plus the
-right to make reasonable modifications.
-
-Definitions
-
-`Library' refers to the collection of files distributed by the
-Copyright Holder, and derivatives of that collection of files
-created through textual modification.
-
-`Standard Version' refers to such a Library if it has not been
-modified, or has been modified in accordance with the wishes of the
-Copyright Holder as specified below.
-
-Copyright Holder' is whoever is named in the copyright or
-copyrights for the package.
-
-`You' is you, if you're thinking about copying, modifying or
-distributing this Library.
-
-`Freely Available' means that no fee is charged for the item.
-It also means that recipients of the item may redistribute it 
-under the same conditions they received it.
-
-``Reasonable copying fee'' is whatever you can justify on the basis
-of media cost, duplication charges, time of people involved, and so
-on. (You will not be required to justify it to the Copyright Holder,
-but only to the computing community at large as a market that must
-bear the fee.)
-
-1. You may make and give away verbatim copies of the 
-Standard Version of this Library without restriction, provided that
-you duplicate all of the original copyright notices, this license,
-and associated disclaimers. 
-
-2. The Standard Version of the Library may be distributed as part
-of a collection of software, provided no more than a reasonable
-copying fee is charged for the software collection.
-
-3. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder. A
-Library modified in such a way shall still be considered the
-Standard Version.
-
-4. You may otherwise modify your copy of this Library in any way,
-provided that you insert a prominent notice in each changed file
-stating how and when you changed that file, and provided that you do
-at least ONE of the following:
-
-a. place your modifications in the Public Domain or otherwise
-make them Freely Available, such as by posting said
-modifications to the Blitz++ development list, 
-and allowing the Copyright Holder to include
-your modifications in the Standard Version of the Library.
-
-b. use the modified Library only within your corporation or
-organization. 
-
-c. make other distribution arrangements with the Copyright
-Holder.
-
-5. You may distribute programs which use this Library
-in object code or executable form without restriction.
-
-6. Any object code generated as a result of using this Library 
-does not fall under the copyright of this Library, but
-belongs to whomever generated it, and may be sold commercially.
-
-7. The name of the Copyright Holder or the Library may not be used to 
-endorse or promote products derived from this software without 
-specific prior written permission.
-
-8. THIS PACKAGE IS PROVIDED `AS IS' AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-