Attachment #166779 for bug #206120




# $FreeBSD$

PORTNAME=	clblas
PORTVERSION=	2.10
DISTVERSIONPREFIX=	v
CATEGORIES=	math

MAINTAINER=	dieterich@ogolem.org

LICENSE_FILE=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	opencl>=0:${PORTSDIR}/devel/opencl
LIB_DEPENDS=	libOpenCL.so:${PORTSDIR}/devel/ocl-icd \
		libboost_program_options.so:${PORTSDIR}/devel/boost-libs
RUN_DEPENDS=	opencl>=0:${PORTSDIR}/devel/opencl

BROKEN_FreeBSD_9=	clBLAS is only supported on FreeBSD 10.1 and newer

GH_PROJECT=	clBLAS

USE_LDCONFIG=	yes
USES=		cmake python

CMAKE_ARGS+=	-DBUILD_TEST=OFF \
		-DBUILD_KTEST=OFF \
		-DCORR_TEST_WITH_ACML=OFF \
		-DSUFFIX_LIB=""

CMAKE_SOURCE_PATH=	${WRKSRC}/src

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (clMathLibraries-clBLAS-v2.6_GH0.tar.gz) = 4607561a648949709bc7c368be4aaf7346174406e678454b643e31cfe861830c	1	SHA256 (clMathLibraries-clBLAS-2.10_GH0.tar.gz) = 72a46cb92f6057d10b503ce23d62db73d7332eb0645bb8bca3337f4c0558b429
2	SIZE (clMathLibraries-clBLAS-v2.6_GH0.tar.gz) = 954586	2	SIZE (clMathLibraries-clBLAS-2.10_GH0.tar.gz) = 1154117




--- src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NN_B0_MX048_NX048_KX08_src.cpp.orig	2016-01-05 17:04:55 UTC
+++ src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NN_B0_MX048_NX048_KX08_src.cpp
@@ -18,7 +18,7 @@ const unsigned int dgemm_Col_NN_B0_MX048
 const unsigned int dgemm_Col_NN_B0_MX048_NX048_KX08_unroll = 8;
 
 const char * const dgemm_Col_NN_B0_MX048_NX048_KX08_src = STRINGIFY(
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable \n
+_Pragma("OPENCL EXTENSION cl_khr_fp64 : enable") \n
 
 #define  M6x6 \
             rA[0] = lA[offA + 0];\
--- src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NN_B1_MX048_NX048_KX08_src.cpp.orig	2016-01-05 17:04:55 UTC
+++ src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NN_B1_MX048_NX048_KX08_src.cpp
@@ -18,7 +18,7 @@ const unsigned int dgemm_Col_NN_B1_MX048
 const unsigned int dgemm_Col_NN_B1_MX048_NX048_KX08_unroll = 8;
 
 const char * const dgemm_Col_NN_B1_MX048_NX048_KX08_src = STRINGIFY(
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable   \n
+_Pragma("OPENCL EXTENSION cl_khr_fp64 : enable")   \n
 
 #define  M6x6 \
             rA[0] = lA[offA + 0];                       \
--- src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NT_B0_MX048_NX048_KX08_src.cpp.orig	2016-01-05 17:04:55 UTC
+++ src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NT_B0_MX048_NX048_KX08_src.cpp
@@ -18,7 +18,7 @@ const unsigned int dgemm_Col_NT_B0_MX048
 const unsigned int dgemm_Col_NT_B0_MX048_NX048_KX08_unroll = 8;
 
 const char * const dgemm_Col_NT_B0_MX048_NX048_KX08_src = STRINGIFY(
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable   \n
+_Pragma("OPENCL EXTENSION cl_khr_fp64 : enable")   \n
 \n
 \ntypedef union _GPtr {
 \n  __global float *f;
--- src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NT_B1_MX048_NX048_KX08_src.cpp.orig	2016-01-05 17:04:55 UTC
+++ src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NT_B1_MX048_NX048_KX08_src.cpp
@@ -18,7 +18,7 @@ const unsigned int dgemm_Col_NT_B1_MX048
 const unsigned int dgemm_Col_NT_B1_MX048_NX048_KX08_unroll = 8;
 
 const char * const dgemm_Col_NT_B1_MX048_NX048_KX08_src = STRINGIFY(
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable   \n
+_Pragma("OPENCL EXTENSION cl_khr_fp64 : enable")   \n
 \n
 \ntypedef union _GPtr {
 \n  __global float *f;
--- src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_TN_B0_MX048_NX048_KX08_src.cpp.orig	2016-01-05 17:04:55 UTC
+++ src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_TN_B0_MX048_NX048_KX08_src.cpp
@@ -18,7 +18,7 @@ const unsigned int dgemm_Col_TN_B0_MX048
 const unsigned int dgemm_Col_TN_B0_MX048_NX048_KX08_unroll = 8;
 
 const char * const dgemm_Col_TN_B0_MX048_NX048_KX08_src = STRINGIFY(
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable   \n
+_Pragma("OPENCL EXTENSION cl_khr_fp64 : enable")   \n
 
 __attribute__( (reqd_work_group_size(8, 8, 1)) )
 __kernel void dgemm_Col_TN_B0_MX048_NX048_KX08_src (
--- src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_TN_B1_MX048_NX048_KX08_src.cpp.orig	2016-01-05 17:04:55 UTC
+++ src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_TN_B1_MX048_NX048_KX08_src.cpp
@@ -18,7 +18,7 @@ const unsigned int dgemm_Col_TN_B1_MX048
 const unsigned int dgemm_Col_TN_B1_MX048_NX048_KX08_unroll = 8;
 
 const char * const dgemm_Col_TN_B1_MX048_NX048_KX08_src = STRINGIFY(
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable   \n
+_Pragma("OPENCL EXTENSION cl_khr_fp64 : enable")   \n
 
 __attribute__( (reqd_work_group_size(8, 8, 1)) )
 __kernel void dgemm_Col_TN_B1_MX048_NX048_KX08_src (

Lines 10-13 Link Here

(-)pkg-plist (-1 / +1 lines)
10	lib/cmake/clBLAS/clBLASTargets.cmake	10	lib/cmake/clBLAS/clBLASTargets.cmake
11	lib/libclBLAS.so	11	lib/libclBLAS.so
12	lib/libclBLAS.so.2	12	lib/libclBLAS.so.2
13	lib/libclBLAS.so.2.6.0	13	lib/libclBLAS.so.2.10.0

Return to bug 206120

Lines 2-9 Link Here

(-)Makefile (-4 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= clblas	4	PORTNAME= clblas
5	PORTVERSION= 2.6	5	PORTVERSION= 2.10
6	DISTVERSIONPREFIX= v
7	CATEGORIES= math	6	CATEGORIES= math
8		7
9	MAINTAINER= dieterich@ogolem.org	8	MAINTAINER= dieterich@ogolem.org
Lines 13-19 Link Here
13	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
14		13
15	BUILD_DEPENDS= opencl>=0:${PORTSDIR}/devel/opencl	14	BUILD_DEPENDS= opencl>=0:${PORTSDIR}/devel/opencl
16	LIB_DEPENDS= libOpenCL.so:${PORTSDIR}/devel/ocl-icd	15	LIB_DEPENDS= libOpenCL.so:${PORTSDIR}/devel/ocl-icd \
		16	libboost_program_options.so:${PORTSDIR}/devel/boost-libs
17	RUN_DEPENDS= opencl>=0:${PORTSDIR}/devel/opencl	17	RUN_DEPENDS= opencl>=0:${PORTSDIR}/devel/opencl
18		18
19	BROKEN_FreeBSD_9= clBLAS is only supported on FreeBSD 10.1 and newer	19	BROKEN_FreeBSD_9= clBLAS is only supported on FreeBSD 10.1 and newer
Lines 23-32 Link Here
23	GH_PROJECT= clBLAS	23	GH_PROJECT= clBLAS
24		24
25	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
26	USES= cmake	26	USES= cmake python
27		27
28	CMAKE_ARGS+= -DBUILD_TEST=OFF \	28	CMAKE_ARGS+= -DBUILD_TEST=OFF \
29	-DBUILD_KTEST=OFF \	29	-DBUILD_KTEST=OFF \
		30	-DCORR_TEST_WITH_ACML=OFF \
30	-DSUFFIX_LIB=""	31	-DSUFFIX_LIB=""
31		32
32	CMAKE_SOURCE_PATH= ${WRKSRC}/src	33	CMAKE_SOURCE_PATH= ${WRKSRC}/src

Line 0 Link Here

(-)files/patch-protect_pragma.diff (+66 lines)
		1	--- src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NN_B0_MX048_NX048_KX08_src.cpp.orig 2016-01-05 17:04:55 UTC
		2	+++ src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NN_B0_MX048_NX048_KX08_src.cpp
		3	@@ -18,7 +18,7 @@ const unsigned int dgemm_Col_NN_B0_MX048
		4	const unsigned int dgemm_Col_NN_B0_MX048_NX048_KX08_unroll = 8;
		5
		6	const char * const dgemm_Col_NN_B0_MX048_NX048_KX08_src = STRINGIFY(
		7	-#pragma OPENCL EXTENSION cl_khr_fp64 : enable \n
		8	+_Pragma("OPENCL EXTENSION cl_khr_fp64 : enable") \n
		9
		10	#define M6x6 \
		11	rA[0] = lA[offA + 0];\
		12	--- src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NN_B1_MX048_NX048_KX08_src.cpp.orig 2016-01-05 17:04:55 UTC
		13	+++ src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NN_B1_MX048_NX048_KX08_src.cpp
		14	@@ -18,7 +18,7 @@ const unsigned int dgemm_Col_NN_B1_MX048
		15	const unsigned int dgemm_Col_NN_B1_MX048_NX048_KX08_unroll = 8;
		16
		17	const char * const dgemm_Col_NN_B1_MX048_NX048_KX08_src = STRINGIFY(
		18	-#pragma OPENCL EXTENSION cl_khr_fp64 : enable \n
		19	+_Pragma("OPENCL EXTENSION cl_khr_fp64 : enable") \n
		20
		21	#define M6x6 \
		22	rA[0] = lA[offA + 0]; \
		23	--- src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NT_B0_MX048_NX048_KX08_src.cpp.orig 2016-01-05 17:04:55 UTC
		24	+++ src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NT_B0_MX048_NX048_KX08_src.cpp
		25	@@ -18,7 +18,7 @@ const unsigned int dgemm_Col_NT_B0_MX048
		26	const unsigned int dgemm_Col_NT_B0_MX048_NX048_KX08_unroll = 8;
		27
		28	const char * const dgemm_Col_NT_B0_MX048_NX048_KX08_src = STRINGIFY(
		29	-#pragma OPENCL EXTENSION cl_khr_fp64 : enable \n
		30	+_Pragma("OPENCL EXTENSION cl_khr_fp64 : enable") \n
		31	\n
		32	\ntypedef union _GPtr {
		33	\n __global float *f;
		34	--- src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NT_B1_MX048_NX048_KX08_src.cpp.orig 2016-01-05 17:04:55 UTC
		35	+++ src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NT_B1_MX048_NX048_KX08_src.cpp
		36	@@ -18,7 +18,7 @@ const unsigned int dgemm_Col_NT_B1_MX048
		37	const unsigned int dgemm_Col_NT_B1_MX048_NX048_KX08_unroll = 8;
		38
		39	const char * const dgemm_Col_NT_B1_MX048_NX048_KX08_src = STRINGIFY(
		40	-#pragma OPENCL EXTENSION cl_khr_fp64 : enable \n
		41	+_Pragma("OPENCL EXTENSION cl_khr_fp64 : enable") \n
		42	\n
		43	\ntypedef union _GPtr {
		44	\n __global float *f;
		45	--- src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_TN_B0_MX048_NX048_KX08_src.cpp.orig 2016-01-05 17:04:55 UTC
		46	+++ src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_TN_B0_MX048_NX048_KX08_src.cpp
		47	@@ -18,7 +18,7 @@ const unsigned int dgemm_Col_TN_B0_MX048
		48	const unsigned int dgemm_Col_TN_B0_MX048_NX048_KX08_unroll = 8;
		49
		50	const char * const dgemm_Col_TN_B0_MX048_NX048_KX08_src = STRINGIFY(
		51	-#pragma OPENCL EXTENSION cl_khr_fp64 : enable \n
		52	+_Pragma("OPENCL EXTENSION cl_khr_fp64 : enable") \n
		53
		54	__attribute__( (reqd_work_group_size(8, 8, 1)) )
		55	__kernel void dgemm_Col_TN_B0_MX048_NX048_KX08_src (
		56	--- src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_TN_B1_MX048_NX048_KX08_src.cpp.orig 2016-01-05 17:04:55 UTC
		57	+++ src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_TN_B1_MX048_NX048_KX08_src.cpp
		58	@@ -18,7 +18,7 @@ const unsigned int dgemm_Col_TN_B1_MX048
		59	const unsigned int dgemm_Col_TN_B1_MX048_NX048_KX08_unroll = 8;
		60
		61	const char * const dgemm_Col_TN_B1_MX048_NX048_KX08_src = STRINGIFY(
		62	-#pragma OPENCL EXTENSION cl_khr_fp64 : enable \n
		63	+_Pragma("OPENCL EXTENSION cl_khr_fp64 : enable") \n
		64
65	__attribute__( (reqd_work_group_size(8, 8, 1)) )
66	__kernel void dgemm_Col_TN_B1_MX048_NX048_KX08_src (