From 17ebcfefa7c42cff61a81bf12a915983b330ed15 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <wjp@usecode.org>
Date: Tue, 17 Oct 2017 17:20:40 +0200
Subject: Add astra.astra.get_gpu_info utility function

---
 cuda/2d/util.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'cuda/2d/util.h')

diff --git a/cuda/2d/util.h b/cuda/2d/util.h
index 875aae3..31fcfbd 100644
--- a/cuda/2d/util.h
+++ b/cuda/2d/util.h
@@ -30,6 +30,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 
 #include <cuda.h>
 #include <driver_types.h>
+#include <string>
 
 #ifdef _MSC_VER
 
@@ -92,6 +93,9 @@ void reportCudaError(cudaError_t err);
 float dotProduct2D(float* D_data, unsigned int pitch,
                    unsigned int width, unsigned int height);
 
+// Return string with CUDA device number, name and memory size.
+// Use device == -1 to get info for the current device.
+_AstraExport std::string getCudaDeviceString(int device);
 
 }
 
-- 
cgit v1.2.3


From d753de051893698bfd1e107a2d03b1a38b55dd91 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Tue, 31 Oct 2017 17:10:56 +0100
Subject: Remove some unnecessary includes

---
 cuda/2d/util.h | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'cuda/2d/util.h')

diff --git a/cuda/2d/util.h b/cuda/2d/util.h
index 31fcfbd..6e36b6e 100644
--- a/cuda/2d/util.h
+++ b/cuda/2d/util.h
@@ -32,21 +32,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #include <driver_types.h>
 #include <string>
 
-#ifdef _MSC_VER
-
-#ifdef DLL_EXPORTS
-#define _AstraExport __declspec(dllexport)
-#define EXPIMP_TEMPLATE
-#else
-#define _AstraExport __declspec(dllimport)
-#define EXPIMP_TEMPLATE extern
-#endif
-
-#else
-
-#define _AstraExport
-
-#endif
+#include "astra/Globals.h"
 
 #include "dims.h"
 
-- 
cgit v1.2.3


From f70f68fcd465f421b566b199e23e66c1f186b01d Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 1 Nov 2017 15:05:13 +0100
Subject: Separate cuda from astra headers further

---
 cuda/2d/util.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'cuda/2d/util.h')

diff --git a/cuda/2d/util.h b/cuda/2d/util.h
index 6e36b6e..382d862 100644
--- a/cuda/2d/util.h
+++ b/cuda/2d/util.h
@@ -79,10 +79,6 @@ void reportCudaError(cudaError_t err);
 float dotProduct2D(float* D_data, unsigned int pitch,
                    unsigned int width, unsigned int height);
 
-// Return string with CUDA device number, name and memory size.
-// Use device == -1 to get info for the current device.
-_AstraExport std::string getCudaDeviceString(int device);
-
 }
 
 #endif
-- 
cgit v1.2.3