Skip to content

Commit

Permalink
Merge pull request #5551 from mrodozov/openblas-changes-106
Browse files Browse the repository at this point in the history
[10.6.X] Use OpenBlas instead of GSL Blas implementation
  • Loading branch information
cmsbuild committed Feb 20, 2020
2 parents 10b51b2 + 3e8805f commit 67104f0
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 109 deletions.
1 change: 0 additions & 1 deletion cmssw-tool-conf.spec
Expand Up @@ -104,7 +104,6 @@ Requires: cascade-toolfile
Requires: yoda-toolfile
Requires: fftw3-toolfile
Requires: fftjet-toolfile
Requires: lapack-toolfile
Requires: pyminuit2-toolfile
Requires: professor-toolfile
Requires: professor2-toolfile
Expand Down
6 changes: 6 additions & 0 deletions gsl.spec
Expand Up @@ -47,5 +47,11 @@ rm -f %{i}/lib/*.la
# Look up documentation online.
%define drop_files %{i}/share

#Move away gslcblas library to make sure that one one links against it.
#We want to use the OpenBlas implementation
#https://github.com/cms-sw/cmsdist/issues/5528
mkdir %i/cblas
mv %i/lib/libgslcblas* %i/cblas/

%post
%{relocateConfig}bin/gsl-config
19 changes: 0 additions & 19 deletions lapack-toolfile.spec

This file was deleted.

22 changes: 0 additions & 22 deletions lapack.spec

This file was deleted.

27 changes: 0 additions & 27 deletions photospline-toolfile.spec

This file was deleted.

25 changes: 0 additions & 25 deletions photospline.spec

This file was deleted.

6 changes: 4 additions & 2 deletions root.spec
Expand Up @@ -82,7 +82,9 @@ cmake ../%{n}-%{realversion} \
-Dbuiltin_lzma=OFF \
-Dbuiltin_gsl=OFF \
-Darrow=OFF \
-DGSL_CONFIG_EXECUTABLE="$(which gsl-config)" \
-DGSL_ROOT_DIR="${GSL_ROOT}" \
-DGSL_CBLAS_LIBRARY="${OPENBLAS_ROOT}/lib/libopenblas.%{soext}" \
-DGSL_CBLAS_LIBRARY_DEBUG="${OPENBLAS_ROOT}/lib/libopenblas.%{soext}" \
-Dcxx17=ON \
-Dssl=ON \
-DOPENSSL_ROOT_DIR="${OPENSSL_ROOT}" \
Expand Down Expand Up @@ -136,7 +138,7 @@ cmake ../%{n}-%{realversion} \
-DLIBLZ4_LIBRARY="${LZ4_ROOT}/lib/liblz4.%{soext}" \
-DZLIB_ROOT="${ZLIB_ROOT}" \
-DZLIB_INCLUDE_DIR="${ZLIB_ROOT}/include" \
-DCMAKE_PREFIX_PATH="${XZ_ROOT};${OPENSSL_ROOT};${GIFLIB_ROOT};${FREETYPE_ROOT};${PYTHON_ROOT};${LIBPNG_ROOT};${PCRE_ROOT};${TBB_ROOT};${OPENBLAS_ROOT};${DAVIX_ROOT};${LZ4_ROOT};${LIBXML2_ROOT}"
-DCMAKE_PREFIX_PATH="${GSL_ROOT};${XZ_ROOT};${OPENSSL_ROOT};${GIFLIB_ROOT};${PYTHON_ROOT};${LIBPNG_ROOT};${PCRE_ROOT};${TBB_ROOT};${OPENBLAS_ROOT};${DAVIX_ROOT};${LZ4_ROOT};${LIBXML2_ROOT}"

# For CMake cache variables: http://www.cmake.org/cmake/help/v3.2/manual/cmake-language.7.html#lists
# For environment variables it's OS specific: http://www.cmake.org/Wiki/CMake_Useful_Variables
Expand Down
13 changes: 0 additions & 13 deletions suitesparse.spec

This file was deleted.

0 comments on commit 67104f0

Please sign in to comment.