pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libflame: Update to newer git commit and enable optimizations



Module Name:	pkgsrc-wip
Committed By:	Matthew Danielson <matthewd%fastmail.us@localhost>
Pushed By:	matthewd
Date:		Fri Jul 21 07:22:12 2023 -0700
Changeset:	dc9d4a84647fb0c9656f67bdfcf971baf6563859

Modified Files:
	libflame/Makefile.common
	libflame/distinfo
	libflame/patches/patch-configure
	libflame/version.mk

Log Message:
libflame: Update to newer git commit and enable optimizations

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dc9d4a84647fb0c9656f67bdfcf971baf6563859

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libflame/Makefile.common         | 14 +++++++++-----
 libflame/distinfo                |  8 ++++----
 libflame/patches/patch-configure | 36 +++++++++++++-----------------------
 libflame/version.mk              |  4 ++--
 4 files changed, 28 insertions(+), 34 deletions(-)

diffs:
diff --git a/libflame/Makefile.common b/libflame/Makefile.common
index 2d6e29998b..203d2ee69e 100644
--- a/libflame/Makefile.common
+++ b/libflame/Makefile.common
@@ -21,7 +21,8 @@ USE_LANGUAGES=		c c++ fortran
 USE_TOOLS=	perl
 USE_TOOLS+=	gmake
 USE_TOOLS+=	bash
-
+CC=gcc
+CFLAGS+=-march=native
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--includedir=${PREFIX}/include/${LIBFLAME_VARIANT}
 CONFIGURE_ARGS+=	--enable-max-arg-list-hack
@@ -33,14 +34,16 @@ CONFIGURE_ARGS+=	--enable-verbose-make-output
 # CONFIGURE_ARGS+= --enable-autodetect-f77-name-mangling
 # CONFIGURE_ARGS+= --enable-non-critical-code
 # CONFIGURE_ARGS+= --disable-builtin-blas
+#CONFIGURE_ARGS+=	--enable-lapack2flash
 CONFIGURE_ARGS+=	--enable-lapack2flame
-# CONFIGURE_ARGS+= --disable-external-lapack-for-subproblems
+CONFIGURE_ARGS+=	--enable-legacy-lapack
+CONFIGURE_ARGS+= --disable-external-lapack-for-subproblems
 # CONFIGURE_ARGS+= --disable-blas3-front-end-cntl-trees
-# CONFIGURE_ARGS+= --enable-supermatrix
+CONFIGURE_ARGS+= --enable-supermatrix
 # CONFIGURE_ARGS+= --disable-gpu
-# CONFIGURE_ARGS+= --disable-vector-intrinsics
+CONFIGURE_ARGS+= --enable-vector-intrinsics=sse
 # CONFIGURE_ARGS+= --enable-ldim-alignment
-# CONFIGURE_ARGS+= --enable-optimizations
+CONFIGURE_ARGS+= --enable-optimizations
 # CONFIGURE_ARGS+= --enable-warnings
 # CONFIGURE_ARGS+= --enable-debug
 # CONFIGURE_ARGS+= --disable-profiling
@@ -74,6 +77,7 @@ SUBST_FILES.python+=	windows/build/gen-check-rev-file.py
 SUBST_FILES.python+=	netlib-test/lapack-3.4.2/lapack_testing.py
 SUBST_FILES.python+=	build/flatten-headers.py
 
+REPLACE_BASH+=	src/map/common/lapacksrc/scripts/regen-files.sh
 PLIST_SRC=	${.CURDIR}/../../wip/libflame/PLIST
 PLIST_SUBST+=	LIBFLAME_VARIANT=${LIBFLAME_VARIANT}
 
diff --git a/libflame/distinfo b/libflame/distinfo
index 3f0b174069..fbfd6016b3 100644
--- a/libflame/distinfo
+++ b/libflame/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.21 2017/09/11 20:56:28 wiz Exp $
 
-BLAKE2s (libflame-5.2.0-edbd6eba8a2269b0e05d64d8b02aff778fa4a07a.tar.gz) = 50e035a38df39f99b1aa9b0a83dd3dbe6998ba1a415d7ab3f79f4dd40b76b594
-SHA512 (libflame-5.2.0-edbd6eba8a2269b0e05d64d8b02aff778fa4a07a.tar.gz) = 7880c6c4aeb60709fd14a64506b5830c192ae43fc672a7d9b205634bbd392b2857ea1db4b3bd242a800f98d776d840e45cafbb254a13f673a6c65bbb8045067b
-Size (libflame-5.2.0-edbd6eba8a2269b0e05d64d8b02aff778fa4a07a.tar.gz) = 19256160 bytes
-SHA1 (patch-configure) = 60c396fadc5873b0a3b0437f255962a706166a32
+BLAKE2s (libflame-5.2.0-9eae1d98f37c30774e53d0cefb31188102ab742b.tar.gz) = e2c6e722e541d8ab405ad9b598d244ecfcf7411812948ec97127fdf470374bab
+SHA512 (libflame-5.2.0-9eae1d98f37c30774e53d0cefb31188102ab742b.tar.gz) = 5ee81e243a6cefb640614206cf436617b7afbdba7e7eecefd0d4aa259961d3483186774aa4d15162051294ca3f145059ae9c8872bc58baeb5ffb1920357aa7fd
+Size (libflame-5.2.0-9eae1d98f37c30774e53d0cefb31188102ab742b.tar.gz) = 23640074 bytes
+SHA1 (patch-configure) = 92a22038ad342c15041af506d2b588cd02e7260d
 SHA1 (patch-configure__tidsp) = 5cffd9736605ec0d6cf02466da62531ab1f12c16
diff --git a/libflame/patches/patch-configure b/libflame/patches/patch-configure
index f62869017b..760d488a2e 100644
--- a/libflame/patches/patch-configure
+++ b/libflame/patches/patch-configure
@@ -2,48 +2,38 @@ $NetBSD$
 
 Address portability issues.
 
---- configure.orig	2023-01-25 23:44:27.000000000 +0000
+--- configure.orig	2023-06-24 01:23:06.000000000 +0000
 +++ configure
-@@ -6904,6 +6904,9 @@ printf %s "checking for (guessing) OpenM
- 				icc)
- 			fla_c_openmp_flags='-openmp'
- 		;;
-+				cc)
-+			fla_c_openmp_flags='-fopenmp'
-+		;;
- 				gcc)
- 			fla_c_openmp_flags='-fopenmp'
- 		;;
-@@ -7470,7 +7473,7 @@ printf "%s\n" "no" >&6; }
- 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for (guessing) appropriate ${CC_VENDOR} optimization flags" >&5
- printf %s "checking for (guessing) appropriate ${CC_VENDOR} optimization flags... " >&6; }
+@@ -7450,7 +7450,7 @@ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for (guessing) appropriate ${CC_VENDOR} optimization flags" >&5
+ $as_echo_n "checking for (guessing) appropriate ${CC_VENDOR} optimization flags... " >&6; }
 
 -	if test "$fla_enable_compiler_optimizations" == "yes" ; then
 +	if test "$fla_enable_compiler_optimizations" = "yes" ; then
 
  				case ${CC_VENDOR} in
  						gcc)
-@@ -7589,7 +7592,7 @@ printf "%s\n" "no" >&6; }
- 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for (guessing) appropriate ${CC_VENDOR} warning flags" >&5
- printf %s "checking for (guessing) appropriate ${CC_VENDOR} warning flags... " >&6; }
+@@ -7568,7 +7568,7 @@ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for (guessing) appropriate ${CC_VENDOR} warning flags" >&5
+ $as_echo_n "checking for (guessing) appropriate ${CC_VENDOR} warning flags... " >&6; }
 
 -	if test "$fla_enable_compiler_warnings" == "yes" ; then
 +	if test "$fla_enable_compiler_warnings" = "yes" ; then
 
  				case ${CC_VENDOR} in
  						gcc)
-@@ -7707,7 +7710,7 @@ printf "%s\n" "no" >&6; }
- 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for (guessing) appropriate ${CC_VENDOR} debug flags" >&5
- printf %s "checking for (guessing) appropriate ${CC_VENDOR} debug flags... " >&6; }
+@@ -7685,7 +7685,7 @@ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for (guessing) appropriate ${CC_VENDOR} debug flags" >&5
+ $as_echo_n "checking for (guessing) appropriate ${CC_VENDOR} debug flags... " >&6; }
 
 -	if test "$fla_enable_compiler_debug" == "yes" ; then
 +	if test "$fla_enable_compiler_debug" = "yes" ; then
 
  				case ${CC_VENDOR} in
  						gcc)
-@@ -7826,7 +7829,7 @@ printf "%s\n" "no" >&6; }
- 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for (guessing) appropriate ${CC_VENDOR} profiling flags" >&5
- printf %s "checking for (guessing) appropriate ${CC_VENDOR} profiling flags... " >&6; }
+@@ -7803,7 +7803,7 @@ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for (guessing) appropriate ${CC_VENDOR} profiling flags" >&5
+ $as_echo_n "checking for (guessing) appropriate ${CC_VENDOR} profiling flags... " >&6; }
 
 -	if test "$fla_enable_compiler_profiling" == "yes" ; then
 +	if test "$fla_enable_compiler_profiling" = "yes" ; then
diff --git a/libflame/version.mk b/libflame/version.mk
index 6c745901f7..fd7dd77024 100644
--- a/libflame/version.mk
+++ b/libflame/version.mk
@@ -1,5 +1,5 @@
 # $NetBSD: version.mk,v 1.2 2021/03/25 23:22:35 thor Exp $
 
-PKGREVISION=		1
-GITHUB_TAG=		edbd6eba8a2269b0e05d64d8b02aff778fa4a07a
+PKGREVISION=		2
+GITHUB_TAG=		9eae1d98f37c30774e53d0cefb31188102ab742b
 LIBFLAME_VERSION=	5.2.0


Home | Main Index | Thread Index | Old Index