diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2019-06-21 12:18:11 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2019-06-21 12:18:11 +0000 |
| commit | 724984f2c85d96d78bd605cb1422509e3bb325d3 (patch) | |
| tree | 50d3de9746289d92fb7d3326cca959b3b1ddd414 /math/clblas | |
| parent | 2c4ffaa87c3b543dc256cc8f464aba50a2a2da65 (diff) | |
| download | ports-724984f2c85d96d78bd605cb1422509e3bb325d3.tar.gz ports-724984f2c85d96d78bd605cb1422509e3bb325d3.zip | |
Attempt to fix build on GCC-based systems by removing stray ";" characters.
This fix should go upstream.
However, at least on powerpc64, the patch is necessary but insufficient:
src/library/tools/tune/tune.c:137: error: 'CLOCK_REALTIME' undeclared (first use in this function)
After spending some time examining the wrkdir, I can't find its declaration.
OTOH the build succeeds on amd64.
This may need to be worked on by the upstream.
Approved by: portmgr (tier-2 blanket)
Notes
Notes:
svn path=/head/; revision=504793
Diffstat (limited to 'math/clblas')
| -rw-r--r-- | math/clblas/Makefile | 2 | ||||
| -rw-r--r-- | math/clblas/files/patch-src_library_blas_xgemm.cc | 35 |
2 files changed, 37 insertions, 0 deletions
diff --git a/math/clblas/Makefile b/math/clblas/Makefile index eff064caadfc..1462367fe2a2 100644 --- a/math/clblas/Makefile +++ b/math/clblas/Makefile @@ -13,6 +13,8 @@ COMMENT= Software library containing BLAS functions written in OpenCL LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN_powerpc64= src/library/tools/tune/tune.c:137: error: 'CLOCK_REALTIME' undeclared (first use in this function) + BUILD_DEPENDS= opencl>=0:devel/opencl LIB_DEPENDS= libOpenCL.so:devel/ocl-icd \ libboost_program_options.so:devel/boost-libs diff --git a/math/clblas/files/patch-src_library_blas_xgemm.cc b/math/clblas/files/patch-src_library_blas_xgemm.cc new file mode 100644 index 000000000000..77fe933eedc7 --- /dev/null +++ b/math/clblas/files/patch-src_library_blas_xgemm.cc @@ -0,0 +1,35 @@ +--- src/library/blas/xgemm.cc.orig 2016-01-05 17:04:55 UTC ++++ src/library/blas/xgemm.cc +@@ -75,19 +75,19 @@ bool isZero(Precision value); + template<> + bool isZero<float>( float value ) { + return value == 0; +-}; ++} + template<> + bool isZero<double>( double value ) { + return value == 0; +-}; ++} + template<> + bool isZero<FloatComplex>( FloatComplex value ) { + return CREAL(value) == 0 && CIMAG(value) == 0; +-}; ++} + template<> + bool isZero<DoubleComplex>( DoubleComplex value ) { + return CREAL(value) == 0 && CIMAG(value) == 0; +-}; ++} + + static char *getKernelName(cl_kernel clKernel) + { +@@ -534,7 +534,7 @@ clblasGemm( + if (needRowKernel) makeGemmKernel( rowClKernel, commandQueues[0], rowKernelSource, sourceBuildOptions, &rowKernelBinary, rowKernelBinarySize, binaryBuildOptions); + if (needColKernel) makeGemmKernel( colClKernel, commandQueues[0], colKernelSource, sourceBuildOptions, &colKernelBinary, colKernelBinarySize, binaryBuildOptions); + if (needCornerKernel) makeGemmKernel(cornerClKernel, commandQueues[0], cornerKernelSource, sourceBuildOptions, &cornerKernelBinary, cornerKernelBinarySize, binaryBuildOptions); +- const size_t localWorkSize[2] = { workGroupNumRows, workGroupNumCols }; ++ const size_t localWorkSize[2] = { workGroupNumRows, workGroupNumCols };; + unsigned int numKernelsEnqueued = 0; + + /****************************************************************************** |