[med-svn] [Git][med-team/fast][master] Modify headers and move out the OpenCL.hpp header file from CL to FAST

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / fast


Commits:
fa9e0692 by Shayan Doust at 2019-08-20T01:11:33Z
Modify headers and move out the OpenCL.hpp header file from CL to FAST

- - - - -


3 changed files:

- + debian/patches/fast_opencl_header_dir_move.patch
- + debian/patches/opencl_header.patch
- debian/patches/series


Changes:

=====================================
debian/patches/fast_opencl_header_dir_move.patch
=====================================
@@ -0,0 +1,42 @@
+Description: move OpenCL.hpp written for FAST into FAST source
+ Move this FAST opencl header into the FAST directory as this header should not be written into opencl package header directory.
+Author: Shayan Doust <hello at shayandoust.me>
+Last-Update: 2019-08-19
+---
+
+Index: fast/source/CL/OpenCL.hpp
+===================================================================
+--- fast.orig/source/CL/OpenCL.hpp	2019-08-19 23:55:24.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,13 +0,0 @@
+-#ifndef OPENCL_HPP_
+-#define OPENCL_HPP_
+-
+-#define CL_HPP_ENABLE_EXCEPTIONS
+-#define CL_HPP_TARGET_OPENCL_VERSION 120
+-#define CL_HPP_MINIMUM_OPENCL_VERSION 120
+-#define CL_HPP_ENABLE_SIZE_T_COMPATIBILITY
+-#define CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY
+-#include "CL/cl2.hpp"
+-
+-
+-
+-#endif /* OPENCL_HPP_ */
+Index: fast/source/FAST/OpenCL.hpp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ fast/source/FAST/OpenCL.hpp	2019-08-19 23:55:24.000000000 +0100
+@@ -0,0 +1,13 @@
++#ifndef OPENCL_HPP_
++#define OPENCL_HPP_
++
++#define CL_HPP_ENABLE_EXCEPTIONS
++#define CL_HPP_TARGET_OPENCL_VERSION 120
++#define CL_HPP_MINIMUM_OPENCL_VERSION 120
++#define CL_HPP_ENABLE_SIZE_T_COMPATIBILITY
++#define CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY
++#include "CL/cl2.hpp"
++
++
++
++#endif /* OPENCL_HPP_ */


=====================================
debian/patches/opencl_header.patch
=====================================
@@ -0,0 +1,78 @@
+Description: modify fast headers to use moved opencl header
+ As the OpenCL.hpp file has been moved out of CL and instead placed in FAST, this patch modifies some FAST headers relying on this OpenCL.hpp file to use a different directory.
+Author: Shayan Doust <hello at shayandoust.me>
+Last-Update: 2019-08-20
+---
+
+Index: fast/source/FAST/Data/Access/MeshOpenCLAccess.hpp
+===================================================================
+--- fast.orig/source/FAST/Data/Access/MeshOpenCLAccess.hpp	2019-08-20 01:32:31.328373455 +0100
++++ fast/source/FAST/Data/Access/MeshOpenCLAccess.hpp	2019-08-20 01:32:31.324373422 +0100
+@@ -1,7 +1,7 @@
+ #ifndef MESH_OPENCL_ACCESS_HPP_
+ #define MESH_OPENCL_ACCESS_HPP_
+ 
+-#include "CL/OpenCL.hpp"
++#include "FAST/OpenCL.hpp"
+ #include "FAST/Object.hpp"
+ 
+ 
+@@ -30,4 +30,4 @@
+ 
+ }
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: fast/source/FAST/Data/Access/OpenCLBufferAccess.hpp
+===================================================================
+--- fast.orig/source/FAST/Data/Access/OpenCLBufferAccess.hpp	2019-08-20 01:32:31.328373455 +0100
++++ fast/source/FAST/Data/Access/OpenCLBufferAccess.hpp	2019-08-20 01:32:31.324373422 +0100
+@@ -1,7 +1,7 @@
+ #ifndef OPENCLBUFFERACCESS_HPP_
+ #define OPENCLBUFFERACCESS_HPP_
+ 
+-#include "CL/OpenCL.hpp"
++#include "FAST/OpenCL.hpp"
+ #include "FAST/Object.hpp"
+ 
+ 
+Index: fast/source/FAST/Data/Access/OpenCLImageAccess.hpp
+===================================================================
+--- fast.orig/source/FAST/Data/Access/OpenCLImageAccess.hpp	2019-08-20 01:32:31.328373455 +0100
++++ fast/source/FAST/Data/Access/OpenCLImageAccess.hpp	2019-08-20 01:32:31.324373422 +0100
+@@ -1,7 +1,7 @@
+ #ifndef OPENCLIMAGEACCESS_HPP_
+ #define OPENCLIMAGEACCESS_HPP_
+ 
+-#include "CL/OpenCL.hpp"
++#include "FAST/OpenCL.hpp"
+ #include "Access.hpp"
+ #include "FAST/Object.hpp"
+ 
+Index: fast/source/FAST/Data/DataTypes.hpp
+===================================================================
+--- fast.orig/source/FAST/Data/DataTypes.hpp	2019-08-20 01:32:31.328373455 +0100
++++ fast/source/FAST/Data/DataTypes.hpp	2019-08-20 01:32:31.324373422 +0100
+@@ -5,7 +5,7 @@
+ #define _USE_MATH_DEFINES
+ #include <cmath>
+ #include "FAST/Exception.hpp"
+-#include "CL/OpenCL.hpp"
++#include "FAST/OpenCL.hpp"
+ #include "FAST/ExecutionDevice.hpp"
+ #include <iostream>
+ #include <Eigen/Dense>
+Index: fast/source/FAST/RuntimeMeasurementManager.hpp
+===================================================================
+--- fast.orig/source/FAST/RuntimeMeasurementManager.hpp	2019-08-20 01:32:31.328373455 +0100
++++ fast/source/FAST/RuntimeMeasurementManager.hpp	2019-08-20 01:32:31.324373422 +0100
+@@ -3,7 +3,7 @@
+ 
+ #include <string>
+ #include <map>
+-#include "CL/OpenCL.hpp"
++#include "FAST/OpenCL.hpp"
+ #include "RuntimeMeasurement.hpp"
+ #include <chrono>
+ #include <memory>


=====================================
debian/patches/series
=====================================
@@ -1,5 +1,7 @@
+opencl_header.patch
 fix_source_openigtlink.patch
 prevent_cmake_downloading.patch
 remove_unneeded_installs.patch
 modify_libs_and_output.patch
 set_cmake_options.patch
+fast_opencl_header_dir_move.patch



View it on GitLab: https://salsa.debian.org/med-team/fast/commit/fa9e069290849e399e38292c070bd59908ee1178

-- 
View it on GitLab: https://salsa.debian.org/med-team/fast/commit/fa9e069290849e399e38292c070bd59908ee1178
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190820/cfeb357d/attachment-0001.html>