From d6116f7fe80e62a604d52eb9b50db4a60da8837c Mon Sep 17 00:00:00 2001 From: Tom Deakin Date: Thu, 30 Jul 2015 13:57:00 +0100 Subject: [PATCH] Update License --- LICENSE | 62 ++++++++++++++++++++++++------------------- common.cpp | 36 +++++++++++++++++++++++++ common.h | 36 +++++++++++++++++++++++++ cuda-stream.cu | 36 +++++++++++++++++++++++++ ocl-stream-kernels.cl | 36 +++++++++++++++++++++++++ ocl-stream.cpp | 36 +++++++++++++++++++++++++ 6 files changed, 215 insertions(+), 27 deletions(-) diff --git a/LICENSE b/LICENSE index 05c866f4..8b4feaa5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,27 +1,35 @@ -Copyright (c) 2015, Tom Deakin and Simon McIntosh-Smith, -University of Bristol. 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 names of the copyright holders 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. +*============================================================================== +*------------------------------------------------------------------------------ +* Copyright 2015: Tom Deakin, Simon McIntosh-Smith, University of Bristol HPC +* Based on John D. McCalpin’s original STREAM benchmark for CPUs +*------------------------------------------------------------------------------ +* License: +* 1. You are free to use this program and/or to redistribute +* this program. +* 2. You are free to modify this program for your own use, +* including commercial use, subject to the publication +* restrictions in item 3. +* 3. You are free to publish results obtained from running this +* program, or from works that you derive from this program, +* with the following limitations: +* 3a. In order to be referred to as "GPU-STREAM benchmark results", +* published results must be in conformance to the GPU-STREAM +* Run Rules published at +* http://github.com/UoB-HPC/GPU-STREAM/wiki/Run-Rules +* and incorporated herein by reference. +* The copyright holders retain the +* right to determine conformity with the Run Rules. +* 3b. Results based on modified source code or on runs not in +* accordance with the GPU-STREAM Run Rules must be clearly +* labelled whenever they are published. Examples of +* proper labelling include: +* "tuned GPU-STREAM benchmark results" +* "based on a variant of the GPU-STREAM benchmark code" +* Other comparable, clear and reasonable labelling is +* acceptable. +* 3c. Submission of results to the GPU-STREAM benchmark web site +* is encouraged, but not required. +* 4. Use of this program or creation of derived works based on this +* program constitutes acceptance of these licensing restrictions. +* 5. Absolutely no warranty is expressed or implied. +*———————————————————————————————————------------------------------------------- diff --git a/common.cpp b/common.cpp index 22d1a015..cbea9942 100644 --- a/common.cpp +++ b/common.cpp @@ -1,3 +1,39 @@ +/*============================================================================= +*------------------------------------------------------------------------------ +* Copyright 2015: Tom Deakin, Simon McIntosh-Smith, University of Bristol HPC +* Based on John D. McCalpin’s original STREAM benchmark for CPUs +*------------------------------------------------------------------------------ +* License: +* 1. You are free to use this program and/or to redistribute +* this program. +* 2. You are free to modify this program for your own use, +* including commercial use, subject to the publication +* restrictions in item 3. +* 3. You are free to publish results obtained from running this +* program, or from works that you derive from this program, +* with the following limitations: +* 3a. In order to be referred to as "GPU-STREAM benchmark results", +* published results must be in conformance to the GPU-STREAM +* Run Rules published at +* http://github.com/UoB-HPC/GPU-STREAM/wiki/Run-Rules +* and incorporated herein by reference. +* The copyright holders retain the +* right to determine conformity with the Run Rules. +* 3b. Results based on modified source code or on runs not in +* accordance with the GPU-STREAM Run Rules must be clearly +* labelled whenever they are published. Examples of +* proper labelling include: +* "tuned GPU-STREAM benchmark results" +* "based on a variant of the GPU-STREAM benchmark code" +* Other comparable, clear and reasonable labelling is +* acceptable. +* 3c. Submission of results to the GPU-STREAM benchmark web site +* is encouraged, but not required. +* 4. Use of this program or creation of derived works based on this +* program constitutes acceptance of these licensing restrictions. +* 5. Absolutely no warranty is expressed or implied. +*———————————————————————————————————-----------------------------------------*/ + #include "common.h" int ARRAY_SIZE = 50000000; diff --git a/common.h b/common.h index 0c9799ab..220c7a37 100644 --- a/common.h +++ b/common.h @@ -1,3 +1,39 @@ +/*============================================================================= +*------------------------------------------------------------------------------ +* Copyright 2015: Tom Deakin, Simon McIntosh-Smith, University of Bristol HPC +* Based on John D. McCalpin’s original STREAM benchmark for CPUs +*------------------------------------------------------------------------------ +* License: +* 1. You are free to use this program and/or to redistribute +* this program. +* 2. You are free to modify this program for your own use, +* including commercial use, subject to the publication +* restrictions in item 3. +* 3. You are free to publish results obtained from running this +* program, or from works that you derive from this program, +* with the following limitations: +* 3a. In order to be referred to as "GPU-STREAM benchmark results", +* published results must be in conformance to the GPU-STREAM +* Run Rules published at +* http://github.com/UoB-HPC/GPU-STREAM/wiki/Run-Rules +* and incorporated herein by reference. +* The copyright holders retain the +* right to determine conformity with the Run Rules. +* 3b. Results based on modified source code or on runs not in +* accordance with the GPU-STREAM Run Rules must be clearly +* labelled whenever they are published. Examples of +* proper labelling include: +* "tuned GPU-STREAM benchmark results" +* "based on a variant of the GPU-STREAM benchmark code" +* Other comparable, clear and reasonable labelling is +* acceptable. +* 3c. Submission of results to the GPU-STREAM benchmark web site +* is encouraged, but not required. +* 4. Use of this program or creation of derived works based on this +* program constitutes acceptance of these licensing restrictions. +* 5. Absolutely no warranty is expressed or implied. +*———————————————————————————————————-----------------------------------------*/ + #include #include #include diff --git a/cuda-stream.cu b/cuda-stream.cu index 9f2a1d6d..1e929815 100644 --- a/cuda-stream.cu +++ b/cuda-stream.cu @@ -1,3 +1,39 @@ +/*============================================================================= +*------------------------------------------------------------------------------ +* Copyright 2015: Tom Deakin, Simon McIntosh-Smith, University of Bristol HPC +* Based on John D. McCalpin’s original STREAM benchmark for CPUs +*------------------------------------------------------------------------------ +* License: +* 1. You are free to use this program and/or to redistribute +* this program. +* 2. You are free to modify this program for your own use, +* including commercial use, subject to the publication +* restrictions in item 3. +* 3. You are free to publish results obtained from running this +* program, or from works that you derive from this program, +* with the following limitations: +* 3a. In order to be referred to as "GPU-STREAM benchmark results", +* published results must be in conformance to the GPU-STREAM +* Run Rules published at +* http://github.com/UoB-HPC/GPU-STREAM/wiki/Run-Rules +* and incorporated herein by reference. +* The copyright holders retain the +* right to determine conformity with the Run Rules. +* 3b. Results based on modified source code or on runs not in +* accordance with the GPU-STREAM Run Rules must be clearly +* labelled whenever they are published. Examples of +* proper labelling include: +* "tuned GPU-STREAM benchmark results" +* "based on a variant of the GPU-STREAM benchmark code" +* Other comparable, clear and reasonable labelling is +* acceptable. +* 3c. Submission of results to the GPU-STREAM benchmark web site +* is encouraged, but not required. +* 4. Use of this program or creation of derived works based on this +* program constitutes acceptance of these licensing restrictions. +* 5. Absolutely no warranty is expressed or implied. +*———————————————————————————————————-----------------------------------------*/ + #include #include diff --git a/ocl-stream-kernels.cl b/ocl-stream-kernels.cl index 971d852b..79377eb3 100644 --- a/ocl-stream-kernels.cl +++ b/ocl-stream-kernels.cl @@ -1,3 +1,39 @@ +/*============================================================================= +*------------------------------------------------------------------------------ +* Copyright 2015: Tom Deakin, Simon McIntosh-Smith, University of Bristol HPC +* Based on John D. McCalpin’s original STREAM benchmark for CPUs +*------------------------------------------------------------------------------ +* License: +* 1. You are free to use this program and/or to redistribute +* this program. +* 2. You are free to modify this program for your own use, +* including commercial use, subject to the publication +* restrictions in item 3. +* 3. You are free to publish results obtained from running this +* program, or from works that you derive from this program, +* with the following limitations: +* 3a. In order to be referred to as "GPU-STREAM benchmark results", +* published results must be in conformance to the GPU-STREAM +* Run Rules published at +* http://github.com/UoB-HPC/GPU-STREAM/wiki/Run-Rules +* and incorporated herein by reference. +* The copyright holders retain the +* right to determine conformity with the Run Rules. +* 3b. Results based on modified source code or on runs not in +* accordance with the GPU-STREAM Run Rules must be clearly +* labelled whenever they are published. Examples of +* proper labelling include: +* "tuned GPU-STREAM benchmark results" +* "based on a variant of the GPU-STREAM benchmark code" +* Other comparable, clear and reasonable labelling is +* acceptable. +* 3c. Submission of results to the GPU-STREAM benchmark web site +* is encouraged, but not required. +* 4. Use of this program or creation of derived works based on this +* program constitutes acceptance of these licensing restrictions. +* 5. Absolutely no warranty is expressed or implied. +*———————————————————————————————————-----------------------------------------*/ + #ifdef FLOAT #define DATATYPE float diff --git a/ocl-stream.cpp b/ocl-stream.cpp index 1cd46f45..70d9c29e 100644 --- a/ocl-stream.cpp +++ b/ocl-stream.cpp @@ -1,3 +1,39 @@ +/*============================================================================= +*------------------------------------------------------------------------------ +* Copyright 2015: Tom Deakin, Simon McIntosh-Smith, University of Bristol HPC +* Based on John D. McCalpin’s original STREAM benchmark for CPUs +*------------------------------------------------------------------------------ +* License: +* 1. You are free to use this program and/or to redistribute +* this program. +* 2. You are free to modify this program for your own use, +* including commercial use, subject to the publication +* restrictions in item 3. +* 3. You are free to publish results obtained from running this +* program, or from works that you derive from this program, +* with the following limitations: +* 3a. In order to be referred to as "GPU-STREAM benchmark results", +* published results must be in conformance to the GPU-STREAM +* Run Rules published at +* http://github.com/UoB-HPC/GPU-STREAM/wiki/Run-Rules +* and incorporated herein by reference. +* The copyright holders retain the +* right to determine conformity with the Run Rules. +* 3b. Results based on modified source code or on runs not in +* accordance with the GPU-STREAM Run Rules must be clearly +* labelled whenever they are published. Examples of +* proper labelling include: +* "tuned GPU-STREAM benchmark results" +* "based on a variant of the GPU-STREAM benchmark code" +* Other comparable, clear and reasonable labelling is +* acceptable. +* 3c. Submission of results to the GPU-STREAM benchmark web site +* is encouraged, but not required. +* 4. Use of this program or creation of derived works based on this +* program constitutes acceptance of these licensing restrictions. +* 5. Absolutely no warranty is expressed or implied. +*———————————————————————————————————-----------------------------------------*/ + #include #include