Skip to content

Commit

Permalink
Cleanup of txt not in the spirit of the clMath Apache license
Browse files Browse the repository at this point in the history
  • Loading branch information
Kent Knox committed Sep 12, 2013
1 parent 8506ac0 commit 137cf48
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 40 deletions.
31 changes: 0 additions & 31 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -171,34 +171,3 @@ For example:
./clfft.Sample -iv
- Watch for the version strings to print out; watch for
'Client Test *****PASS*****' to print out.
_______________________________________________________________________________
(C) 2010-2013 Advanced Micro Devices, Inc. All rights reserved. AMD, the AMD
Arrow logo, ATI, the ATI logo, Radeon, FireStream, FireGL, Catalyst, and
combinations thereof are trademarks of Advanced Micro Devices, Inc. Microsoft
(R), Windows, and Windows Vista (R) are registered trademarks of Microsoft
Corporation in the U.S. and/or other jurisdictions. OpenCL and the OpenCL logo
are trademarks of Apple Inc. used by permission by Khronos. Other names are for
informational purposes only and may be trademarks of their respective owners.

The contents of this document are provided in connection with Advanced Micro
Devices, Inc. ("AMD") products. AMD makes no representations or warranties with
respect to the accuracy or completeness of the contents of this publication and
reserves the right to make changes to specifications and product descriptions
at any time without notice. The information contained herein may be of a
preliminary or advance nature and is subject to change without notice. No
license, whether express, implied, arising by estoppel or otherwise, to any
intellectual property rights is granted by this publication. Except as set forth
in AMD's Standard Terms and Conditions of Sale, AMD assumes no liability
whatsoever, and disclaims any express or implied warranty, relating to its
products including, but not limited to, the implied warranty of
merchantability, fitness for a particular purpose, or infringement of any
intellectual property right.

AMD's products are not designed, intended, authorized or warranted for use as
components in systems intended for surgical implant into the body, or in other
applications intended to support or sustain life, or in any other application
in which the failure of AMD's product could create a situation where personal
injury, death, or severe property or environmental damage may occur. AMD
reserves the right to discontinue or make changes to its products at any time
without notice.
_______________________________________________________________________________
18 changes: 15 additions & 3 deletions src/client/CMakeLists.pack
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
#############################################################################
## Copyright (C) 2010,2011 Advanced Micro Devices, Inc. All Rights Reserved.
#############################################################################
# ########################################################################
# Copyright 2013 Advanced Micro Devices, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ########################################################################
cmake_minimum_required( VERSION 2.6 )
project( clFFT.Sample )

Expand Down
4 changes: 0 additions & 4 deletions src/library/generator.transpose.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
* limitations under the License.
* ************************************************************************/

////////////////////////////////////////////
// Copyright (C) 2011 Advanced Micro Devices, Inc. All Rights Reserved.
////////////////////////////////////////////

#pragma once
#if !defined( AMD_CLFFT_generator_transpose_H )
#define AMD_CLFFT_generator_transpose_H
Expand Down
20 changes: 18 additions & 2 deletions src/library/repo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,24 @@ clfftStatus FFTRepo::setProgramCode( const clfftGenerators gen, const FFTKernelG

// Prefix copyright statement at the top of generated kernels
std::stringstream ss;
ss << std::endl << std::endl;
ss << "// Copyright (C) 2010-2013 Advanced Micro Devices, Inc. All Rights Reserved." << std::endl << std::endl;
ss <<
"/* ************************************************************************\n"
" * Copyright 2013 Advanced Micro Devices, Inc.\n"
" *\n"
" * Licensed under the Apache License, Version 2.0 (the \"License\");\n"
" * you may not use this file except in compliance with the License.\n"
" * You may obtain a copy of the License at\n"
" *\n"
" * http://www.apache.org/licenses/LICENSE-2.0\n"
" *\n"
" * Unless required by applicable law or agreed to in writing, software\n"
" * distributed under the License is distributed on an \"AS IS\" BASIS,\n"
" * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n"
" * See the License for the specific language governing permissions and\n"
" * limitations under the License.\n"
" * ************************************************************************/"
<< std::endl << std::endl;

std::string prefixCopyright = ss.str();

mapFFTs[ key ].ProgramString = prefixCopyright + kernel;
Expand Down

0 comments on commit 137cf48

Please sign in to comment.