[arch-commits] Commit in root/trunk (5 files)
Date: Thursday, July 23, 2020 @ 20:24:09
Author: kgizdov
Revision: 665090
upgpkg: root 6.22.00-1
Added:
root/trunk/adapt_tmva_to_support_cudnn8.patch
Modified:
root/trunk/PKGBUILD
root/trunk/nbman-for-arch.patch
Deleted:
root/trunk/add_missing_include_ROOT-10315.patch
root/trunk/fix_relative_paths.patch
--+
PKGBUILD | 20
adapt_tmva_to_support_cudnn8.patch | 1130 +
add_missing_include_ROOT-10315.patch | 22
fix_relative_paths.patch | 39 -
nbman-for-arch.patch | 17
5 files changed, 1148 insertions(+), 80 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-07-23 20:13:52 UTC (rev 665089)
+++ PKGBUILD2020-07-23 20:24:09 UTC (rev 665090)
@@ -6,7 +6,7 @@
pkgbase=root
pkgname=('root' 'root-cuda')
-pkgver=6.20.06
+pkgver=6.22.00
pkgrel=1
pkgdesc='C++ data analysis framework and interpreter from CERN'
arch=('x86_64')
@@ -21,7 +21,7 @@
'cuda'
'cudnn'
'gcc-fortran'
-'gcc8-fortran'
+'gcc9-fortran'
'git'
'go'
'libxml2'
@@ -90,12 +90,11 @@
'settings.cmake'
'settings-cuda.cmake'
'jupyter_notebook_config.py'
-'add_missing_include_ROOT-10315.patch'
-'fix_relative_paths.patch'
'nbman-for-arch.patch'
'thisroot.fail'
+'adapt_tmva_to_support_cudnn8.patch'
)
-sha512sums=('232fd5253e83eb02ad33d03941c7c83d39d5f6b0162bd42594e44a0c1c08deade42ae5793e571db767ce4fa0a582aa332b9d1869e621b825d1eb1162819c98c6'
+sha512sums=('9e3c54bbc146b0abb0a2d960af380255ec59d0b3a11a4a97a2a25cb7ac567b07280c4eb48dddf99c1fa2e692881f6396a842ce125d3a253037e52f719739f01e'
'af8f178fc9df66997d5495b271e38adcd1636aab4c8fc994c6600c2496127829d831250d73d3fc229b02dfe49b9867d0be979beacb959f2f3a05351b8118a4a6'
'1fe6f4aa09d583d33f27cc766f4935510bb7ab6bbb8d4700baa1aaab92ea6c876500b67da1e4f6e0b510aa5616e4e193b860264b86925de85f2d9f558d75d5dc'
'3c81d255a17b902ffac0187af1752847036137e16641a88b17eef0d9c944e6f0d3c954bc93307d6270603f43f6c23f2e04f98dc7a68f9d076dbaa8006a2527d6'
@@ -102,10 +101,9 @@
'9ee5b6606dbd352608a2a4998344ca4026d677c86823e62fff615f6e84efcecdffc07a1e9182a356aa35035e7f35df5a107127722a6bad4b97d1f49cffebf5b9'
'7665bc8cbe79162e0b969b08802e1b7b2ed22ed8b1402d50cf194172a644f647dcaf0f5abb76f8b6007dfab8dbc811604479be826b345d8fd77edfb51032110b'
'1c905ee7a3f8f5f3f567d957f9be6b503a8631565d4d9b9bfea5e496ef86865c5a8be1a1f8c7842754029879cf0afd2465249f532a116cc43660aa2e460ae682'
-
'19b46d3b6a8083d9461f5d4f57845a1145b80de699e8b773cee7edecad0b064fe570faffa226720078273f40a88fe8ba933b7d944925391ad869f0b9cdbf9579'
-
'fa2f3b9b8717bfd11b6743a4457bbff104e547112bcec864f212510b1954a92809d9bde5ada8702d11659a150f2957daed4e4d2621858b0bc4e234d9f6924244'
-
'f4152ecddbef8079e7507625c3cfb2dcd6d3c844f38827f293d7c1915ff9be5ea3e4414080b51a83f86128b954520d8ec113349a5a07ba39fc87047b72bf0136'
-
'ff555ac4db568affe139701907f86d919a2206f3e304f69dd317b756ea0904b5934d9364a524060778aa507809ce78448621619bb34039ba34c5a71af71a4a8c')
+
'12814f50b7016bd86d3f91e0e31c052783a0c0fa72b7d6a072d3ae6f86c2437323d585e531235377ebbfdd9cb76abd7da84d9631de821151547f1d4b13417e69'
+
'ff555ac4db568affe139701907f86d919a2206f3e304f69dd317b756ea0904b5934d9364a524060778aa507809ce78448621619bb34039ba34c5a71af71a4a8c'
+
'2ae126795df4127c27a6287a1499bdb8b2bacb74cfbec17dabe378a5fb9fc7c755644e4090a4da1d0045bf5d4f542f06da827a0f48a5927ee8509874045f18b6')
get_pyver () {
python -c 'import sys; print(str(sys.version_info[0]) + "." +
str(sys.version_info[1]))'
@@ -167,8 +165,8 @@
mkdir -p "${srcdir}/build-cuda"
cd "${srcdir}/build-cuda"
-CC=/usr/bin/gcc-8 \
-CXX=/usr/bin/g++-8 \
+CC=/usr/bin/gcc-9 \
+CXX=/usr/bin/g++-9 \
cmake -C "${srcdir}/settings-cuda.cmake" \
${CUSTOM_CMAKE_FLAGS} \
"${srcdir}/${pkgbase}-${pkgver}-cuda"
Added: adapt_tmva_to_support_cudnn8.patch
===
--- adapt_tmva_to_support_cudnn8.patch (rev 0)
+++ adapt_tmva_to_support_cudnn8.patch 2020-07-23 20:24:09 UTC (rev 665090)
@@ -0,0 +1,1130 @@
+From 05739e6b01fb34b5ef40e1a584107876e68e4b77 Mon Sep 17 00:00:00 2001
+From: Konstantin Gizdov
+Date: Tue, 21 Jul 2020 15:13:57 +0300
+Subject: [PATCH 01/10] update deprecated function call name to backward
+ compatible one
+
+---
+ tmva/tmva/src/DNN/Architectures/Cudnn/RecurrentPropagation.cu | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tmva/tmva/src/DNN/Architectures/Cudnn/RecurrentPropagation.cu
b/tmva/tmva/src/DNN/Architectures/Cudnn/RecurrentPropagation.cu
+index 058cee28424..60289ec2fdd 100644
+--- a/tmva/tmva/src/DNN/Architectures/Cudnn/RecurrentPropagation.cu
[arch-commits] Commit in root/trunk (5 files)
Date: Wednesday, November 27, 2019 @ 23:59:35
Author: kgizdov
Revision: 534244
restructure package, fix CMake, provide pkg-config
Added:
root/trunk/root.pc.tpl
Modified:
root/trunk/PKGBUILD
root/trunk/settings-cuda.cmake
root/trunk/settings.cmake
Deleted:
root/trunk/rootd
-+
PKGBUILD| 83 +-
root.pc.tpl | 11 ++
rootd | 37 --
settings-cuda.cmake |3 +
settings.cmake |3 +
5 files changed, 73 insertions(+), 64 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-11-27 23:16:46 UTC (rev 534243)
+++ PKGBUILD2019-11-27 23:59:35 UTC (rev 534244)
@@ -7,7 +7,7 @@
pkgbase=root
pkgname=('root' 'root-cuda')
pkgver=6.18.04
-pkgrel=4
+pkgrel=5
pkgdesc='C++ data analysis framework and interpreter from CERN'
arch=('x86_64')
url='https://root.cern.ch'
@@ -83,15 +83,15 @@
'xrootd: Support remote file server and client')
source=("https://root.cern.ch/download/root_v${pkgver}.source.tar.gz;
'root.xml'
-'rootd'
+'root.pc.tpl'
'settings.cmake'
'settings-cuda.cmake'
'add_missing_include_ROOT-10315.patch')
sha256sums=('315a85fc8363f8eb1bffa0decbf126121258f79bd273513ed64795675485cfa4'
'50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0'
-'3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a'
-'070256512fb94df55201891919168777f1c0d61316018e98cddaaa97c9063d55'
-'4ae9f2971c4360fc216ecb793aa11f98e069b33a746c05cdb635fe684a5800c9'
+'a0fc0c9404905f61fe8ba94e52ffbbefcdbcb198f2a577703b1924364a251395'
+'e24884e67ad241e4893c8ecac973cd38f1ea523a54e774cc996989d40091cce3'
+'a676e65d2615a5bb89943f72adc6e1552df60e9b0dc040c7bb05f6d640d9dbd6'
'1cb2654f22b5f1de7f8621434c76266968db77a1f300de857e47d0f4ad5da217')
get_pyver () {
@@ -123,8 +123,12 @@
CFLAGS="${CFLAGS} -pthread" \
CXXFLAGS="${CXXFLAGS} -pthread" \
LDFLAGS="${LDFLAGS} -pthread -Wl,--no-undefined" \
-cmake -C "${srcdir}/settings.cmake" -DTARGET_ARCHITECTURE:STRING=generic
-DPYTHON_EXECUTABLE:PATH=/usr/bin/python \
-"${srcdir}/${pkgbase}-${pkgver}"
+cmake -C "${srcdir}/settings.cmake" \
+-DTARGET_ARCHITECTURE:STRING=generic \
+-DPYTHON_EXECUTABLE:PATH=/usr/bin/python \
+-DINSTALL_PREFIX=/usr \
+-DDEFAULT_SYSROOT=/usr \
+"${srcdir}/${pkgbase}-${pkgver}"
cd "${srcdir}/build"
make
@@ -138,8 +142,12 @@
CFLAGS="${CFLAGS} -pthread" \
CXXFLAGS="${CXXFLAGS} -pthread" \
LDFLAGS="${LDFLAGS} -pthread -Wl,--no-undefined" \
-cmake -C "${srcdir}/settings-cuda.cmake"
-DTARGET_ARCHITECTURE:STRING=generic -DPYTHON_EXECUTABLE:PATH=/usr/bin/python \
-"${srcdir}/${pkgbase}-${pkgver}-cuda"
+cmake -C "${srcdir}/settings-cuda.cmake" \
+-DTARGET_ARCHITECTURE:STRING=generic \
+-DPYTHON_EXECUTABLE:PATH=/usr/bin/python \
+-DINSTALL_PREFIX=/usr \
+-DDEFAULT_SYSROOT=/usr \
+"${srcdir}/${pkgbase}-${pkgver}-cuda"
cd "${srcdir}/build-cuda"
make
@@ -146,8 +154,8 @@
}
_package() {
-local bld_dir="${1}"
-cd "${srcdir}/${bld_dir}"
+local bld_dir="${srcdir}/${1}"
+cd "${bld_dir}"
make DESTDIR="${pkgdir}" install
@@ -160,7 +168,7 @@
local _pydir="${pkgdir}/usr/lib/python${_pyver}/site-packages"
install -d "${_pydir}"
find "${pkgdir}/usr/lib/root" -maxdepth 1 -mindepth 1 \( -iname "*py*" -or
-name "*Js*" \) ! -name "*EGPythia8*" -print0 | while read -rd $'\0' _lib; do
-_base=$(basename ${_lib})
+_base=$(basename "${_lib}")
ln -sf "/usr/lib/root/${_base}"
"${pkgdir}/usr/lib/python${_pyver}/site-packages/${_base}"
done
@@ -170,29 +178,50 @@
python -O -m compileall -d "/usr/lib/python${_pyver}" \
"${pkgdir}/usr/lib/python${_pyver}"
-install -D "${srcdir}/rootd" \
-"${pkgdir}/etc/rc.d/rootd"
-install -D -m644 "${srcdir}/root.xml" \
-"${pkgdir}/usr/share/mime/packages/root.xml"
-
-install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/etc/root.desktop" \
+# icon, shortcut and mime
+install -Dm644 "${srcdir}/${pkgbase}-${pkgver}/icons/Root6Icon.png" \
+"${pkgdir}/usr/share/icons/hicolor/48x48/apps/root.png"
+install -Dm644 "${srcdir}/${pkgbase}-${pkgver}/etc/root.desktop" \
"${pkgdir}/usr/share/applications/root.desktop"
-
-install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/icons/Root6Icon.png" \
-"${pkgdir}/usr/share/icons/hicolor/48x48/apps/root.png"
echo 'Icon=root.png' >> "${pkgdir}/usr/share/applications/root.desktop"
+install -Dm644 "${srcdir}/root.xml" \
+"${pkgdir}/usr/share/mime/packages/root.xml"
# use a file that pacman can track instead of adding directly to
