dbcsr: update to 2.8.0

This commit is contained in:
Mehdi Chinoune 2025-01-07 17:38:07 +00:00 committed by مهدي شينون (Mehdi Chinoune)
parent 5092abbc81
commit bfddf32e5b
2 changed files with 19 additions and 34 deletions

View File

@ -1,6 +1,6 @@
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -264,6 +264,10 @@ @@ -286,6 +286,10 @@
$<$<STREQUAL:${USE_ACCEL},opencl>:OpenCL::OpenCL>) $<$<STREQUAL:${USE_ACCEL},opencl>:OpenCL::OpenCL>)
endif () endif ()
@ -11,14 +11,22 @@
# ================================================================================================= # =================================================================================================
# DBCSR's C API # DBCSR's C API
if (WITH_C_API) if (WITH_C_API)
@@ -302,6 +306,7 @@ @@ -324,6 +328,7 @@
install( install(
TARGETS dbcsr TARGETS dbcsr
EXPORT DBCSRTargets EXPORT DBCSRTargets
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dbcsr_api.mod" # See https://gitlab.kitware.com/cmake/cmake/-/issues/19608
@@ -342,6 +347,7 @@
TARGETS dbcsr_c
EXPORT DBCSRTargets
COMPONENT C
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(
--- a/src/base/dbcsr_machine.F --- a/src/base/dbcsr_machine.F
+++ b/src/base/dbcsr_machine.F +++ b/src/base/dbcsr_machine.F
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
@ -28,7 +36,7 @@
- m_hostnm, m_iargc, m_memory, m_memory_details, m_memory_max, m_mov, m_procrun - m_hostnm, m_iargc, m_memory, m_memory_details, m_memory_max, m_mov, m_procrun
+ m_hostnm, m_iargc, m_memory, m_memory_details, m_memory_max, m_mov + m_hostnm, m_iargc, m_memory, m_memory_details, m_memory_max, m_mov
!$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads, OMP_GET_WTIME !$ USE OMP_LIB, ONLY: omp_get_wtime
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
PRIVATE PRIVATE
@ -41,12 +49,9 @@
--- a/src/base/dbcsr_machine_posix.f90 --- a/src/base/dbcsr_machine_posix.f90
+++ b/src/base/dbcsr_machine_posix.f90 +++ b/src/base/dbcsr_machine_posix.f90
@@ -17,9 +17,9 @@ @@ -19,7 +19,7 @@
PRIVATE
PUBLIC :: m_flush, m_memory, & PUBLIC :: m_flush, m_memory, &
- m_hostnm, m_getcwd, m_getlog, m_getuid, m_getpid, m_getarg, & m_hostnm, m_getcwd, m_getlog, m_getpid, m_getarg, &
+ m_hostnm, m_getcwd, m_getlog, m_getpid, m_getarg, &
m_iargc, m_abort, m_chdir, m_mov, & m_iargc, m_abort, m_chdir, m_mov, &
- m_memory_details, m_procrun - m_memory_details, m_procrun
+ m_memory_details + m_memory_details
@ -88,24 +93,3 @@
SUBROUTINE m_memory(mem) SUBROUTINE m_memory(mem)
!! Returns the total amount of memory [bytes] in use, if known, zero otherwise !! Returns the total amount of memory [bytes] in use, if known, zero otherwise
@@ -326,20 +298,6 @@
END SUBROUTINE m_getlog
! *****************************************************************************
- SUBROUTINE m_getuid(uid)
- INTEGER, INTENT(OUT) :: uid
-
- INTERFACE
- FUNCTION getuid() BIND(C, name="getuid") RESULT(uid)
- IMPORT
- INTEGER(KIND=C_INT) :: uid
- END FUNCTION
- END INTERFACE
-
- uid = getuid()
- END SUBROUTINE m_getuid
-
-! *****************************************************************************
SUBROUTINE m_getpid(pid)
INTEGER, INTENT(OUT) :: pid

View File

@ -3,7 +3,7 @@
_realname=dbcsr _realname=dbcsr
pkgbase=mingw-w64-${_realname} pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2.7.0 pkgver=2.8.0
pkgrel=1 pkgrel=1
pkgdesc="Distributed Block Compressed Sparse Row matrix library (mingw-w64)" pkgdesc="Distributed Block Compressed Sparse Row matrix library (mingw-w64)"
arch=('any') arch=('any')
@ -20,10 +20,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-python") "${MINGW_PACKAGE_PREFIX}-python")
#"${MINGW_PACKAGE_PREFIX}-python-fypp")
source=("https://github.com/cp2k/dbcsr/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz" source=("https://github.com/cp2k/dbcsr/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz"
"001-fix-build-on-mingw.patch") "001-fix-build-on-mingw.patch")
sha256sums=('25c367b49fb108c5230bcfb127f05fc16deff2bb467f437023dfa6045aff66f6' sha256sums=('d55e4f052f28d1ed0faeaa07557241439243287a184d1fd27f875c8b9ca6bd96'
'8d2775a36ddbce65fa45fcdb8c76a1bae3c83b99915d50475831b8cf8c87b346') '3a3620ab94d7f0abc6ab5fcb32671e4489e1fbf973d7e0680ee76374f9faf897')
prepare() { prepare() {
cd "${srcdir}"/${_realname}-${pkgver} cd "${srcdir}"/${_realname}-${pkgver}
@ -47,7 +48,7 @@ build() {
-DBUILD_SHARED_LIBS=ON \ -DBUILD_SHARED_LIBS=ON \
-DUSE_OPENMP=ON \ -DUSE_OPENMP=ON \
-DUSE_MPI=OFF \ -DUSE_MPI=OFF \
-DWITH_C_API=ON \ -DWITH_C_API=OFF \
-DBLA_VENDOR=OpenBLAS \ -DBLA_VENDOR=OpenBLAS \
-DBUILD_TESTING=OFF \ -DBUILD_TESTING=OFF \
-DWITH_EXAMPLES=OFF \ -DWITH_EXAMPLES=OFF \