Permalink
Browse files

Added the Kyoto University's credits to the source code, license, and…

… README
  • Loading branch information...
1 parent a5a3d1b commit 2b8ed90c7748ed11baaca19a8ecdacde874a167a @jj1bdx committed Jul 14, 2010
Showing with 74 additions and 50 deletions.
  1. +6 −5 LICENSE.txt
  2. +15 −2 README
  3. +17 −14 c_src/sfmt_nif.c
  4. +18 −14 c_src/sfmt_nif.h
  5. +6 −5 reference_texts/old_src/sfmt_pure.erl
  6. +6 −5 src/sfmt.erl
  7. +6 −5 src/sfmt_test.erl
View
@@ -1,6 +1,7 @@
(This is a simplified BSD license.)
-Copyright (c) 2010 Kenji Rikitake. All rights reserved.
+Copyright (c) 2010 Kenji Rikitake and Kyoto University. All rights
+reserved.
Copyright (c) 2006,2007 Mutsuo Saito, Makoto Matsumoto and Hiroshima
University. All rights reserved.
@@ -15,10 +16,10 @@ met:
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
- * Neither the name of the Hiroshima University nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
+ * Neither the names of the Hiroshima University and the Kyoto
+ University 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
View
17 README
@@ -1,11 +1,12 @@
sfmt-erlang: SIMD-oriented Fast Mersenne Twister (SFMT) for Erlang
-Edited and written by Kenji Rikitake
+Edited and written by Kenji Rikitake (Kyoto University)
Email contact: kenji.rikitake AT acm.org
(change AT to @ for the email address)
Version 0.3.1_RELEASE 13-JUL-2010
-Copyright (c) 2010 Kenji Rikitake. All rights reserved.
+Copyright (c) 2010 Kenji Rikitake and Kyoto University. All rights
+reserved.
Copyright (c) 2006,2007 Mutsuo Saito, Makoto Matsumoto and Hiroshima
University. All rights reserved.
@@ -34,6 +35,12 @@ Makoto Matsumoto (Hiroshima University)
* Tested on FreeBSD/i386 7.3-RELEASE with Erlang/OTP R14A.
+* Also tested on RedHat Enterprise Linux AS V4 of x86_64
+ (AMD Opteron x 4 (16 cores))
+ with Erlang/OTP R14A compiled by gcc 3.4.6
+ (on the Thin Cluster of
+ the Kyoto University ACCMS Supercomputer System.)
+
* The build script is Basho's rebar at
http://hg.basho.com/rebar/
(which requires Erlang/OTP to run)
@@ -65,4 +72,10 @@ Makoto Matsumoto (Hiroshima University)
* Tim Bates, for random_mt.erl implementation of Mersenne Twister
* Dan Gudmundsson for the code improvement
+* ACKNOWLEDGMENT
+
+ * During the compatibility test of this software, Kenji Rikitake
+ used the supercomputer service provided by Academic Center for
+ Computing and Media Studies (ACCMS), Kyoto University.
+
[End of README]
View
@@ -1,26 +1,28 @@
/* sfmt_nif.c: C NIF SFMT API functions for Erlang */
/* based on SFMT-1.3.3 and sfmt-extstate 0.1.0_RELEASE */
/*
- Copyright (c) 2010 Kenji Rikitake. All rights reserved.
+ Copyright (c) 2010 Kenji Rikitake and Kyoto University. All rights
+ reserved.
+
Copyright (c) 2006,2007 Mutsuo Saito, Makoto Matsumoto and Hiroshima
University. All rights reserved.
-
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * 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.
- * Neither the name of the Hiroshima University nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * 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.
+ * Neither the names of the Hiroshima University and the Kyoto
+ University 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
@@ -32,6 +34,7 @@
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.
+
*/
#include <stdlib.h>
View
@@ -1,25 +1,28 @@
/* sfmt_nif.h: common header file for C NIF SFMT for Erlang */
+
/*
- Copyright (c) 2010 Kenji Rikitake. All rights reserved.
+ Copyright (c) 2010 Kenji Rikitake and Kyoto University. All rights
+ reserved.
+
Copyright (c) 2006,2007 Mutsuo Saito, Makoto Matsumoto and Hiroshima
University. All rights reserved.
-
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * 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.
- * Neither the name of the Hiroshima University nor the names of
- its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * 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.
+ * Neither the names of the Hiroshima University and the Kyoto
+ University 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
@@ -31,6 +34,7 @@
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.
+
*/
#ifndef SFMT_NIF_H
@@ -2,7 +2,8 @@
%% SIMD-oriented Fast Mersenne Twister (SFMT)
%% in pure Erlang
-%% Copyright (c) 2010 Kenji Rikitake. All rights reserved.
+%% Copyright (c) 2010 Kenji Rikitake and Kyoto University. All rights
+%% reserved.
%%
%% Copyright (c) 2006,2007 Mutsuo Saito, Makoto Matsumoto and Hiroshima
%% University. All rights reserved.
@@ -17,10 +18,10 @@
%% copyright notice, this list of conditions and the following
%% disclaimer in the documentation and/or other materials provided
%% with the distribution.
-%% * Neither the name of the Hiroshima University nor the names of
-%% its contributors may be used to endorse or promote products
-%% derived from this software without specific prior written
-%% permission.
+%% * Neither the names of the Hiroshima University and the Kyoto
+%% University 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
View
@@ -1,7 +1,8 @@
%% Module sfmt
%% SIMD-oriented Fast Mersenne Twister (SFMT)
-%% Copyright (c) 2010 Kenji Rikitake. All rights reserved.
+%% Copyright (c) 2010 Kenji Rikitake and Kyoto University. All rights
+%% reserved.
%%
%% Copyright (c) 2006,2007 Mutsuo Saito, Makoto Matsumoto and Hiroshima
%% University. All rights reserved.
@@ -16,10 +17,10 @@
%% copyright notice, this list of conditions and the following
%% disclaimer in the documentation and/or other materials provided
%% with the distribution.
-%% * Neither the name of the Hiroshima University nor the names of
-%% its contributors may be used to endorse or promote products
-%% derived from this software without specific prior written
-%% permission.
+%% * Neither the names of the Hiroshima University and the Kyoto
+%% University 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
View
@@ -1,6 +1,7 @@
%% Module sfmt_test (testing sfmt module)
-%% Copyright (c) 2010 Kenji Rikitake. All rights reserved.
+%% Copyright (c) 2010 Kenji Rikitake and Kyoto University. All rights
+%% reserved.
%%
%% Copyright (c) 2006,2007 Mutsuo Saito, Makoto Matsumoto and Hiroshima
%% University. All rights reserved.
@@ -15,10 +16,10 @@
%% copyright notice, this list of conditions and the following
%% disclaimer in the documentation and/or other materials provided
%% with the distribution.
-%% * Neither the name of the Hiroshima University nor the names of
-%% its contributors may be used to endorse or promote products
-%% derived from this software without specific prior written
-%% permission.
+%% * Neither the names of the Hiroshima University and the Kyoto
+%% University 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

0 comments on commit 2b8ed90

Please sign in to comment.