[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/clusteringsuite/files/, sys-cluster/clusteringsuite/ - gentoo-commits

From:	Andrew Ammerlaan <andrewammerlaan@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/proj/guru:master commit in: sys-cluster/clusteringsuite/files/, sys-cluster/clusteringsuite/
Date:	Mon, 19 Jul 2021 09:55:27
Message-Id:	`1626644780.1496acd9218105c712fedfadb0820f184e2d1e34.andrewammerlaan@gentoo`

1

commit:     1496acd9218105c712fedfadb0820f184e2d1e34

2

Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>

3

AuthorDate: Sun Jul 18 21:44:09 2021 +0000

4

Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>

5

CommitDate: Sun Jul 18 21:46:20 2021 +0000

6

URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1496acd9

7

8

sys-cluster/clusteringsuite: enforce muster

9

10

also prepare for treedbscan if upstream will fix it

11

12

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

13

14

 sys-cluster/clusteringsuite/Manifest               |   2 +-

15

 ...9-r2.ebuild => clusteringsuite-2.6.9-r3.ebuild} |  36 +++++--

16

 .../clusteringsuite/clusteringsuite-2.6.9.ebuild   | 103 ------------------

17

 ...uite-2.6.9-do-not-add-boost-thread-ldpath.patch |  15 +++

18

 ...steringsuite-2.6.9-force-muster-discovery.patch |  37 +++++++

19

 .../clusteringsuite-2.6.9-unbundle-libANN.patch    | 116 +--------------------

20

 6 files changed, 84 insertions(+), 225 deletions(-)

21

22

diff --git a/sys-cluster/clusteringsuite/Manifest b/sys-cluster/clusteringsuite/Manifest

23

index fa6804d47..4430bcae4 100644

24

--- a/sys-cluster/clusteringsuite/Manifest

25

+++ b/sys-cluster/clusteringsuite/Manifest

26

@@ -1 +1 @@

27

-DIST clusteringsuite-2.6.9-src.tar.bz2 8081023 BLAKE2B d53e08a51e0a5a2d487bc4413c19d802804b7ae79b5f1e7c466ba2c37e36d90864a4629f51a98ca5caa83f4cc0a3ca8c74f5652c044c08591c65f3b50acf13d2 SHA512 80903e3d2c018e8ed23874715f7ffc1706ac5d9dcd0826c75bb07c973c28fa9755d4c130021abd6e969e983fbe23463be7361bb29b6d1ab04596ba4f987b1b6a

28

+DIST clusteringsuite-2.6.9.tar.gz 6964570 BLAKE2B bb4823d9918bc12707ae09d0c1220552b2621bfe39ab67dd67e03fba91036f2c8ed294f54a2bdd659b8bd58925aca02db85eb93986fe69e999e5b2bef915b564 SHA512 9df9ca57fc68b9cd7d17f13c1b915e3422a07c71f060ff2e7a38a31cf6e1aa234b869402bda6b7502c4844e25593156a1bb50714c2d272bafd10cd7690fc17eb

29

30

diff --git a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r2.ebuild b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild

31

similarity index 62%

32

rename from sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r2.ebuild

33

rename to sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild

34

index 7da3d3563..efb4a4090 100644

35

--- a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r2.ebuild

36

+++ b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild

37

@@ -1,41 +1,47 @@

38

 # Copyright 2019-2021 Gentoo Authors

39

 # Distributed under the terms of the GNU General Public License v2

40

41

-EAPI=8

42

+EAPI=7

43

44

 PYTHON_COMPAT=( pypy3 python3_{8..10} )

45

46

-inherit python-any-r1

47

+inherit autotools python-any-r1

48

49

 DESCRIPTION="Expose the main performance trends in applications computation structure"

50

 HOMEPAGE="

51

 	https://tools.bsc.es/cluster-analysis

52

 	https://github.com/bsc-performance-tools/clustering-suite

53

"

54

-SRC_URI="https://ftp.tools.bsc.es/clusteringsuite/clusteringsuite-${PV}-src.tar.bz2"

55

+SRC_URI="https://codeload.github.com/bsc-performance-tools/clustering-suite/tar.gz/refs/tags/${PV} -> ${P}.tar.gz"

56

+S="${WORKDIR}/clustering-suite-${PV}"

57

58

 LICENSE="LGPL-2.1+"

59

 SLOT="0"

60

 KEYWORDS="~amd64"

61

-IUSE="doc mpi muster"

62

-#TODO: treedbscan

63

+IUSE="doc mpi muster" # treedbscan

64

65

-PATCHES=( "${FILESDIR}/${P}-unbundle-libANN.patch" )

66

+PATCHES=(

67

+	"${FILESDIR}/${P}-unbundle-libANN.patch"

68

+	"${FILESDIR}/${P}-do-not-add-boost-thread-ldpath.patch"

69

+)

70

71

 RDEPEND="

72

+	app-arch/bzip2

73

 	dev-libs/boost:=

74

 	sci-libs/ann

75

 	sys-cluster/libbsctools

76

 	mpi? ( virtual/mpi )

77

 	muster? ( sys-cluster/muster )

78

"

79

+# https://github.com/bsc-performance-tools/clustering-suite/issues/8

80

 #	treedbscan? (

81

-#		dev-libs/boost[threads]:=

82

+#		dev-libs/boost:=[threads]

83

 #		dev-libs/gmp

84

 #		dev-libs/mpfr

85

-#		sci-mathematics/cgal

86

+#		sci-mathematics/cgal[shared]

87

 #		sys-cluster/synapse

88

-#)

89

+#	)

90

+#"

91

92

 DEPEND="

93

 	${RDEPEND}

94

@@ -44,9 +50,21 @@ DEPEND="

95

 BDEPEND="doc? ( app-doc/doxygen )"

96

97

 src_prepare() {

98

+	use muster && PATCHES+=( "${FILESDIR}/${P}-force-muster-discovery.patch" )

99

 	rm -r src/libANN || die

100

 #	rm -r pcfparser_svn3942 || die

101

 	default

102

+	sed -e "s|iterate/lib|iterate/$(get_libdir)|g" -i config/gmp_mpfr.m4 || die

103

+	sed -e "s|dir/lib|dir/$(get_libdir)|g" -i config/ax_muster.m4 || die

104

+

105

+	#from bootstrap

106

+	echo "#*********************************************************************" >> configure.ac || die

107

+	echo "#'configure.ac.' automatically generated by 'autogen.sh' do not modify" >> configure.ac || die

108

+	echo "#*********************************************************************" >> configure.ac || die

109

+	echo "" >> configure.ac || die

110

+	sed s/@@VERSION_NUMBER@@/${PV}/ < configure.ac.template >> configure.ac || die

111

+

112

+	AT_M4DIR="config" eautoreconf

113

}

114

115

 src_configure() {

116

117

diff --git a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild

118

deleted file mode 100644

119

index 51a9d25b0..000000000

120

--- a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild

121

+++ /dev/null

122

@@ -1,103 +0,0 @@

123

-# Copyright 2019-2021 Gentoo Authors

124

-# Distributed under the terms of the GNU General Public License v2

125

-

126

-EAPI=7

127

-

128

-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )

129

-inherit python-any-r1

130

-

131

-DESCRIPTION="Expose the main performance trends in applications computation structure"

132

-HOMEPAGE="

133

-	https://tools.bsc.es/cluster-analysis

134

-	https://github.com/bsc-performance-tools/clustering-suite

135

-"

136

-SRC_URI="https://ftp.tools.bsc.es/clusteringsuite/clusteringsuite-${PV}-src.tar.bz2"

137

-

138

-LICENSE="LGPL-2.1+"

139

-SLOT="0"

140

-KEYWORDS="~amd64"

141

-IUSE="doc mpi old-pcfparser"

142

-#TODO: muster treedbscan

143

-#TODO: unbundle ANN

144

-

145

-#PATCHES=( "${FILESDIR}/respect-flags.patch" )

146

-

147

-RDEPEND="

148

-	dev-libs/boost:=

149

-	sci-libs/ann

150

-	mpi? ( virtual/mpi )

151

-"

152

-#	treedbscan? (

153

-#		dev-libs/boost[threads]:=

154

-#		dev-libs/gmp

155

-#		dev-libs/mpfr

156

-#		sci-mathematics/cgal

157

-#		sys-cluster/synapse

158

-#)

159

-

160

-DEPEND="

161

-	${RDEPEND}

162

-	${PYTHON_DEPS}

163

-"

164

-BDEPEND="doc? ( app-doc/doxygen )"

165

-

166

-src_configure() {

167

-

168

-	local myconf=(

169

-		--disable-static

170

-		--disable-static-boost

171

-		--enable-shared

172

-		--with-boost="${EPREFIX}/usr"

173

-		--with-pic

174

-

175

-		$(use_enable old-pcfparser)

176

-	)

177

-

178

-	if use mpi; then

179

-		myconf+=( "--with-mpi=${EPREFIX}/usr" )

180

-	else

181

-		myconf+=( "--without-mpi" )

182

-	fi

183

-#	if use muster; then

184

-#		myconf+=( "--with-muster=${EPREFIX}/usr" )

185

-#	else

186

-		myconf+=( "--without-muster" )

187

-#	fi

188

-#	if use treedbscan; then

189

-#		myconf+=( "--enable-treedbscan" )

190

-#		myconf+=( "--with-cgal=${EPREFIX}/usr" )

191

-#		myconf+=( "--with-gmp=${EPREFIX}/usr" )

192

-#		myconf+=( "--with-mpfr=${EPREFIX}/usr" )

193

-#		myconf+=( "--with-synapse=${EPREFIX}/usr" )

194

-#	else

195

-		myconf+=( "--without-cgal" )

196

-		myconf+=( "--without-gmp" )

197

-		myconf+=( "--without-mpfr" )

198

-		myconf+=( "--without-synapse" )

199

-#	fi

200

-

201

-	econf "${myconf[@]}" || die

202

-}

203

-

204

-src_compile() {

205

-	export VARTEXFONTS="${T}/fonts"

206

-	if use doc ; then

207

-		pushd doc || die

208

-		emake build-documentation

209

-		popd

210

-	fi

211

-	default

212

-}

213

-

214

-src_install() {

215

-	MAKEOPTS="-j1" DESTDIR="${D}" emake install

216

-

217

-	cd doc || die

218

-	dodoc -r *.pdf

219

-

220

-	rm "${ED}/usr/share/doc/clusteringsuite_manual.pdf" || die

221

-	mv "${ED}/usr/share/example" "${ED}/usr/share/doc/${PF}/examples" || die

222

-	docompress -x "/usr/share/doc/${PF}/examples"

223

-

224

-	find "${ED}" -name '*.la' -delete || die

225

-}

226

227

diff --git a/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-do-not-add-boost-thread-ldpath.patch b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-do-not-add-boost-thread-ldpath.patch

228

new file mode 100644

229

index 000000000..655cdcfbc

230

--- /dev/null

231

+++ b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-do-not-add-boost-thread-ldpath.patch

232

@@ -0,0 +1,15 @@

233

+--- a/configure.ac.template

234

++++ b/configure.ac.template

235

+@@ -417,12 +417,10 @@

236

+

237

+ if test "x$BOOST_THREAD_LIBS" != "x"; then

238

+

239

+-  CLUSTERING_CLEAN_LDFLAGS="${CLUSTERING_CLEAN_LDFLAGS} -L${BOOST_THREAD_LDPATH}"

240

+   CLUSTERING_LIBS="${CLUSTERING_LIBS} ${BOOST_THREAD_LIBS}"

241

+

242

+   AX_CHECK_IS_SYSTEM_LIBRARY_PATH([${BOOST_THREAD_LDPATH}],[],

243

+   [

244

+-    CLUSTERING_LDFLAGS="${CLUSTERING_LDFLAGS} -L${BOOST_THREAD_LDPATH} -R${BOOST_THREAD_LDPATH}"

245

+     CLUSTERING_LD_LIBRARY_PATH="${CLUSTERING_LD_LIBRARY_PATH}:${BOOST_THREAD_LDPATH}"

246

+   ])

247

+ else

248

249

diff --git a/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-force-muster-discovery.patch b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-force-muster-discovery.patch

250

new file mode 100644

251

index 000000000..f9c533b2b

252

--- /dev/null

253

+++ b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-force-muster-discovery.patch

254

@@ -0,0 +1,37 @@

255

+--- a/config/ax_muster.m4

256

++++ b/config/ax_muster.m4

257

+@@ -6,21 +6,11 @@

258

+       [--with-muster=MUSTER_DIR],

259

+       [sets the given directory as location of muster includes and libs (needs Boost libraries)]

260

+     ),

261

+-    [muster_dir="$withval"]

262

+-    [muster_dir="/usr)"]

263

++    [muster_dir="$withval"],

264

++    [muster_dir="/usr"]

265

+   )

266

+

267

+-  ac_muster_installed="yes"

268

+-

269

+-  if test ! -f $muster_dir/include/partition.h; then

270

+-    ac_muster_installed="no"

271

+-  fi

272

+-

273

+-  if test ! -f $muster_dir/lib/libmuster.so; then

274

+-    ac_muster_installed="no"

275

+-  fi

276

+-

277

+-  if test "x${ac_muster_enabled}" = "xyes"; then

278

++    ac_muster_installed="yes"

279

+

280

+     MUSTER_CPPFLAGS="-I$muster_dir/include"

281

+     MUSTER_LDFLAGS="-L$muster_dir/lib -R$muster_dir/lib"

282

+@@ -36,9 +26,5 @@

283

+

284

+     # execute ACTION-IF-FOUND

285

+     ifelse([$1], , :, [$1])

286

+-  else

287

+-    # execute ACTION-IF-NOT-FOUND

288

+-    ifelse([$2], , :, [$2])

289

+-  fi

290

+

291

+ ])

292

293

diff --git a/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-unbundle-libANN.patch b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-unbundle-libANN.patch

294

index fd6e15517..8df36e156 100644

295

--- a/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-unbundle-libANN.patch

296

+++ b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-unbundle-libANN.patch

297

@@ -1,25 +1,6 @@

298

---- a/configure

299

-+++ b/configure

300

-@@ -19970,7 +19970,7 @@

301

-

302

-

303

-

304

--ac_config_files="$ac_config_files Makefile include/Makefile common_utilities/Makefile pcfparser_svn3942/Makefile src/Makefile src/BasicClasses/Makefile src/libParaverTraceParser/Makefile src/libSharedComponents/Makefile src/libSharedComponents/kalign2/Makefile src/libANN/Makefile src/libClustering/gmeans/Makefile src/libClustering/Makefile src/libTraceClustering/Makefile src/DBSCANParametersApproximation/Makefile src/BurstClustering/Makefile src/ClusteringDataExtractor/Makefile src/ClustersDiff/Makefile src/ClustersSequenceScore/Makefile scripts/Makefile src/MusterDistributedClustering/Makefile src/libDistributedClustering/Makefile src/TreeDBSCAN/Makefile src/TreeDBSCAN/scripts/Makefile doc/Makefile"

305

-+ac_config_files="$ac_config_files Makefile include/Makefile common_utilities/Makefile pcfparser_svn3942/Makefile src/Makefile src/BasicClasses/Makefile src/libParaverTraceParser/Makefile src/libSharedComponents/Makefile src/libSharedComponents/kalign2/Makefile src/libClustering/gmeans/Makefile src/libClustering/Makefile src/libTraceClustering/Makefile src/DBSCANParametersApproximation/Makefile src/BurstClustering/Makefile src/ClusteringDataExtractor/Makefile src/ClustersDiff/Makefile src/ClustersSequenceScore/Makefile scripts/Makefile src/MusterDistributedClustering/Makefile src/libDistributedClustering/Makefile src/TreeDBSCAN/Makefile src/TreeDBSCAN/scripts/Makefile doc/Makefile"

306

-

307

-

308

- ac_config_links="$ac_config_links include/types.h:include/types.h common_utilities/Error.hpp:common_utilities/Error.hpp src/BasicClasses/Error.hpp:src/BasicClasses/Error.hpp common_utilities/EventEncoding.h:common_utilities/EventEncoding.h common_utilities/Dimemas_Generation.h:common_utilities/Dimemas_Generation.h common_utilities/ParaverColors.h:common_utilities/ParaverColors.h src/BasicClasses/Utilities.hpp:src/BasicClasses/Utilities.hpp src/BasicClasses/SystemMessages.hpp:src/BasicClasses/SystemMessages.hpp src/BasicClasses/Timer.hpp:src/BasicClasses/Timer.hpp src/BasicClasses/FileNameManipulator.hpp:src/BasicClasses/FileNameManipulator.hpp doc/clusteringsuite_manual.tex:doc/clusteringsuite_manual.tex doc/clusteringsuite_manual.pdf:doc/clusteringsuite_manual.pdf doc/clustering_manual_structure.txt:doc/clustering_manual_structure.txt doc/clusteringsuite_design.tex:doc/clusteringsuite_design.tex doc/clusteringsuite_bsctools.pdf:doc/clusteringsuite_bsctools.pdf doc/clusteringsuite_

309

 design.pdf:doc/clusteringsuite_design.pdf doc/figure_sources/uml_design/libclustering_uml.pdf:doc/figure_sources/uml_design/libclustering_uml.pdf doc/figure_sources/uml_design/libtraceclustering_uml.pdf:doc/figure_sources/uml_design/libtraceclustering_uml.pdf doc/figure_sources/uml_design/libClustering_uml.graffle:doc/figure_sources/uml_design/libClustering_uml.graffle doc/figure_sources/uml_design/libTraceClustering_uml.graffle:doc/figure_sources/uml_design/libTraceClustering_uml.graffle doc/figure_sources/plots_example/int_vs_fop_plot.pdf:doc/figure_sources/plots_example/int_vs_fop_plot.pdf doc/figure_sources/plots_example/inst_vs_ipc_plot.pdf:doc/figure_sources/plots_example/inst_vs_ipc_plot.pdf doc/figure_sources/plots_example/mainmem_vs_l2_plot.pdf:doc/figure_sources/plots_example/mainmem_vs_l2_plot.pdf doc/figure_sources/plots_example/int_vs_fop_plot.png:doc/figure_sources/plots_example/int_vs_fop_plot.png doc/figure_sources/plots_example/inst_vs_ipc_plot.png:doc/figure_source

310

 s/plots_example/inst_vs_ipc_plot.png doc/figure_sources/plots_example/stores_vs_loads_plot.pdf:doc/figure_sources/plots_example/stores_vs_loads_plot.pdf doc/figure_sources/plots_example/stores_vs_loads_plot.png:doc/figure_sources/plots_example/stores_vs_loads_plot.png doc/figure_sources/plots_example/mainmem_vs_l2_plot.png:doc/figure_sources/plots_example/mainmem_vs_l2_plot.png doc/figure_sources/stats_plot/GADGET-DEISA.MEDIUM.256.1HWCG.chop1.bursts.dat:doc/figure_sources/stats_plot/GADGET-DEISA.MEDIUM.256.1HWCG.chop1.bursts.dat doc/figure_sources/stats_plot/GADGET-DEISA.MEDIUM.256.1HWCG.chop1.bursts.gnuplot:doc/figure_sources/stats_plot/GADGET-DEISA.MEDIUM.256.1HWCG.chop1.bursts.gnuplot doc/figure_sources/stats_plot/stats_plot.pdf:doc/figure_sources/stats_plot/stats_plot.pdf doc/figure_sources/clustering_xml/xml_plot_definition.pdf:doc/figure_sources/clustering_xml/xml_plot_definition.pdf doc/figure_sources/clustering_xml/xml_structure.pdf:doc/figure_sources/clustering_xml/xml_stru

311

 cture.pdf doc/figure_sources/clustering_xml/xml_single_event_definition.pdf:doc/figure_sources/clustering_xml/xml_single_event_definition.pdf doc/figure_sources/clustering_xml/xml_mixed_events_definition.pdf:doc/figure_sources/clustering_xml/xml_mixed_events_definition.pdf doc/figure_sources/clustering_xml/xml_algorithm_definition.pdf:doc/figure_sources/clustering_xml/xml_algorithm_definition.pdf doc/figure_sources/clustering_xml/clustering_xml_definition.graffle:doc/figure_sources/clustering_xml/clustering_xml_definition.graffle doc/cluster_analysis_thesis_bibliography.bib:doc/cluster_analysis_thesis_bibliography.bib doc/extra_commands.tex:doc/extra_commands.tex doc/figures/uml_design/libclustering_uml.pdf:doc/figures/uml_design/libclustering_uml.pdf doc/figures/uml_design/libtraceclustering_uml.pdf:doc/figures/uml_design/libtraceclustering_uml.pdf doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.LD_vs_ST.gnuplot:doc/figure_sources/plots_example/

312

 GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.LD_vs_ST.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.L2DATA_vs_MainMEMData.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.L2DATA_vs_MainMEMData.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster3.csv:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster3.csv doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.L2DATA_vs_MainMEMData.PNG.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.L2DATA_vs_MainMEMData.PNG.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster1.csv:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_

313

 POINTS.Cluster1.csv doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.FPU_vs_FXU.PNG.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.FPU_vs_FXU.PNG.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster4.csv:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster4.csv doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.FPU_vs_FXU.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.FPU_vs_FXU.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.LD_vs_ST.PNG.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.LD_vs_ST.PNG.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.INST_vs_IPC.gnup

314

 lot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.INST_vs_IPC.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.INST_vs_IPC.PNG.gnuplot:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.INST_vs_IPC.PNG.gnuplot doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster2.csv:doc/figure_sources/plots_example/GAPGEOFEM.16.mref.ALL_HWC.TIME_SPACE_SHIFTING.chop1.CLUSTERED.FULL_POINTS.Cluster2.csv doc/figures/plots_example/int_vs_fop_plot.pdf:doc/figures/plots_example/int_vs_fop_plot.pdf doc/figures/plots_example/inst_vs_ipc_plot.pdf:doc/figures/plots_example/inst_vs_ipc_plot.pdf doc/figures/plots_example/mainmem_vs_l2_plot.pdf:doc/figures/plots_example/mainmem_vs_l2_plot.pdf doc/figures/plots_example/int_vs_fop_plot.png:doc/figures/plots_example/int_vs_fop_plot.png doc/figures/plots_example/inst_vs_ipc_plot.png:doc/fig

315

 ures/plots_example/inst_vs_ipc_plot.png doc/figures/plots_example/stores_vs_loads_plot.pdf:doc/figures/plots_example/stores_vs_loads_plot.pdf doc/figures/plots_example/stores_vs_loads_plot.png:doc/figures/plots_example/stores_vs_loads_plot.png doc/figures/plots_example/mainmem_vs_l2_plot.png:doc/figures/plots_example/mainmem_vs_l2_plot.png doc/figures/stats_plot/stats_plot.pdf:doc/figures/stats_plot/stats_plot.pdf doc/figures/refinement_tree/refinement_tree.pdf:doc/figures/refinement_tree/refinement_tree.pdf doc/figures/clustering_xml/xml_plot_definition.pdf:doc/figures/clustering_xml/xml_plot_definition.pdf doc/figures/clustering_xml/xml_structure.pdf:doc/figures/clustering_xml/xml_structure.pdf doc/figures/clustering_xml/xml_single_event_definition.pdf:doc/figures/clustering_xml/xml_single_event_definition.pdf doc/figures/clustering_xml/xml_mixed_events_definition.pdf:doc/figures/clustering_xml/xml_mixed_events_definition.pdf doc/figures/clustering_xml/xml_algorithm_definition.pdf

316

 :doc/figures/clustering_xml/xml_algorithm_definition.pdf doc/figures/paraver_example/paraver_clusters_timeline.png:doc/figures/paraver_example/paraver_clusters_timeline.png doc/figures/paraver_example/paraver_clusters_profile.png:doc/figures/paraver_example/paraver_clusters_profile.png doc/figures/sequences_example/gromacs_step10_sequences.png:doc/figures/sequences_example/gromacs_step10_sequences.png doc/figures/sequences_example/sequences_clustalx.png:doc/figures/sequences_example/sequences_clustalx.png example/README:example/README example/su3.lat256_2it.16tasks.pcf:example/su3.lat256_2it.16tasks.pcf example/su3.lat256_2it.16tasks.row:example/su3.lat256_2it.16tasks.row example/cluster_explained.xml:example/cluster_explained.xml example/cluster.xml:example/cluster.xml example/su3.lat256_2it.16tasks.prv:example/su3.lat256_2it.16tasks.prv"

317

-@@ -21184,7 +21184,6 @@

318

-     "src/libParaverTraceParser/Makefile") CONFIG_FILES="$CONFIG_FILES src/libParaverTraceParser/Makefile" ;;

319

-     "src/libSharedComponents/Makefile") CONFIG_FILES="$CONFIG_FILES src/libSharedComponents/Makefile" ;;

320

-     "src/libSharedComponents/kalign2/Makefile") CONFIG_FILES="$CONFIG_FILES src/libSharedComponents/kalign2/Makefile" ;;

321

--    "src/libANN/Makefile") CONFIG_FILES="$CONFIG_FILES src/libANN/Makefile" ;;

322

-     "src/libClustering/gmeans/Makefile") CONFIG_FILES="$CONFIG_FILES src/libClustering/gmeans/Makefile" ;;

323

-     "src/libClustering/Makefile") CONFIG_FILES="$CONFIG_FILES src/libClustering/Makefile" ;;

324

-     "src/libTraceClustering/Makefile") CONFIG_FILES="$CONFIG_FILES src/libTraceClustering/Makefile" ;;

325

---- a/configure.ac

326

-+++ b/configure.ac

327

-@@ -552,7 +552,6 @@

328

+--- a/configure.ac.template

329

++++ b/configure.ac.template

330

+@@ -548,7 +548,6 @@

331

  src/libParaverTraceParser/Makefile

332

  src/libSharedComponents/Makefile

333

  src/libSharedComponents/kalign2/Makefile

334

@@ -50,30 +31,6 @@

335

  	./gmeans/libInternalGMeans.la \

336

  	@CLUSTERING_LIBS@

337

338

---- a/src/libClustering/Makefile.in

339

-+++ b/src/libClustering/Makefile.in

340

-@@ -155,7 +155,6 @@

341

- LTLIBRARIES = $(lib_LTLIBRARIES)

342

- libClustering_la_DEPENDENCIES =  \

343

- 	$(top_builddir)/src/BasicClasses/libBasicClasses.la \

344

--	$(top_builddir)/src/libANN/libANN.la \

345

- 	./gmeans/libInternalGMeans.la

346

- am__libClustering_la_SOURCES_DIST = Classifier.hpp \

347

- 	ClusteringAlgorithm.hpp ClusteringAlgorithmsFactory.cpp \

348

-@@ -530,11 +529,10 @@

349

- 	NearestNeighbourClassifier.hpp Point.cpp Point.hpp \

350

- 	clustering_types.h Partition.hpp Partition.cpp $(am__append_2) \

351

- 	$(am__append_3) $(am__append_4)

352

--libClustering_la_CPPFLAGS = @CLUSTERING_CPPFLAGS@ -I$(top_srcdir)/src/libANN

353

--libClustering_la_LDFLAGS = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@

354

-+libClustering_la_CPPFLAGS = @CLUSTERING_CPPFLAGS@ -I/usr/include/ANN

355

-+libClustering_la_LDFLAGS = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@ -lann

356

- libClustering_la_LIBADD = \

357

- 	$(top_builddir)/src/BasicClasses/libBasicClasses.la \

358

--	$(top_builddir)/src/libANN/libANN.la \

359

- 	./gmeans/libInternalGMeans.la \

360

- 	@CLUSTERING_LIBS@

361

-

362

 --- a/src/libDistributedClustering/Makefile.am

363

 +++ b/src/libDistributedClustering/Makefile.am

364

 @@ -32,7 +32,7 @@

365

@@ -85,17 +42,6 @@

366

367

  libDistributedClustering_la_LDFLAGS  = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@

368

  libDistributedClustering_la_LIBADD= \

369

---- a/src/libDistributedClustering/Makefile.in

370

-+++ b/src/libDistributedClustering/Makefile.in

371

-@@ -446,7 +446,7 @@

372

-  -I$(top_srcdir)/src/libSharedComponents\

373

-  -I$(top_srcdir)/pcfparser_svn3942\

374

-  -I$(top_srcdir)/src/libParaverTraceParser\

375

-- -I$(top_srcdir)/src/libANN

376

-+ -I/usr/include/ANN

377

-

378

- libDistributedClustering_la_LDFLAGS = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@

379

- libDistributedClustering_la_LIBADD = \

380

 --- a/src/libSharedComponents/Makefile.am

381

 +++ b/src/libSharedComponents/Makefile.am

382

 @@ -76,7 +76,7 @@

383

@@ -107,17 +53,6 @@

384

  if MAKE_OLD_PCFPARSER

385

    libSharedComponents_la_CPPFLAGS += -I${top_srcdir}/pcfparser_svn3942/old

386

  else

387

---- a/src/libSharedComponents/Makefile.in

388

-+++ b/src/libSharedComponents/Makefile.in

389

-@@ -551,7 +551,7 @@

390

- libSharedComponents_la_CPPFLAGS = @CLUSTERING_CPPFLAGS@ \

391

- 	-I${top_srcdir}/src/libClustering \

392

- 	-I${top_srcdir}/src/libParaverTraceParser \

393

--	-I${top_srcdir}/src/libANN $(am__append_2) $(am__append_3)

394

-+	-I/usr/include/ANN $(am__append_2) $(am__append_3)

395

- libSharedComponents_la_LDFLAGS = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@

396

- libSharedComponents_la_LIBADD = \

397

- 	$(top_builddir)/pcfparser_svn3942/libparavertraceconfig.la \

398

 --- a/src/libTraceClustering/Makefile.am

399

 +++ b/src/libTraceClustering/Makefile.am

400

 @@ -7,7 +7,7 @@

401

@@ -134,30 +69,10 @@

402

    -I$(top_srcdir)/src/libSharedComponents\

403

    -I$(top_srcdir)/pcfparser_svn3942\

404

 -  -I$(top_srcdir)/src/libANN\

405

-+  -I/usr/include/ANN \

406

++  -I/usr/include/ANN\

407

    -I$(top_srcdir)/src/libParaverTraceParser

408

409

  libTraceClustering_la_LDFLAGS  = @CLUSTERING_CPPFLAGS@ @CLUSTERING_LDFLAGS@

410

---- a/src/libTraceClustering/Makefile.in

411

-+++ b/src/libTraceClustering/Makefile.in

412

-@@ -418,7 +418,7 @@

413

- AM_CPPFLAGS = \

414

- 	-I$(top_srcdir)/include \

415

- 	-I$(top_srcdir)/src/BasicClasses \

416

--	-I$(top_srcdir)/src/libANN \

417

-+	-I/usr/include/ANN \

418

- 	-I$(top_srcdir)/src/libSharedComponents \

419

- 	-I$(top_srcdir)/src/libParaverTraceParser \

420

- 	-I$(top_srcdir)/common_utilities \

421

-@@ -438,7 +438,7 @@

422

-   -I$(top_srcdir)/src/libClustering\

423

-   -I$(top_srcdir)/src/libSharedComponents\

424

-   -I$(top_srcdir)/pcfparser_svn3942\

425

--  -I$(top_srcdir)/src/libANN\

426

-+  -I/usr/include/ANN \

427

-   -I$(top_srcdir)/src/libParaverTraceParser

428

-

429

- libTraceClustering_la_LDFLAGS = @CLUSTERING_CPPFLAGS@ @CLUSTERING_LDFLAGS@

430

 --- a/src/Makefile.am

431

 +++ b/src/Makefile.am

432

 @@ -5,7 +5,6 @@

433

@@ -168,26 +83,3 @@

434

  	libClustering \

435

  	libSharedComponents \

436

  	libTraceClustering \

437

---- a/src/Makefile.in

438

-+++ b/src/Makefile.in

439

-@@ -151,7 +151,7 @@

440

-   done | $(am__uniquify_input)`

441

- ETAGS = etags

442

- CTAGS = ctags

443

--DIST_SUBDIRS = BasicClasses libParaverTraceParser libANN libClustering \

444

-+DIST_SUBDIRS = BasicClasses libParaverTraceParser libClustering \

445

- 	libSharedComponents libTraceClustering ClusteringDataExtractor \

446

- 	DBSCANParametersApproximation BurstClustering ClustersDiff \

447

- 	ClustersSequenceScore MusterDistributedClustering \

448

-@@ -380,10 +380,9 @@

449

- CLUSTERING_DIR = $(SRC_DIR)/libClustering

450

- CLUSTERING_ALG_DIR = $(SRC_DIR)/libClusteringAlgorithms

451

- PARAVER_PARSER_DIR = $(SRC_DIR)/libParaverTraceParser

452

--ANN_DIR = $(SRC_DIR)/libANN

453

-

454

- # common_filesdir = @common_filesdir@

455

--SUBDIRS = BasicClasses libParaverTraceParser libANN libClustering \

456

-+SUBDIRS = BasicClasses libParaverTraceParser libClustering \

457

- 	libSharedComponents libTraceClustering ClusteringDataExtractor \

458

- 	DBSCANParametersApproximation BurstClustering ClustersDiff \

459

- 	ClustersSequenceScore $(am__append_1) $(am__append_2)

Gentoo Archives: gentoo-commits