From c68377b8eb2ce322e195a23062f5ba635dba546a Mon Sep 17 00:00:00 2001
From: Mengchi Zhang <zhan2308@purdue.edu>
Date: Mon, 10 Jun 2019 19:43:36 -0400
Subject: Remove those duplicated defined

Signed-off-by: Mengchi Zhang <zhan2308@purdue.edu>
---
 src/abstract_hardware_model.h | 75 ++++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 36 deletions(-)

(limited to 'src/abstract_hardware_model.h')

diff --git a/src/abstract_hardware_model.h b/src/abstract_hardware_model.h
index 77d5f58..7455f25 100644
--- a/src/abstract_hardware_model.h
+++ b/src/abstract_hardware_model.h
@@ -173,9 +173,10 @@ enum _memory_op_t {
 #include <algorithm>
 
 #if !defined(__VECTOR_TYPES_H__)
-struct dim3 {
-   unsigned int x, y, z;
-};
+#include "vector_types.h"
+//struct dim3 {
+//   unsigned int x, y, z;
+//};
 #endif
 struct dim3comp {
     bool operator() (const dim3 & a, const dim3 & b) const
@@ -454,19 +455,21 @@ protected:
 
 #if !defined(__CUDA_RUNTIME_API_H__)
 
-enum cudaChannelFormatKind {
-   cudaChannelFormatKindSigned,
-   cudaChannelFormatKindUnsigned,
-   cudaChannelFormatKindFloat
-};
+#include "builtin_types.h"
 
-struct cudaChannelFormatDesc {
-   int                        x;
-   int                        y;
-   int                        z;
-   int                        w;
-   enum cudaChannelFormatKind f;
-};
+//enum cudaChannelFormatKind {
+//   cudaChannelFormatKindSigned,
+//   cudaChannelFormatKindUnsigned,
+//   cudaChannelFormatKindFloat
+//};
+
+//struct cudaChannelFormatDesc {
+//   int                        x;
+//   int                        y;
+//   int                        z;
+//   int                        w;
+//   enum cudaChannelFormatKind f;
+//};
 
 struct cudaArray {
    void *devPtr;
@@ -478,27 +481,27 @@ struct cudaArray {
    unsigned dimensions;
 };
 
-enum cudaTextureAddressMode {
-   cudaAddressModeWrap,
-   cudaAddressModeClamp
-};
-
-enum cudaTextureFilterMode {
-   cudaFilterModePoint,
-   cudaFilterModeLinear
-};
-
-enum cudaTextureReadMode {
-   cudaReadModeElementType,
-   cudaReadModeNormalizedFloat
-};
-
-struct textureReference {
-   int                           normalized;
-   enum cudaTextureFilterMode    filterMode;
-   enum cudaTextureAddressMode   addressMode[3];
-   struct cudaChannelFormatDesc  channelDesc;
-};
+//enum cudaTextureAddressMode {
+//   cudaAddressModeWrap,
+//   cudaAddressModeClamp
+//};
+
+//enum cudaTextureFilterMode {
+//   cudaFilterModePoint,
+//   cudaFilterModeLinear
+//};
+
+//enum cudaTextureReadMode {
+//   cudaReadModeElementType,
+//   cudaReadModeNormalizedFloat
+//};
+
+//struct textureReference {
+//   int                           normalized;
+//   enum cudaTextureFilterMode    filterMode;
+//   enum cudaTextureAddressMode   addressMode[3];
+//   struct cudaChannelFormatDesc  channelDesc;
+//};
 
 #endif
 
-- 
cgit v1.3


From a34d4295ca856297ad76d5a6408cdaa163554809 Mon Sep 17 00:00:00 2001
From: Mengchi Zhang <zhan2308@purdue.edu>
Date: Mon, 10 Jun 2019 20:58:22 -0400
Subject: Remove definitions

Signed-off-by: Mengchi Zhang <zhan2308@purdue.edu>
---
 src/abstract_hardware_model.h | 39 ---------------------------------------
 1 file changed, 39 deletions(-)

(limited to 'src/abstract_hardware_model.h')

diff --git a/src/abstract_hardware_model.h b/src/abstract_hardware_model.h
index 7455f25..68cb693 100644
--- a/src/abstract_hardware_model.h
+++ b/src/abstract_hardware_model.h
@@ -174,9 +174,6 @@ enum _memory_op_t {
 
 #if !defined(__VECTOR_TYPES_H__)
 #include "vector_types.h"
-//struct dim3 {
-//   unsigned int x, y, z;
-//};
 #endif
 struct dim3comp {
     bool operator() (const dim3 & a, const dim3 & b) const
@@ -457,20 +454,6 @@ protected:
 
 #include "builtin_types.h"
 
-//enum cudaChannelFormatKind {
-//   cudaChannelFormatKindSigned,
-//   cudaChannelFormatKindUnsigned,
-//   cudaChannelFormatKindFloat
-//};
-
-//struct cudaChannelFormatDesc {
-//   int                        x;
-//   int                        y;
-//   int                        z;
-//   int                        w;
-//   enum cudaChannelFormatKind f;
-//};
-
 struct cudaArray {
    void *devPtr;
    int devPtr32;
@@ -481,28 +464,6 @@ struct cudaArray {
    unsigned dimensions;
 };
 
-//enum cudaTextureAddressMode {
-//   cudaAddressModeWrap,
-//   cudaAddressModeClamp
-//};
-
-//enum cudaTextureFilterMode {
-//   cudaFilterModePoint,
-//   cudaFilterModeLinear
-//};
-
-//enum cudaTextureReadMode {
-//   cudaReadModeElementType,
-//   cudaReadModeNormalizedFloat
-//};
-
-//struct textureReference {
-//   int                           normalized;
-//   enum cudaTextureFilterMode    filterMode;
-//   enum cudaTextureAddressMode   addressMode[3];
-//   struct cudaChannelFormatDesc  channelDesc;
-//};
-
 #endif
 
 // Struct that record other attributes in the textureReference declaration 
-- 
cgit v1.3