[Likwid-commit] [likwid] 01/01: more patches for release

Thu Oct 30 12:33:37 UTC 2014

This is an automated email from the git hooks/post-receive script.

chrism pushed a commit to branch master
in repository likwid.

commit 993cad1609e2ca97d10ef828a9e1e08cebb0b47b
Author: Christoph Martin <martin at uni-mainz.de>
Date:   Thu Oct 30 13:33:11 2014 +0100

    more patches for release
---
 debian/changelog                                   |   4 +-
 debian/control                                     |   2 +-
 debian/likwid.lintian-overrides                    |   3 +
 debian/likwid.symbols                              |   2 +
 debian/patches/01-manpages.patch                   |   2 +-
 debian/patches/02-man-pages-fix.patch              | 107 +++++++++++++++++++++
 ...02-Makefile-man.patch => 03-Makefile-man.patch} |   0
 ...e-overload.patch => 04-Makefile-overload.patch} |   0
 debian/patches/10-debianize.patch                  |  15 +--
 debian/patches/series                              |   5 +-
 debian/rules                                       |   2 +-
 11 files changed, 124 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37a34af..a88b915 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-likwid (3.1.2-1) UNRELEASED; urgency=low
+likwid (3.1.2-1) unstable; urgency=low
 
   * Initial release. (Closes: #766474)
 
- -- Christoph Martin <martin at uni-mainz.de>  Thu, 23 Oct 2014 11:12:35 +0200
+ -- Christoph Martin <martin at uni-mainz.de>  Thu, 30 Oct 2014 13:23:08 +0100
diff --git a/debian/control b/debian/control
index 4bc9bce..80acdae 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: likwid
 Maintainer: Christoph Martin <martin at uni-mainz.de>
 Section: misc
 Priority: optional
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), gfortran
 Homepage: http://code.google.com/p/likwid/wiki/Introduction
 Vcs-Git: git://git.debian.org/likwid/likwid.git
diff --git a/debian/likwid.lintian-overrides b/debian/likwid.lintian-overrides
new file mode 100644
index 0000000..633bd56
--- /dev/null
+++ b/debian/likwid.lintian-overrides
@@ -0,0 +1,3 @@
+# We want to include the library in the main package
+likwid: package-name-doesnt-match-sonames liblikwidpin3
+likwid: non-dev-pkg-with-shlib-symlink usr/lib/x86_64-linux-gnu/liblikwidpin.so.3.1 usr/lib/x86_64-linux-gnu/liblikwidpin.so
diff --git a/debian/likwid.symbols b/debian/likwid.symbols
new file mode 100644
index 0000000..7ed7a6e
--- /dev/null
+++ b/debian/likwid.symbols
@@ -0,0 +1,2 @@
+liblikwidpin.so.3 likwid #MINVER#
+ pthread_create at Base 3.1.2
diff --git a/debian/patches/01-manpages.patch b/debian/patches/01-manpages.patch
index 3bfa8ee..22ba369 100644
--- a/debian/patches/01-manpages.patch
+++ b/debian/patches/01-manpages.patch
@@ -370,7 +370,7 @@
 +.TH LIKWID-PERFSCOPE 1 <DATE> likwid\-<VERSION>
 +.SH NAME
 +likwid-perfscope \- Frontend for the timeline mode of
-+.N likwid-perfctr(1)
++.B likwid-perfctr(1)
 +that on-the-fly generates pictures from the measurements
 +.SH SYNOPSIS
 +.B likwid-perfscope 
diff --git a/debian/patches/02-man-pages-fix.patch b/debian/patches/02-man-pages-fix.patch
new file mode 100644
index 0000000..8a07a7d
--- /dev/null
+++ b/debian/patches/02-man-pages-fix.patch
@@ -0,0 +1,107 @@
+Description: Fix some warnings in man pages
+Author: Thomas Roehl <thomas.roehl at fau.de>$
+Last-Update: 2014-10-29$
+---$
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/$
+--- a/doc/likwid-bench.1
++++ b/doc/likwid-bench.1
+@@ -54,7 +54,7 @@ specify the number of workgroups to perf
+ Specify the affinity domain, thread count and data set size for the current benchmarking run (mandatory).
+ 
+ .SH WORKGROUP SYNTAX
+-.B <thread_domain>:<size>[:<num_threads>[:<chunk_size>:<stride>]][-<streamId>:<domain_id>]
++.B <thread_domain>:<size> [:<num_threads>[:<chunk_size>:<stride>]] [-<streamId>:<domain_id>]
+ with size in kB, MB or GB.
+ Where thread domain is where threads are placed. Size is the total data set size for the benchmark. num_threads specifies how many threads are used. Threads are always placed using a compact policy in
+ .B likwid-bench.
+@@ -95,8 +95,8 @@ The option INSTRUMENT_BENCH in config.mk
+ .PP
+ .B likwid-perfctr 
+ will configure and start the performance counters on socket 0 with 4 threads prior to the execution of
+-.B likwid-bench
+-. The performance counters are read right before and after running the benchmarking code to 
++.B likwid-bench.
++The performance counters are read right before and after running the benchmarking code to 
+ minimize the interferences of the measurement.
+ .IP 5. 4
+ Run the copy benchmark and place the data on other socket
+--- a/doc/likwid-perfctr.1
++++ b/doc/likwid-perfctr.1
+@@ -137,13 +137,13 @@ or use the builtin pin functionality.
+ .IP 1. 4
+ As wrapper with performance group:
+ .TP
+-.B likwid-perfctr  -C 0-2  -g TLB   ./cacheBench -n 2 -l 1048576 -i 100 -t Stream
++.B likwid-perfctr -C 0-2 -g TLB ./cacheBench -n 2 -l 1048576 -i 100 -t Stream
+ .PP
+ The parent process is pinned to processor 0, Thread 0 to processor 1 and Thread 1 to processor 2.
+ .IP 2. 4
+ As wrapper with custom event set on AMD:
+ .TP
+-.B likwid-perfctr  -C 0-4  -g INSTRUCTIONS_RETIRED_SSE:PMC0,CPU_CLOCKS_UNHALTED:PMC3   ./cacheBench
++.B likwid-perfctr -C 0-4 -g INSTRUCTIONS_RETIRED_SSE:PMC0,CPU_CLOCKS_UNHALTED:PMC3 ./cacheBench
+ .PP
+ It is specified that the event
+ .B INSTRUCTIONS_RETIRED_SSE
+@@ -160,7 +160,7 @@ event. If you want this you have to incl
+ .IP 3. 4
+ As wrapper with custom event set on Intel:
+ .TP
+-.B likwid-perfctr  -C 0  -g INSTR_RETIRED_ANY:FIXC0,CPU_CLK_UNHALTED_CORE:FIXC1,UNC_L3_LINES_IN_ANY:UPMC0  ./stream-icc
++.B likwid-perfctr -C 0 -g INSTR_RETIRED_ANY:FIXC0,UOPS_ISSUED_ANY:PMC0 ./stream-icc
+ .PP
+ On Intel processors fixed events are measured on dedicated counters. These are
+ .B INSTR_RETIRED_ANY
+@@ -175,7 +175,7 @@ will calculate the runtime and CPI metri
+ .IP 4. 4
+ Using the marker API to measure only parts of your code (this can be used both with groups or custom event sets):
+ .TP
+-.B likwid-perfctr -m -C 0-4  -g INSTRUCTIONS_RETIRED_SSE:PMC0,CPU_CLOCKS_UNHALTED:PMC3   ./cacheBench
++.B likwid-perfctr -m -C 0-4 -g INSTRUCTIONS_RETIRED_SSE:PMC0,CPU_CLOCKS_UNHALTED:PMC3 ./cacheBench
+ .PP
+ You have to link you code against liblikwid.a/.so and use the marker API calls.
+ The following code snippet shows the necessary calls:
+@@ -211,7 +211,7 @@ if (threadId == 0)
+ .IP 5. 4
+ Using likwid in timeline mode:
+ .TP
+-.B likwid-perfctr -c 0-3  -g FLOPS_DP -t 300ms  ./cacheBench > out.txt
++.B likwid-perfctr -c 0-3 -g FLOPS_DP -t 300ms ./cacheBench > out.txt
+ .PP
+ This will read out the counters every 300ms on physical cores 0-3 and write the results to out.txt.
+ For timeline mode there is a frontend application likwid-scope, which enables live plotting of selected events.
+@@ -220,7 +220,7 @@ For more code examples have a look at th
+ .IP 6. 4
+ Using likwid in stethoscope mode:
+ .TP
+-.B likwid-perfctr -c 0-3  -g FLOPS_DP -S 2s
++.B likwid-perfctr -c 0-3 -g FLOPS_DP -S 2s
+ .PP
+ This will start the counters and read them out after 2s on physical cores 0-3 and write the results to stdout.
+ 
+--- a/doc/likwid-pin.1
++++ b/doc/likwid-pin.1
+@@ -27,8 +27,8 @@ to a dedicated processor as specified in
+ .PP
+ Per default every generated thread is pinned to the core in the order of calls 
+ to 
+-.I pthread_create
+-. It is possible to skip single threads using -s commandline option.
++.I pthread_create.
++It is possible to skip single threads using -s commandline option.
+ .PP
+ For OpenMP implementations gcc and icc compilers are explicitly supported. Others may also work.
+ .B likwid-pin
+--- a/doc/likwid-setFrequencies.1
++++ b/doc/likwid-setFrequencies.1
+@@ -13,8 +13,8 @@ likwid-setFrequencies \- print and manag
+ .SH DESCRIPTION
+ .B likwid-setFrequencies
+ is a command line application to set the clock frequency of CPU cores. Since only priviledged users are allowed to change the frequency of CPU cores, the application works in combination with a daemon 
+-.B likwid-setFreq
+-. The daemon needs the suid permission bit to be set in order to manipulate the sysfs entries. With 
++.B likwid-setFreq.
++The daemon needs the suid permission bit to be set in order to manipulate the sysfs entries. With 
+ .B likwid-setFrequencies
+ the clock of all cores inside a the cpu_list or affinity domain can be set to a specific frequency or governor at once.
+ .SH OPTIONS
diff --git a/debian/patches/02-Makefile-man.patch b/debian/patches/03-Makefile-man.patch
similarity index 100%
rename from debian/patches/02-Makefile-man.patch
rename to debian/patches/03-Makefile-man.patch
diff --git a/debian/patches/03-Makefile-overload.patch b/debian/patches/04-Makefile-overload.patch
similarity index 100%
rename from debian/patches/03-Makefile-overload.patch
rename to debian/patches/04-Makefile-overload.patch
diff --git a/debian/patches/10-debianize.patch b/debian/patches/10-debianize.patch
index 476b640..3730a47 100644
--- a/debian/patches/10-debianize.patch
+++ b/debian/patches/10-debianize.patch
@@ -47,15 +47,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  GENGROUPLOCK = .gengroup
  
  ifeq ($(COMPILER),MIC)
-@@ -178,7 +178,7 @@ FORTRAN_INTERFACE=
- $(info Warning: You have selected the fortran interface in config.mk, but there seems to be no fortran compiler - not compiling it!)
- else
- FORTRAN_INTERFACE = likwid.mod
--FORTRAN_INSTALL =  @cp -f likwid.mod  $(PREFIX)/include/
-+FORTRAN_INSTALL =  $(@)cp -f likwid.mod  $(PREFIX)/include/
- endif
- else
- FORTRAN_INTERFACE =
 @@ -205,18 +205,18 @@ $(DYNAMIC_TARGET_LIB): $(OBJ)
  
  $(DAEMON_TARGET): $(SRC_DIR)/access-daemon/accessDaemon.c
@@ -78,9 +69,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  $(GENGROUPLOCK): $(foreach directory,$(shell ls $(GROUP_DIR)), $(wildcard $(GROUP_DIR)/$(directory)/*.txt))
  	@echo "===>  GENERATE GROUP HEADERS"
-@@ -320,10 +320,13 @@ install:
+@@ -319,11 +319,15 @@ install:
+ 	@echo "===> INSTALL headers to $(PREFIX)/include"
  	@mkdir -p $(PREFIX)/include
  	@cp -f src/includes/likwid*.h  $(PREFIX)/include/
++	echo $(FORTRAN_INSTALL)
  	$(FORTRAN_INSTALL)
 -	@echo "===> INSTALL libraries to $(PREFIX)/lib"
 -	@mkdir -p $(PREFIX)/lib
@@ -96,7 +89,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@echo "===> INSTALL filters to $(LIKWIDFILTERPATH)"
  	@mkdir -p $(LIKWIDFILTERPATH)
  	@cp -f filters/*  $(LIKWIDFILTERPATH)
-@@ -344,8 +347,8 @@ uninstall:
+@@ -344,8 +348,8 @@ uninstall:
  	@rm -f $(MANPREFIX)/man1/feedGnuplot.1
  	@echo "===> REMOVING headers from $(PREFIX)/include"
  	@rm -f $(PREFIX)/include/likwid*.h
diff --git a/debian/patches/series b/debian/patches/series
index 385731c..45e59dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 01-manpages.patch
-02-Makefile-man.patch
-03-Makefile-overload.patch
+02-man-pages-fix.patch
+03-Makefile-man.patch
+04-Makefile-overload.patch
 10-debianize.patch
diff --git a/debian/rules b/debian/rules
index 1ee5d70..92c09f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,4 +14,4 @@ override_dh_auto_build:
 	$(MAKE) PREFIX=/usr FORTRAN_INTERFACE=true
 
 override_dh_auto_install:
-	$(MAKE) PREFIX=$$(pwd)/debian/likwid/usr MANPREFIX=$$(pwd)/debian/likwid/usr/share/man LIBPREFIX=$$(pwd)/debian/likwid/usr/lib/$(DEB_BUILD_GNU_TYPE) install
+	$(MAKE) PREFIX=$$(pwd)/debian/likwid/usr FORTRAN_INTERFACE=true MANPREFIX=$$(pwd)/debian/likwid/usr/share/man LIBPREFIX=$$(pwd)/debian/likwid/usr/lib/$(DEB_BUILD_GNU_TYPE) install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/likwid/likwid.git

