clMathLibraries / clBLAS

a software library containing BLAS functions written in OpenCL
Apache License 2.0
839 stars 240 forks source link

Fix install location of samples #75

Closed marbre closed 9 years ago

marbre commented 9 years ago

At the moment the compiled samples get installed to /usr/bin and the source gets installed to /usr/samples. Fixed with this commit.

TimmyLiu commented 9 years ago

Similar to pull request #74, the samples were installed under ${BUILD_DIR}/package/bin.

marbre commented 9 years ago

That is acctually not the case..

-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_sgemv
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_ssymv
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_ssyrk
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_ssyr2k
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_strmm
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_strsm
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_strmv
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_strsv
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_sger
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_cher
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_ssyr
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_ssyr2
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_cherk
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_ssymm
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_chemm
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_stpmv
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_chpmv
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_stpsv
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_sspmv
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_sspr
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_chpr
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_sspr2
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_zhpr2
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_sgbmv
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_stbmv
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_ssbmv
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_chbmv
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_stbsv
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_cher2k
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_sswap
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_sscal
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_csscal
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_scopy
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_saxpy
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_sdot
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_srotg
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_srotmg
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_srot
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_srotm
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_snrm2
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_sasum
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/example_isamax
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/bin/version
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_sgemv.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_ssymv.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_sgemm.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_strmm.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_strsm.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_ssyrk.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_ssyr2k.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_strmv.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_strsv.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_sger.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_ssyr.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_ssyr2.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_ssymm.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_cher.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_chemm.cpp
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_cherk.cpp
-- Up-to-date: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_ssymm.c
-- Up-to-date: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_chemm.cpp
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_stpmv.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_chpmv.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_stpsv.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_sspmv.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_sspr.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_chpr.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_sspr2.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_zhpr2.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_sgbmv.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_stbmv.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_ssbmv.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_chbmv.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_stbsv.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_cher2k.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_sswap.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_sscal.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_scopy.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_csscal.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_saxpy.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_sdot.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_srotg.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_srotmg.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_srot.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_srotm.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_isamax.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_snrm2.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/example_sasum.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/clBlasVersion.c
-- Installing: /var/tmp/portage/sci-libs/clblas-9999/image/usr/samples/CMakeLists.txt

The path /var/tmp/portage/sci-libs/clblas-9999/image gets stripped in the next step of the package installation, calling make install directly would also result in installing the samples source to /usr/samples and the binaries to /usr/bin which is definitely incorrect on Linux systems.

marbre commented 9 years ago

BTW, this is quite similar to https://github.com/clMathLibraries/clFFT/pull/76.

marbre commented 9 years ago

How should we proceed here?

TimmyLiu commented 9 years ago

For some reason Travis CI did not catch that this pull request causes CMake error. Cmake does not seem to like the if-else statement within install(). I have made pull request #96 to patch this.

marbre commented 9 years ago

First of all thanks for merging and furthermore thanks for fixing the pull request with #96.