Date: Mon, 14 Mar 2016 11:13:46 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411054 - in head/math/clblas: . files Message-ID: <201603141113.u2EBDkQi026184@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Mon Mar 14 11:13:46 2016 New Revision: 411054 URL: https://svnweb.freebsd.org/changeset/ports/411054 Log: Update to 2.10. Biggest improvement over the 2.6'er we had before: automatic kernel ejection for better and more flexible performance. PR: 206120 Submitted by: Johannes Dieterich <dieterich@ogolem.org> (maintainer) Added: head/math/clblas/files/ head/math/clblas/files/patch-protect_pragma.diff (contents, props changed) Modified: head/math/clblas/Makefile head/math/clblas/distinfo head/math/clblas/pkg-plist Modified: head/math/clblas/Makefile ============================================================================== --- head/math/clblas/Makefile Mon Mar 14 10:08:53 2016 (r411053) +++ head/math/clblas/Makefile Mon Mar 14 11:13:46 2016 (r411054) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= clblas -PORTVERSION= 2.6 +PORTVERSION= 2.10 DISTVERSIONPREFIX= v CATEGORIES= math @@ -13,7 +13,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= opencl>=0:${PORTSDIR}/devel/opencl -LIB_DEPENDS= libOpenCL.so:${PORTSDIR}/devel/ocl-icd +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 @@ -23,10 +24,11 @@ GH_ACCOUNT= clMathLibraries GH_PROJECT= clBLAS USE_LDCONFIG= yes -USES= cmake +USES= cmake python CMAKE_ARGS+= -DBUILD_TEST=OFF \ -DBUILD_KTEST=OFF \ + -DCORR_TEST_WITH_ACML=OFF \ -DSUFFIX_LIB="" CMAKE_SOURCE_PATH= ${WRKSRC}/src Modified: head/math/clblas/distinfo ============================================================================== --- head/math/clblas/distinfo Mon Mar 14 10:08:53 2016 (r411053) +++ head/math/clblas/distinfo Mon Mar 14 11:13:46 2016 (r411054) @@ -1,2 +1,2 @@ -SHA256 (clMathLibraries-clBLAS-v2.6_GH0.tar.gz) = 4607561a648949709bc7c368be4aaf7346174406e678454b643e31cfe861830c -SIZE (clMathLibraries-clBLAS-v2.6_GH0.tar.gz) = 954586 +SHA256 (clMathLibraries-clBLAS-v2.10_GH0.tar.gz) = 72a46cb92f6057d10b503ce23d62db73d7332eb0645bb8bca3337f4c0558b429 +SIZE (clMathLibraries-clBLAS-v2.10_GH0.tar.gz) = 1154117 Added: head/math/clblas/files/patch-protect_pragma.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/clblas/files/patch-protect_pragma.diff Mon Mar 14 11:13:46 2016 (r411054) @@ -0,0 +1,66 @@ +--- 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 ( Modified: head/math/clblas/pkg-plist ============================================================================== --- head/math/clblas/pkg-plist Mon Mar 14 10:08:53 2016 (r411053) +++ head/math/clblas/pkg-plist Mon Mar 14 11:13:46 2016 (r411054) @@ -10,4 +10,4 @@ lib/cmake/clBLAS/clBLASTargets-%%CMAKE_B lib/cmake/clBLAS/clBLASTargets.cmake lib/libclBLAS.so lib/libclBLAS.so.2 -lib/libclBLAS.so.2.6.0 +lib/libclBLAS.so.2.10.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603141113.u2EBDkQi026184>