Skip to content

O
opencv
Commit 39373cd9 authored by Anatoly Baksheev's avatar Anatoly Baksheev
Browse files
Options

minor update of device layer

parent c19f8885
Show whitespace changes
Inline Side-by-side
Showing with 161 additions and 127 deletions
modules/gpu/src/opencv2/gpu/device/funcattrib.hpp
View file @ 39373cd9
/* /*M///////////////////////////////////////////////////////////////////////////////////////
* Software License Agreement (BSD License) //
* // IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
* Copyright (c) 2011, Willow Garage, Inc. //
* All rights reserved. // By downloading, copying, installing or using the software you agree to this license.
* // If you do not agree to this license, do not download, install,
* Redistribution and use in source and binary forms, with or without // copy or use the software.
* modification, are permitted provided that the following conditions //
* are met: //
* // License Agreement
* * Redistributions of source code must retain the above copyright // For Open Source Computer Vision Library
* notice, this list of conditions and the following disclaimer. //
* * Redistributions in binary form must reproduce the above // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
* copyright notice, this list of conditions and the following // Copyright (C) 2009, Willow Garage Inc., all rights reserved.
* disclaimer in the documentation and/or other materials provided // Third party copyrights are property of their respective owners.
* with the distribution. //
* * Neither the name of Willow Garage, Inc. nor the names of its // Redistribution and use in source and binary forms, with or without modification,
* contributors may be used to endorse or promote products derived // are permitted provided that the following conditions are met:
* from this software without specific prior written permission. //
* // * Redistribution's of source code must retain the above copyright notice,
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // this list of conditions and the following disclaimer.
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT //
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS // * Redistribution's in binary form must reproduce the above copyright notice,
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE // this list of conditions and the following disclaimer in the documentation
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // and/or other materials provided with the distribution.
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, //
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; // * The name of the copyright holders may not be used to endorse or promote products
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER // derived from this software without specific prior written permission.
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT //
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN // This software is provided by the copyright holders and contributors "as is" and
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // any express or implied warranties, including, but not limited to, the implied
* POSSIBILITY OF SUCH DAMAGE. // warranties of merchantability and fitness for a particular purpose are disclaimed.
* // In no event shall the Intel Corporation or contributors be liable for any direct,
* Author: Anatoly Baskeheev, Itseez Ltd, (myname.mysurname@mycompany.com) // 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.
//
//M*/
#ifndef PCL_DEVICE_FUNCATTRIB_HPP_
#define PCL_DEVICE_FUNCATTRIB_HPP_ #ifndef __OPENCV_GPU_DEVICE_FUNCATTRIB_HPP_
#define __OPENCV_GPU_DEVICE_FUNCATTRIB_HPP_
#include<cstdio> #include<cstdio>
namespace pcl namespace cv
{ {
namespace gpu
{
namespace device namespace device
{ {
template<class Func> template<class Func>
...@@ -63,7 +72,7 @@ namespace pcl ...@@ -63,7 +72,7 @@ namespace pcl
fflush(stdout); fflush(stdout);
} }
} }
}
} }
#endif /* PCL_DEVICE_FUNCATTRIB_HPP_ */ #endif /* __OPENCV_GPU_DEVICE_FUNCATTRIB_HPP_ */
\ No newline at end of file \ No newline at end of file
modules/gpu/src/opencv2/gpu/device/static_check.hpp
View file @ 39373cd9
/* /*M///////////////////////////////////////////////////////////////////////////////////////
* Software License Agreement (BSD License) //
* // IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
* Copyright (c) 2011, Willow Garage, Inc. //
* All rights reserved. // By downloading, copying, installing or using the software you agree to this license.
* // If you do not agree to this license, do not download, install,
* Redistribution and use in source and binary forms, with or without // copy or use the software.
* modification, are permitted provided that the following conditions //
* are met: //
* // License Agreement
* * Redistributions of source code must retain the above copyright // For Open Source Computer Vision Library
* notice, this list of conditions and the following disclaimer. //
* * Redistributions in binary form must reproduce the above // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
* copyright notice, this list of conditions and the following // Copyright (C) 2009, Willow Garage Inc., all rights reserved.
* disclaimer in the documentation and/or other materials provided // Third party copyrights are property of their respective owners.
* with the distribution. //
* * Neither the name of Willow Garage, Inc. nor the names of its // Redistribution and use in source and binary forms, with or without modification,
* contributors may be used to endorse or promote products derived // are permitted provided that the following conditions are met:
* from this software without specific prior written permission. //
* // * Redistribution's of source code must retain the above copyright notice,
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // this list of conditions and the following disclaimer.
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT //
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS // * Redistribution's in binary form must reproduce the above copyright notice,
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE // this list of conditions and the following disclaimer in the documentation
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // and/or other materials provided with the distribution.
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, //
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; // * The name of the copyright holders may not be used to endorse or promote products
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER // derived from this software without specific prior written permission.
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT //
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN // This software is provided by the copyright holders and contributors "as is" and
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // any express or implied warranties, including, but not limited to, the implied
* POSSIBILITY OF SUCH DAMAGE. // warranties of merchantability and fitness for a particular purpose are disclaimed.
* // In no event shall the Intel Corporation or contributors be liable for any direct,
* Author: Anatoly Baskeheev, Itseez Ltd, (myname.mysurname@mycompany.com) // 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.
//
//M*/
#ifndef PCL_GPU_DEVICE_STATIC_CHECK_HPP_ #ifndef __OPENCV_GPU_GPU_DEVICE_STATIC_CHECK_HPP__
#define PCL_GPU_DEVICE_STATIC_CHECK_HPP_ #define __OPENCV_GPU_GPU_DEVICE_STATIC_CHECK_HPP__
#if defined(__CUDACC__) #if defined(__CUDACC__)
#define __PCL_GPU_HOST_DEVICE__ __host__ __device__ __forceinline__ #define __OPENCV_GPU_HOST_DEVICE__ __host__ __device__ __forceinline__
#else #else
#define __PCL_GPU_HOST_DEVICE__ #define __OPENCV_GPU_HOST_DEVICE__
#endif #endif
namespace pcl namespace cv
{ {
namespace gpu
{
namespace device namespace device
{ {
template<bool expr> struct Static {}; template<bool expr> struct Static {};
template<> struct Static<true> template<> struct Static<true>
{ {
__PCL_GPU_HOST_DEVICE__ static void check() {}; __OPENCV_GPU_HOST_DEVICE__ static void check() {};
}; };
} }
namespace gpu using cv::gpu::device::Static;
{
using pcl::device::Static;
} }
} }
#undef __PCL_GPU_HOST_DEVICE__ #undef __PCL_GPU_HOST_DEVICE__
#endif /* PCL_GPU_DEVICE_STATIC_CHECK_HPP_ */ #endif /* __OPENCV_GPU_GPU_DEVICE_STATIC_CHECK_HPP__ */
\ No newline at end of file \ No newline at end of file
modules/gpu/src/opencv2/gpu/device/warp.hpp
View file @ 39373cd9
/* /*M///////////////////////////////////////////////////////////////////////////////////////
* Software License Agreement (BSD License) //
* // IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
* Copyright (c) 2011, Willow Garage, Inc. //
* All rights reserved. // By downloading, copying, installing or using the software you agree to this license.
* // If you do not agree to this license, do not download, install,
* Redistribution and use in source and binary forms, with or without // copy or use the software.
* modification, are permitted provided that the following conditions //
* are met: //
* // License Agreement
* * Redistributions of source code must retain the above copyright // For Open Source Computer Vision Library
* notice, this list of conditions and the following disclaimer. //
* * Redistributions in binary form must reproduce the above // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
* copyright notice, this list of conditions and the following // Copyright (C) 2009, Willow Garage Inc., all rights reserved.
* disclaimer in the documentation and/or other materials provided // Third party copyrights are property of their respective owners.
* with the distribution. //
* * Neither the name of Willow Garage, Inc. nor the names of its // Redistribution and use in source and binary forms, with or without modification,
* contributors may be used to endorse or promote products derived // are permitted provided that the following conditions are met:
* from this software without specific prior written permission. //
* // * Redistribution's of source code must retain the above copyright notice,
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // this list of conditions and the following disclaimer.
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT //
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS // * Redistribution's in binary form must reproduce the above copyright notice,
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE // this list of conditions and the following disclaimer in the documentation
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // and/or other materials provided with the distribution.
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, //
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; // * The name of the copyright holders may not be used to endorse or promote products
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER // derived from this software without specific prior written permission.
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT //
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN // This software is provided by the copyright holders and contributors "as is" and
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // any express or implied warranties, including, but not limited to, the implied
* POSSIBILITY OF SUCH DAMAGE. // warranties of merchantability and fitness for a particular purpose are disclaimed.
* // In no event shall the Intel Corporation or contributors be liable for any direct,
* Author: Anatoly Baskeheev, Itseez Ltd, (myname.mysurname@mycompany.com) // 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.
//
//M*/
#ifndef PCL_DEVICE_UTILS_WARP_HPP_ #ifndef __OPENCV_GPU_DEVICE_WARP_HPP_
#define PCL_DEVICE_UTILS_WARP_HPP_ #define __OPENCV_GPU_DEVICE_WARP_HPP_
namespace pcl namespace cv
{ {
namespace gpu
{
namespace device namespace device
{ {
struct Warp struct Warp
...@@ -92,8 +100,19 @@ namespace pcl ...@@ -92,8 +100,19 @@ namespace pcl
*out = op(*t1, *t2); *out = op(*t1, *t2);
return out; return out;
} }
template<typename OutIt, typename T>
static __device__ __forceinline__ void yota(OutIt beg, OutIt end, T value)
{
unsigned int lane = laneId();
value += lane;
for(OutIt t = beg + lane; t < end; t += STRIDE, value += STRIDE)
*t = value;
}
}; };
} }
}
} }
#endif /* PCL_DEVICE_UTILS_WARP_HPP_ */ #endif /* __OPENCV_GPU_DEVICE_WARP_HPP_ */
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment