From 784ac1730d1693262262bff8f4910e3bb15a2ddd Mon Sep 17 00:00:00 2001
From: rdietric <robert.dietrich@tu-dresden.de>
Date: Tue, 4 Feb 2020 09:31:32 +0100
Subject: [PATCH] added patch for LIKWID memory leak and thus changed install
 scripts

---
 install/compute_node/install_likwid.sh        | 33 +++----------------
 install/compute_node/install_python3.sh       |  2 +-
 .../patches/likwid-5.0.1_fixmemleak.patch     | 10 ++++++
 3 files changed, 15 insertions(+), 30 deletions(-)
 create mode 100644 install/compute_node/patches/likwid-5.0.1_fixmemleak.patch

diff --git a/install/compute_node/install_likwid.sh b/install/compute_node/install_likwid.sh
index aa72e30..8803acb 100755
--- a/install/compute_node/install_likwid.sh
+++ b/install/compute_node/install_likwid.sh
@@ -50,6 +50,10 @@ if [ $LIKWID_VERSION == '5.0.1' ]; then
   cd bench/perl
   patch -p0 < $PIKA_PATCHES/likwid-5.0.1_power9.patch
   cd ../..
+  
+  cd src
+  patch -p0 < $PIKA_PATCHES/likwid-5.0.1_fixmemleak.patch
+  cd ..
 fi
 
 # backup default configuration
@@ -79,32 +83,3 @@ cd ..
 cd $LIKWID_INST_PATH/share/likwid
 mv perfgroups perfgroups_backup
 ln -s /sw/taurus/tools/pika/daemon/likwid/perfgroups
-
-### Build pylikwid
-#cd $PIKA_INSTALL_PATH/sources
-
-#git clone https://github.com/RRZE-HPC/pylikwid.git
-
-#cd pylikwid
-#patch -p0 -n pylikwid.c < $PIKA_PATCHES/pylikwid.c.patch
-
-#export PATH=$LIKWID_INST_PATH/bin:$LIKWID_INST_PATH/sbin:$PATH
-#export PATH=$PYTHON_ROOT/bin:$PATH
-
-#export PYTHONPATH=$PYTHON_ROOT
-#export LD_LIBRARY_PATH=${PYTHON_ROOT}/lib:${PYTHON_ROOT}/lib/python2.7:$LD_LIBRARY_PATH
-
-#python setup.py build_ext -I $LIKWID_INST_PATH/include -L $LIKWID_INST_PATH/lib -R $LIKWID_INST_PATH/lib
-#python setup.py install --prefix=$PYTHON_ROOT
-
-#cd $PIKA_INSTALL_PATH/sources/pylikwid/tests
-#python -c "import pylikwid"
-#./testlib.py
-
-# clean up sources
-#rm -rf $PIKA_INSTALL_PATH/sources/likwid-${VERSION} $PIKA_INSTALL_PATH/sources/pylikwid
-
-# change permissions (write permission for group p_prope)
-#cd /opt
-#chgrp -R p_prope prope
-#chmod -R g+w prope
diff --git a/install/compute_node/install_python3.sh b/install/compute_node/install_python3.sh
index f8f7b3c..d7009ec 100755
--- a/install/compute_node/install_python3.sh
+++ b/install/compute_node/install_python3.sh
@@ -32,7 +32,7 @@ pip3 install --upgrade pip
 # install influxdb and mysql client
 pip3 install influxdb
 pip3 install mysql-connector  #==2.1.4
-pip3 install nvidia-ml-py
+#pip3 install nvidia-ml-py
 pip3 install ClusterShell
 #pip install python-memcached
 pip3 install redis
diff --git a/install/compute_node/patches/likwid-5.0.1_fixmemleak.patch b/install/compute_node/patches/likwid-5.0.1_fixmemleak.patch
new file mode 100644
index 0000000..bc75773
--- /dev/null
+++ b/install/compute_node/patches/likwid-5.0.1_fixmemleak.patch
@@ -0,0 +1,10 @@
+--- perfgroup.c.save	2019-12-24 17:53:50.000000000 +0100
++++ perfgroup.c	2020-01-27 13:16:46.302127871 +0100
+@@ -1597,6 +1597,7 @@
+     i = calculate_infix(bdata(f), result);
+     bdestroy(f);
+     bdestroy(nan);
++    bdestroy(inf);
+     bdestroy(zero);
+     return i;
+ }
-- 
GitLab