[clblas] 23/125: Fix build problems on OS X.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository clblas.

commit 1100fc037b8ab759c86f68db159c022139ecb5f6
Author: Arnaud Bergeron <abergeron at gmail.com>
Date:   Fri Sep 13 21:36:09 2013 -0400

    Fix build problems on OS X.
---
 src/library/blas/generic/kdump.c              |  2 +-
 src/library/blas/gens/legacy/tests/t_blkmul.c |  4 +++
 src/library/blas/gens/tests/t_tilemul.c       |  5 +++-
 src/library/common/tests/t_gens_cache.c       |  4 +++
 src/library/tools/ktest/step.h                |  4 +++
 src/library/tools/ktest/var.h                 |  4 +++
 src/library/tools/tune/CMakeLists.txt         |  2 +-
 src/library/tools/tune/storage_data.h         |  5 +++-
 src/library/tools/tune/storage_io.c           |  1 -
 src/library/tools/tune/toolslib.c             |  1 -
 src/library/tools/tune/toolslib.h             |  4 +++
 src/library/tools/tune/tune.c                 | 37 +++++++++++++++++++++++++--
 12 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/src/library/blas/generic/kdump.c b/src/library/blas/generic/kdump.c
index 5345fc7..a48204a 100644
--- a/src/library/blas/generic/kdump.c
+++ b/src/library/blas/generic/kdump.c
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include <cltypes.h>
 #include <clblas-internal.h>
diff --git a/src/library/blas/gens/legacy/tests/t_blkmul.c b/src/library/blas/gens/legacy/tests/t_blkmul.c
index 4983ce0..590231e 100644
--- a/src/library/blas/gens/legacy/tests/t_blkmul.c
+++ b/src/library/blas/gens/legacy/tests/t_blkmul.c
@@ -15,7 +15,11 @@
  * ************************************************************************/
 
 
+#ifdef __APPLE__
+#include <OpenCL/cl.h>
+#else
 #include <CL/cl.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
diff --git a/src/library/blas/gens/tests/t_tilemul.c b/src/library/blas/gens/tests/t_tilemul.c
index ba4b49c..4b4dd80 100644
--- a/src/library/blas/gens/tests/t_tilemul.c
+++ b/src/library/blas/gens/tests/t_tilemul.c
@@ -14,8 +14,11 @@
  * limitations under the License.
  * ************************************************************************/
 
-
+#ifdef __APPLE__
+#include <OpenCL/cl.h>
+#else
 #include <CL/cl.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/src/library/common/tests/t_gens_cache.c b/src/library/common/tests/t_gens_cache.c
index 177a25b..5a2b982 100644
--- a/src/library/common/tests/t_gens_cache.c
+++ b/src/library/common/tests/t_gens_cache.c
@@ -23,7 +23,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef __APPLE__
+#include <OpenCL/cl.h>
+#else
 #include <CL/cl.h>
+#endif
 
 #include <kerngen.h>
 #include <kern_cache.h>
diff --git a/src/library/tools/ktest/step.h b/src/library/tools/ktest/step.h
index 7148c72..0472e49 100644
--- a/src/library/tools/ktest/step.h
+++ b/src/library/tools/ktest/step.h
@@ -18,7 +18,11 @@
 #ifndef KTEST_PATTERN_H__
 #define KTEST_PATTERN_H__
 
+#ifdef __APPLE__
+#include <OpenCL/cl.h>
+#else
 #include <CL/cl.h>
+#endif
 #include <list>
 #include <map>
 #include <string>
diff --git a/src/library/tools/ktest/var.h b/src/library/tools/ktest/var.h
index 0ebb107..8bab85e 100644
--- a/src/library/tools/ktest/var.h
+++ b/src/library/tools/ktest/var.h
@@ -18,7 +18,11 @@
 #ifndef KTEST_VAR_H__
 #define KTEST_VAR_H__
 
+#ifdef __APPLE__
+#include <OpenCL/cl.h>
+#else
 #include <CL/cl.h>
+#endif
 #include <string>
 
 namespace clMath {
diff --git a/src/library/tools/tune/CMakeLists.txt b/src/library/tools/tune/CMakeLists.txt
index b792cc9..65bf00e 100644
--- a/src/library/tools/tune/CMakeLists.txt
+++ b/src/library/tools/tune/CMakeLists.txt
@@ -130,7 +130,7 @@ if( BLAS_DEBUG_TOOLS )
 endif()
 
 # Library with functions for time measurement. In Windows they are included automatically
-if(UNIX)
+if(UNIX AND NOT APPLE)
     set(TIME_LIBRARY "rt")
 endif()
 
diff --git a/src/library/tools/tune/storage_data.h b/src/library/tools/tune/storage_data.h
index 5efcf5e..3e72e76 100644
--- a/src/library/tools/tune/storage_data.h
+++ b/src/library/tools/tune/storage_data.h
@@ -18,13 +18,16 @@
 #ifndef STORAGEDATA_H_
 #define STORAGEDATA_H_
 
-#include <malloc.h>
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 
+#ifdef __APPLE__
+#include <OpenCL/cl.h>
+#else
 #include <CL/cl.h>
+#endif
 
 #include <trace_malloc.h>
 
diff --git a/src/library/tools/tune/storage_io.c b/src/library/tools/tune/storage_io.c
index 4d9dd37..b90792b 100644
--- a/src/library/tools/tune/storage_io.c
+++ b/src/library/tools/tune/storage_io.c
@@ -16,7 +16,6 @@
 
 
 
-#include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
 #include <signal.h>
diff --git a/src/library/tools/tune/toolslib.c b/src/library/tools/tune/toolslib.c
index 680a219..fc55b8a 100644
--- a/src/library/tools/tune/toolslib.c
+++ b/src/library/tools/tune/toolslib.c
@@ -15,7 +15,6 @@
  * ************************************************************************/
 
 
-#include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
 #include <signal.h>
diff --git a/src/library/tools/tune/toolslib.h b/src/library/tools/tune/toolslib.h
index 48c27e6..9e08a9a 100644
--- a/src/library/tools/tune/toolslib.h
+++ b/src/library/tools/tune/toolslib.h
@@ -18,7 +18,11 @@
 #ifndef TOOLSLIB_H__
 #define TOOLSLIB_H__
 
+#ifdef __APPLE__
+#include <OpenCL/cl.h>
+#else
 #include <CL/cl.h>
+#endif
 
 #include <defbool.h>
 #include <devinfo.h>
diff --git a/src/library/tools/tune/tune.c b/src/library/tools/tune/tune.c
index d41e45a..17d7d47 100644
--- a/src/library/tools/tune/tune.c
+++ b/src/library/tools/tune/tune.c
@@ -15,13 +15,16 @@
  * ************************************************************************/
 
 
-#include <malloc.h>
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
+#ifdef __APPLE__
+#include <OpenCL/cl.h>
+#else
 #include <CL/cl.h>
+#endif
 
 // #include "fileio.h"
 #include "toolslib.h"
@@ -35,6 +38,10 @@
 
 #if defined(_MSC_VER)
 #include "Windows.h"
+#elif defined(__APPLE__)
+#include <stdint.h>
+#include <mach/mach.h>
+#include <mach/mach_time.h>
 #else
 #include "time.h"
 #endif
@@ -83,7 +90,33 @@ getCurrentTime(void)
      }
      return (nano_time_t)count.QuadPart;
 }
-#else /* defined(_MCS_VER) */
+
+#elif defined(__APPLE__)
+
+typedef uint64_t nano_time_t;
+#define NANOTIME_MAX UINT64_MAX
+
+nano_time_t
+conv2nanosec(nano_time_t t)
+{
+  static mach_timebase_info_data_t timebase_info = {0};
+
+    if (timebase_info.denom == 0)
+    {
+        (void)mach_timebase_info(&timebase_info);
+    }
+
+    /* Let's hope we don't overflow */
+    return (t * timebase_info.denom) / timebase_info.numer;
+}
+
+nano_time_t
+getCurrentTime(void)
+{
+    return mach_absolute_time();
+}
+
+#else
 
 typedef unsigned long nano_time_t;
 #define NANOTIME_MAX (~0UL - 1)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clblas.git