From 8aaada867acb0cf4554e44d893dc45991146c3aa Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Sun, 20 Nov 2022 14:13:55 -0600 Subject: [PATCH] academic/cblas: Updated for version 3.11.0 Signed-off-by: Kyle Guinn Signed-off-by: Willy Sudiarto Raharjo --- academic/cblas/cblas.SlackBuild | 2 +- academic/cblas/cblas.info | 6 ++--- academic/cblas/patches/cmake-piecewise.diff | 27 ++++++++++++++------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/academic/cblas/cblas.SlackBuild b/academic/cblas/cblas.SlackBuild index cd86b92d0d..d53e77dd1d 100644 --- a/academic/cblas/cblas.SlackBuild +++ b/academic/cblas/cblas.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cblas SRCNAM=lapack -VERSION=${VERSION:-3.10.1} +VERSION=${VERSION:-3.11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/academic/cblas/cblas.info b/academic/cblas/cblas.info index 0784bddc51..be222ec1a5 100644 --- a/academic/cblas/cblas.info +++ b/academic/cblas/cblas.info @@ -1,8 +1,8 @@ PRGNAM="cblas" -VERSION="3.10.1" +VERSION="3.11.0" HOMEPAGE="https://www.netlib.org/blas/" -DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.10.1/lapack-3.10.1.tar.gz" -MD5SUM="722407217a080a0012ae3d6913fb8008" +DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.11.0/lapack-3.11.0.tar.gz" +MD5SUM="595b064fd448b161cd711fe346f498a7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="blas" diff --git a/academic/cblas/patches/cmake-piecewise.diff b/academic/cblas/patches/cmake-piecewise.diff index 958177158a..7ea45fcfc9 100644 --- a/academic/cblas/patches/cmake-piecewise.diff +++ b/academic/cblas/patches/cmake-piecewise.diff @@ -96,12 +96,12 @@ deleted file mode 100644 diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt --- a/CBLAS/src/CMakeLists.txt +++ b/CBLAS/src/CMakeLists.txt -@@ -123,9 +123,5 @@ +@@ -127,9 +127,5 @@ if(HAS_ATTRIBUTE_WEAK_SUPPORT) target_compile_definitions(${CBLASLIB} PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT) endif() -target_include_directories(${CBLASLIB} PUBLIC -- $ +- $ - $ -) target_link_libraries(${CBLASLIB} PRIVATE ${BLAS_LIBRARIES}) @@ -152,7 +152,16 @@ deleted file mode 100644 diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -173,11 +173,8 @@ +@@ -42,7 +42,7 @@ + endif() + + # By default test Fortran compiler complex abs and complex division +-option(TEST_FORTRAN_COMPILER "Test Fortran compiler complex abs and complex division" ON) ++option(TEST_FORTRAN_COMPILER "Test Fortran compiler complex abs and complex division" OFF) + if( TEST_FORTRAN_COMPILER ) + + add_executable( test_zcomplexabs ${LAPACK_SOURCE_DIR}/INSTALL/test_zcomplexabs.f ) +@@ -209,11 +209,8 @@ # -------------------------------------------------- @@ -164,7 +173,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeLibraries -@@ -217,21 +214,6 @@ +@@ -253,21 +250,6 @@ include(CheckLAPACKCompilerFlags) CheckLAPACKCompilerFlags() @@ -172,7 +181,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -# Check second function - -include(CheckTimeFunction) --set(NONE ${TIME_FUNC}) +-set(TIME_FUNC NONE) -CHECK_TIME_FUNCTION(NONE TIME_FUNC) -CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC) -CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC) @@ -186,7 +195,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt # deprecated LAPACK and LAPACKE routines option(BUILD_DEPRECATED "Build deprecated routines" OFF) message(STATUS "Build deprecated routines: ${BUILD_DEPRECATED}") -@@ -256,8 +238,9 @@ +@@ -292,8 +274,9 @@ # -------------------------------------------------- @@ -197,7 +206,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt # Check the usage of the user provided BLAS libraries if(BLAS_LIBRARIES) -@@ -268,133 +251,109 @@ +@@ -304,133 +287,109 @@ if(BLAS_FOUND) message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.") else() @@ -301,7 +310,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt + + # Check second function + include(CheckTimeFunction) -+ set(NONE ${TIME_FUNC}) ++ set(TIME_FUNC NONE) + CHECK_TIME_FUNCTION(NONE TIME_FUNC) + CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC) + CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC) @@ -381,7 +390,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt #------------------------------------- # BLAS++ / LAPACK++ option(BLAS++ "Build BLAS++" OFF) -@@ -444,111 +403,16 @@ +@@ -480,111 +439,16 @@ ExternalProject_Add_StepDependencies(lapackpp build blaspp ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}) endif()