blis: Update to 1.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: blis: Update to 1.0
From: Matthew Danielson (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Tue, 31 Dec 2024 04:32:47 +0000
Module Name:	pkgsrc-wip
Committed By:	Matthew Danielson <matthewd%fastmail.us@localhost>
Pushed By:	matthewd
Date:		Mon Dec 30 19:56:56 2024 -0800
Changeset:	777089c089df9c742d5cff7fe0d45d3244a7dae2

Modified Files:
	blis/Makefile
	blis/PLIST
	blis/distinfo
	blis/version.mk
Added Files:
	blis/options.mk
	blis/patches/patch-Makefile
Removed Files:
	blis/Makefile.common
	blis_openmp/DESCR
	blis_openmp/Makefile
	blis_openmp/buildlink3.mk
	blis_pthread/DESCR
	blis_pthread/Makefile
	blis_pthread/buildlink3.mk

Log Message:
blis: Update to 1.0

Note: It was too much to maintain the blis openmp/pthread packages separately
in the style that supports letting them be installed separately.  If
someone else wants to revive this, please do!

This release contains several new features and optimizations related to threaded execution, as well as internal changes that improve maintainability and lay the groundwork for future refactoring. The build system and kernel sets saw lots of new code and tweaks to old code, and of course there were many bugfixes.
Improvements present in 1.0:
Framework:

    Initialize/finalize BLIS via a new bli_pthread_switch_t API. (Field Van Zee, Devin Matthews)
    Revamped bli_init() to use TLS where feasible. (Field Van Zee, Edward Smyth, Minh Quan Ho)
    Implemented support for fat multithreading.
    Implemented tile-level load balancing (tlb), or tile-level partitioning, in jr/ir loops for gemm, gemmt, and trmm macrokernels. (Field Van Zee, Devin Matthews, Leick Robinson, Minh Quan Ho)
    Added padding to thrcomm_t fields to avoid false sharing of cache lines. (Leick Robinson)
    Rewrote/fixed broken tree barrier implementation. (Leick Robinson)
    Refactored some rntm_t management code. (Field Van Zee, Devin Matthews)
    Initialize rntm_t nt/ways fields with 1 (not -1). (Field Van Zee, Jeff Diamond, Leick Robinson, Devin Matthews)
    Defined invscalv, invscalm, invscald operations.
    Added consistent NaN/Inf handling in sumsqv. (Devin Matthews)
    Implemented support for HPX as a threading backend option. (Christopher Taylor, Srinivas Yadav)
    Relocated the pba, sba pool (from the rntm_t), and mem_t (from the cntl_t) to the thrinfo_t object.
    Modified which communicator is associated with a given node of the thrinfo_t tree. (Devin Matthews)
    Refactored level-3 thread decorator into two parts: a thread launcher and a function to pass operands. (Devin Matthews)
    Refactored structure awareness in bli_packm_blk_var1.c. (Devin Matthews)
    Reimplemented bli_l3_determine_kc(). (Devin Matthews)
    Implemented cntx_t pointer caching in gks. (Field Van Zee, Harihara Sudhan S)
    Added const keyword to pointers in kernel APIs. (Field Van Zee, Nisanth M P)
    Migrated all kernel APIs to use void* pointers.
    Defined new global scalar constants: BLIS_ONE_I, BLIS_MINUS_ONE_I, BLIS_NAN. (Devin Matthews)
    Disabled modification of KC in the gemmsup kernels. (Devin Matthews)
    Defined lt, lte, gt, gte operations and other miscellaneous updates.
    Consolidated INSERT_ macro sets via variadic macros. (Devin Matthews)
    De-templatized macrokernels for gemmt, trmm, and trsm to match that of gemm. (Devin Matthews)
    De-templatized bli_l3_sup_var1n2m.c and unified _sup_packm_a/b(). (Devin Matthews)
    Fixed 1m enablement for herk/her2k/syrk/syr2k. (Devin Matthews)
    Fixed trmm[3]/trsm performance bug introduced in cf7d616. (Field Van Zee, Leick Robinson)
    Fixed a 1m optimization bug in right-sided hemm/symm. (Field Van Zee, Nisanth M P)
    Fixed a bug in sup threshold registration. (Devin Matthews, Field Van Zee)
    Fixed brokenness in the small block allocator (sba) when the sba is disabled. (Field Van Zee, John Mather)
    Fixed type bug in bli_cntx_set_ukr_prefs(). (Field Van Zee, Leick Robinson, Devin Matthews, Jeff Diamond)
    Fixed incorrect sizeof(type) in edge case macros. (@moon-chilled)
    Fixed bugs and added sanity check in bli_pool.c. (Devin Matthews)
    Fixed a typo in the macro definition for VEXTRACTF64X2 in bli_x86_asm_macros.h. (Harsh Dave)
    Fixed a typo in bli_type_defs.h where BLIS_BLAS_INT_TYPE_SIZE was misspelled. (Devin Matthews)
    Typecast printf() args in bli_thread_range_tlb.c to avoid compiler warnings. (Lee Killough)
    Minor tweaks to bli_l3_check.c.
    Partial addition of const to all interfaces above the (micro)kernels. (Devin Matthews)
    Fixed a harmless misspelling of xpbys in gemm macrokernel.
    Various internal API renaming/reorganization.
    Various other fixes.

Compatibility:

    Implemented [cz]symv_(), [cz]syr_(), [cz]rot_(). (Field Van Zee, James Foster)
    Fixed compilation errors when BLIS_DISABLE_BLAS_DEFS is defined. (Field Van Zee, Edward Smyth, Devin Matthews)
    Include bli_config.h before bli_system.h in cblas.h so that BLIS_ENABLE_SYSTEM is defined in time for proper OS detection. (Edward Smyth)

Kernels:

    Updated ARMv8a kernels to fix two prefetching issues and re-enable general stride IO. (Jeff Diamond)
    Restored general storage case to armsve kernels. (RuQing Xu)
    Added arm64 dgemmsup with extended MR and NR. (RuQing Xu)
    Reorganized the way packm kernels are stored within the cntx_t so that BLIS only stores two packm kernels per datatype: one for MRxk upanels and one for kxNR upanels. (Devin Matthews)
    Fixed bugs in scal2v reference kernel when alpha == 1.
    Fixed out-of-bounds read in haswell gemmsup kernels. (Daniël de Kok, Bhaskar Nallani, Madeesh Kannan)
    Fixed k = 0 edge case in power10 microkernels. (Nisanth M P)
    Disabled power10 kernels other than sgemm, dgemm. (Nisanth M P)
    Fixed bli_gemm_small() prototype mismatch. (Jeff Diamond)

Extras:

    Use the conventional level-3 sup thread decorator within the gemmlike sandbox.
    Fixed type-mismatch errors in power10 sandbox. (Nisanth M P)
    Fixed gemmlike sandbox bug that stems from reuse of bli_thrinfo_sup_grow().

Build system:

    Added two arm64 subconfigs: altra and altramax. (Jeff Diamond, Leick Robinson)
    Added support for RISC-V configuration targets. (Angelika Schwarz, Lee Killough)
    Auto-detect the RISC-V ABI of the compiler and use -mabi= during RISC-V builds. (Lee Killough)
    Added sifive_x280 subconfig and kernel set. (Aaron Hutchinson, Lee Killough, Devin Matthews, and Angelika Schwarz)
    Added AddressSanitizer (--enable-asan) option to configure. (Devin Matthews)
    Added option to disable thread-local storage via --disable-tls. (Field Van Zee, Nick Knight)
    Exclude -lrt on Android with Bionic libraries. (Lee Killough)
    Omit -fPIC option when shared library build is disabled. (Field Van Zee, Nick Knight)
    Move -fPIC option insertion to subconfigs' make_defs.mk files. (Field Van Zee, Nick Knight)
    Install one-line helper headers to INCDIR prefix so that user can #include "blis.h" instead of #include <blis/blis.h> and/or "cblas.h" instead of <blis/cblas.h> if CBLAS is enabled). (Field Van Zee, Jed Brown, Devin Matthews, Mo Zhou)
    Enhanced detection of Fortran compiler when checking the version string for the purposes of determining a default return convention for complex domain values. (Bart Oldeman)
    Added detection of the NVIDIA nvhpc compiler (nvc) in configure. (Ajay Panyala)
    Updated zen3 subconfig to support NVHPC compilers. (Abhishek Bagusetty)
    Use kernel CFLAGS for kernels subdirs in addons. (AMD, Mithun Mohan)
    Created power umbrella configuration family (which currently includes power9 and power10 subconfigs). (Nisanth M P)
    Defined BLIS_VERSION_STRING in blis.h instead of via command line argument during compilation. (Field Van Zee, Mohsen Aznaveh, Tim Davis)
    Rewrote regen-symbols.sh as gen-libblis-symbols.sh. (Field Van Zee)
    Support clang targetting MinGW. (Isuru Fernando)
    Added autodetection (via /proc/cpuinfo) for POWER7, POWER9 and POWER10 microarchitectures. (Alexander Grund)
    Added #line directives to flattened blis.h to facilitate easier debugging. (Devin Matthews)
    Added --nosup and --sup shorthand options to configure.
    Use here-document syntax for configure --help output. (Lee Killough)
    Updated configure to pass all shellcheck checks. (Lee Killough)
    Tweaks to .dir-locals.el to enhance emacs formatting of C files. (Lee Killough)
    Removed buggy cruft from power10 subconfig. (Field Van Zee, Nicholai Tukanov)
    Added missing #include <io.h> for Windows. (@h-vetinari)
    Fixed hardware auto-detection for firestorm (Apple M1) subconfig. (Devin Matthews)
    Fixed bug in detection of Fortran compiler vendor. (Devin Matthews)
    Fixed version check for znver3, which needs gcc >= 10.3. (Jed Brown)
    Fixed typo in configure --help text. (Lee Killough)
    Fixed warning about regular expressions with stray backslashes as the result of recent changes to grep.
    Added output.testsuite to .gitignore.
    Minor changes to .gitignore and LICENSE files. (Jeff Diamond)
    Minor decluttering of top-level directory.
    Very minor tweaks to common.mk.

Testing:

    Rewrote test/3 drivers to take parameters via command line arguments. (Field Van Zee, Jeff Diamond, Leick Robinson)
    Added arm64 entry to .travis.yml so that Travis CI will compile/test ARM builds. (Field Van Zee, RuQing Xu)
    Test the gemmlike sandbox via AppVeyor. (Jeff Diamond)
    Added -q quiet mode option to testsuite.
    Fixed non-deterministic segfault in standalone test/3 drivers. (Field Van Zee, Leick Robinson)
    Fixed a crash that occurs when either cblat1 or zblat1 are linked with a build of BLIS that was compiled with --complex-return=intel. (Bart Oldeman)
    Other minor fixes/tweaks.

Documentation:

    Added Discord documentation (docs/Discord.md) and logo to README.md.
    Added the mm_algorithm files (for bp and pb) to docs/diagrams.
    Added mention of Wilkinson Prize to README.md.
    Minor fixes and improvements to docs/Multithreading.md.
    Fix typos in docs + example code comments. (Igor Zhuravlov)

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

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

diffstat:
 blis/Makefile               | 41 ++++++++++++++++++++--
 blis/Makefile.common        | 83 ---------------------------------------------
 blis/PLIST                  | 22 ++++++------
 blis/distinfo               |  7 ++--
 blis/options.mk             | 17 ++++++++++
 blis/patches/patch-Makefile | 45 ++++++++++++++++++++++++
 blis/version.mk             |  6 ++--
 blis_openmp/DESCR           | 12 -------
 blis_openmp/Makefile        |  5 ---
 blis_openmp/buildlink3.mk   | 13 -------
 blis_pthread/DESCR          | 12 -------
 blis_pthread/Makefile       |  6 ----
 blis_pthread/buildlink3.mk  | 13 -------
 13 files changed, 120 insertions(+), 162 deletions(-)

diffs:
diff --git a/blis/Makefile b/blis/Makefile
index 7c9778fdb9..abf4d02b72 100644
--- a/blis/Makefile
+++ b/blis/Makefile
@@ -1,4 +1,41 @@
 # $NetBSD$
-BLIS_VARIANT=blis
-.include "../../wip/blis/Makefile.common"
+#
+BLIS_VERSION=	1.0
+DISTNAME=	blis
+PKGNAME=	blis-${BLIS_VERSION}
+GITHUB_TAG=	${BLIS_VERSION}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=flame/}
+MAINTAINER=	matthewd%fastmail.us@localhost
+HOMEPAGE=	https://github.com/flame/libflame
+LICENSE=	modified-bsd
+COMMENT=	Framework for instantiating BLAS libraries
+WRKSRC=		${WRKDIR}/blis-${GITHUB_TAG}
+
+
+CATEGORIES=	math
+
+HAS_CONFIGURE=	yes
+USE_LANGUAGES=	c c++ fortran
+USE_TOOLS=	perl
+USE_TOOLS+=	bash
+USE_TOOLS+=	gmake
+
+CONFIG_SHELL=		bash
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+#CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}/lib
+CONFIGURE_ARGS+=	--enable-blas
+CONFIGURE_ARGS+=	--enable-cblas
+CONFIGURE_ARGS+=	--enable-verbose-make
+
+
+MAKE_ENV=	V=1
+.include "../../wip/blis/options.mk"
+
+# needs to be the last commandline argument
+CONFIGURE_ARGS+=	auto
+
+do-test:
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} gmake test
+
+.include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/blis/Makefile.common b/blis/Makefile.common
deleted file mode 100644
index ab8415e2e1..0000000000
--- a/blis/Makefile.common
+++ /dev/null
@@ -1,83 +0,0 @@
-# $NetBSD: Makefile,v 1.39 2019/10/05 06:14:05 ryoon Exp $
-# used by wip/blis_openmp/Makefile
-# used by wip/blis_pthread/Makefile
-
-DISTNAME=blis
-.include "../../wip/blis/version.mk"
-PKGNAME=	${BLIS_VARIANT}-${BLIS_VERSION}
-GITHUB_TAG=${BLIS_COMMIT}
-MASTER_SITES=${MASTER_SITE_GITHUB:=flame/}
-MAINTAINER=	matthewd%fastmail.us@localhost
-HOMEPAGE=	https://github.com/flame/libflame
-LICENSE=	modified-bsd
-COMMENT=	Framework for instantiating BLAS libraries
-WRKSRC=${WRKDIR}/blis-${GITHUB_TAG}
-DISTINFO_FILE=      ${.CURDIR}/../../wip/blis/distinfo
-
-CATEGORIES=	math
-
-HAS_CONFIGURE=	yes
-USE_LANGUAGES=	c c++ fortran
-USE_TOOLS=	perl
-USE_TOOLS+=	bash
-USE_TOOLS+=	gmake
-
-CONFIG_SHELL=		bash
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-#CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}/lib
-#CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/${BLIS_VARIANT}
-#CONFIGURE_ARGS+=	--sharedir=${PREFIX}/share/${BLIS_VARIANT}
-CONFIGURE_ARGS+=	--enable-blas
-CONFIGURE_ARGS+=	--enable-cblas
-CONFIGURE_ARGS+=	--enable-threading=${BLIS_VARIANT}
-CONFIGURE_ARGS+=	--enable-verbose-make
-
-
-MAKE_ENV=	V=1
-
-.if ${BLIS_VARIANT} == "blis_openmp"
-CONFIGURE_ARGS+=	--enable-threading=openmp
-.elif ${BLIS_VARIANT} == "blis_pthread"
-CONFIGURE_ARGS+=	--enable-threading=pthreads
-.elif ${BLIS_VARIANT} == "blis"
-CONFIGURE_ARGS+=	--enable-threading=no
-.endif
-
-# needs to be the last
-#CONFIGURE_ARGS+=	generic
-CONFIGURE_ARGS+=	auto
-
-SUBST_CLASSES+=		libblis
-SUBST_STAGE.libblis=	pre-build
-SUBST_SED.libblis+=	-e "s|libblis|lib${BLIS_VARIANT}|g"
-SUBST_FILES.libblis+=	common.mk
-
-.if ${BLIS_VARIANT} != "blis"
-SUBST_CLASSES+=		sharedir
-SUBST_STAGE.sharedir=	pre-build
-SUBST_SED.sharedir+=	-e "s|\${INSTALL_SHAREDIR}/blis|\${INSTALL_SHAREDIR}/${BLIS_VARIANT}|g"
-SUBST_FILES.sharedir+=	Makefile
-
-SUBST_CLASSES+=			package_config
-SUBST_STAGE.package_config=	pre-build
-SUBST_SED.package_config+=	-e "s|PC_OUT_FILE := blis.pc|PC_OUT_FILE := ${BLIS_VARIANT}.pc|g"
-SUBST_FILES.package_config+=	Makefile
-
-SUBST_CLASSES+=		pc_in
-SUBST_STAGE.pc_in=	pre-build
-SUBST_SED.pc_in+=	-e "s|-lblis|-l${BLIS_VARIANT}|g"
-SUBST_SED.pc_in+=	-e "s|/blis|/${BLIS_VARIANT}|g"
-SUBST_FILES.pc_in+=	blis.pc.in
-.endif
-PLIST_SUBST+=		BLIS_VARIANT=${BLIS_VARIANT}
-PLIST_SRC=		${.CURDIR}/../../wip/blis/PLIST
-
-# This is a bit of a hack
-post-install:
-	${MV} ${DESTDIR}${PREFIX}/share/${BLIS_VARIANT}/config/* ${DESTDIR}${PREFIX}/share/${BLIS_VARIANT}/config/arch
-
-
-do-test:
-	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} gmake test
-
-.include "../../lang/python/tool.mk"
diff --git a/blis/PLIST b/blis/PLIST
index 40c20dfde0..99c17dd77c 100644
--- a/blis/PLIST
+++ b/blis/PLIST
@@ -1,11 +1,13 @@
 @comment $NetBSD$
-include/${BLIS_VARIANT}/blis.h
-include/${BLIS_VARIANT}/cblas.h
-lib/lib${BLIS_VARIANT}.a
-lib/lib${BLIS_VARIANT}.so
-lib/lib${BLIS_VARIANT}.so.4
-lib/lib${BLIS_VARIANT}.so.4.0.0
-share/${BLIS_VARIANT}/common.mk
-share/${BLIS_VARIANT}/config.mk
-share/${BLIS_VARIANT}/config/arch/make_defs.mk
-share/pkgconfig/${BLIS_VARIANT}.pc
+include/blis.h
+include/blis/blis.h
+include/blis/cblas.h
+include/cblas.h
+lib/libblis.a
+lib/libblis.so
+lib/libblis.so.4
+lib/libblis.so.4.0.0
+lib/pkgconfig/blis.pc
+share/blis/common.mk
+share/blis/config.mk
+share/blis/config/arch/make_defs.mk
diff --git a/blis/distinfo b/blis/distinfo
index 12a988edc3..dd766b8040 100644
--- a/blis/distinfo
+++ b/blis/distinfo
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.21 2017/09/11 20:56:28 wiz Exp $
 
-BLAKE2s (blis-a0b04e3c007f1207e5678bf20c07752906742fb7.tar.gz) = 63b5c63021ffc465f5567c6237d14690947350aaaad9f98b4219fe0a3b493e8a
-SHA512 (blis-a0b04e3c007f1207e5678bf20c07752906742fb7.tar.gz) = 3845635cad46283ad98f9f7b26ad6f219e8ec192e87768694e24db8191e51a8652fc1de01d1b91ad180b08dac9cebd6f9a23c16f07b2b51c19502402ee1515cb
-Size (blis-a0b04e3c007f1207e5678bf20c07752906742fb7.tar.gz) = 15584182 bytes
+BLAKE2s (blis.tar.gz) = b71fc5e811f4cced67a73b9dcbf897aa68fb2cf1e7bf7e825f729a5b46285e9c
+SHA512 (blis.tar.gz) = 91cd2a2944762e584f11cb931ba11c4b296e93040b553f105ba8579d748a49cfcb6db8ae2ce1b5a537c0ae88182c9d212a4a5daa757ca4d0a7beee552d2eb55c
+Size (blis.tar.gz) = 15714356 bytes
+SHA1 (patch-Makefile) = df30063e87bdd5faa55f23506519d8ed3cc39b27
diff --git a/blis/options.mk b/blis/options.mk
new file mode 100644
index 0000000000..7a7d794b44
--- /dev/null
+++ b/blis/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.5 2019/04/26 13:13:46 maya Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.blis
+PKG_SUPPORTED_OPTIONS=	openmp pthread
+PKG_SUGGESTED_OPTIONS=	openmp
+
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mopenmp)
+CONFIGURE_ARGS+=	--enable-threading=openmp
+.  if !empty(PKG_OPTIONS:Mpthread)
+CONFIGURE_ARGS+=	--enable-threading=pthread
+.  else
+CONFIGURE_ARGS+=	--enable-threading=no
+.  endif
+.endif
diff --git a/blis/patches/patch-Makefile b/blis/patches/patch-Makefile
new file mode 100644
index 0000000000..693dfb5a98
--- /dev/null
+++ b/blis/patches/patch-Makefile
@@ -0,0 +1,45 @@
+$NetBSD$
+
+Rearrange slightly where things go.
+
+--- Makefile.orig	2024-05-06 19:07:33.000000000 +0000
++++ Makefile
+@@ -169,7 +169,7 @@ MK_INCL_DIR_INST          := $(INSTALL_I
+ # Set the path to the subdirectory of the share installation directory.
+ MK_SHARE_DIR_INST         := $(INSTALL_SHAREDIR)/blis
+ 
+-PC_SHARE_DIR_INST         := $(INSTALL_SHAREDIR)/pkgconfig
++PC_SHARE_DIR_INST         := $(INSTALL_LIBDIR)/pkgconfig
+ 
+ 
+ #
+@@ -1089,17 +1089,17 @@ $(MK_SHARE_DIR_INST): $(FRAGS_TO_INSTALL
+ ifeq ($(ENABLE_VERBOSE),yes)
+ 	$(MKDIR) $(@)
+ 	$(INSTALL) -m 0644 $(FRAGS_TO_INSTALL) $(@)
+-	$(MKDIR) -p $(@)/$(CONFIG_DIR)/$(CONFIG_NAME)
++	$(MKDIR) -p $(@)/$(CONFIG_DIR)/arch
+ 	$(INSTALL) -m 0644 $(CONFIG_DIR)/$(CONFIG_NAME)/$(MAKE_DEFS_FILE) \
+-	              $(@)/$(CONFIG_DIR)/$(CONFIG_NAME)
++	              $(@)/$(CONFIG_DIR)/arch/
+ else
+ 	@$(MKDIR) $(@)
+ 	@echo "Installing $(notdir $(FRAGS_TO_INSTALL)) into $(@)/"
+ 	@$(INSTALL) -m 0644 $(FRAGS_TO_INSTALL) $(@)
+-	@$(MKDIR) -p $(@)/$(CONFIG_DIR)/$(CONFIG_NAME)
++	@$(MKDIR) -p $(@)/$(CONFIG_DIR)/arch
+ 	@echo "Installing $(CONFIG_DIR)/$(CONFIG_NAME)/$(MAKE_DEFS_FILE) into $(@)/$(CONFIG_DIR)/$(CONFIG_NAME)"
+ 	@$(INSTALL) -m 0644 $(CONFIG_DIR)/$(CONFIG_NAME)/$(MAKE_DEFS_FILE) \
+-	               $(@)/$(CONFIG_DIR)/$(CONFIG_NAME)/
++	               $(@)/$(CONFIG_DIR)/arch/
+ endif
+ 
+ $(PC_SHARE_DIR_INST): $(PC_IN_FILE)
+@@ -1108,6 +1108,7 @@ ifeq ($(ENABLE_VERBOSE),yes)
+ 	$(shell cat "$(PC_IN_FILE)" \
+ 	| sed -e "s#@PACKAGE_VERSION@#$(VERSION)#g" \
+ 	| sed -e "s#@prefix@#$(prefix)#g" \
++ 	| sed -e "s#@BLIS_VARIANT@#$(BLIS_VARIANT)#g" \
+ 	| sed -e "s#@exec_prefix@#$(exec_prefix)#g" \
+ 	| sed -e "s#@libdir@#$(libdir)#g" \
+ 	| sed -e "s#@includedir@#$(includedir)#g" \
diff --git a/blis/version.mk b/blis/version.mk
index b8576864b4..e42aa5ec59 100644
--- a/blis/version.mk
+++ b/blis/version.mk
@@ -1,5 +1,5 @@
 # $NetBSD: version.mk,v 1.2 2021/03/25 23:22:35 thor Exp $
 
-BLIS_VERSION=	0.9.0
-PKGREVISION=	2
-BLIS_COMMIT=	a0b04e3c007f1207e5678bf20c07752906742fb7
+BLIS_VERSION=	1.0
+#PKGREVISION=	2
+#BLIS_COMMIT=	a0b04e3c007f1207e5678bf20c07752906742fb7
diff --git a/blis_openmp/DESCR b/blis_openmp/DESCR
deleted file mode 100644
index e88738be59..0000000000
--- a/blis_openmp/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-BLIS is an award-winning portable software framework for instantiating
-high-performance BLAS-like dense linear algebra libraries. The
-framework was designed to isolate essential kernels of computation that,
-when optimized, immediately enable optimized implementations of most
-of its commonly used and computationally intensive operations. BLIS is
-written in ISO C99 and available under a new/modified/3-clause BSD
-license. While BLIS exports a new BLAS-like API, it also includes
-a BLAS compatibility layer which gives application developers access
-to BLIS implementations via traditional BLAS routine calls. An
-object-based API unique to BLIS is also available.
-
-This variant builds BLIS with openmp support.
diff --git a/blis_openmp/Makefile b/blis_openmp/Makefile
deleted file mode 100644
index f6f5d0939e..0000000000
--- a/blis_openmp/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile,v 1.39 2019/10/05 06:14:05 ryoon Exp $
-
-BLIS_VARIANT=blis_openmp
-.include "../../wip/blis/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/blis_openmp/buildlink3.mk b/blis_openmp/buildlink3.mk
deleted file mode 100644
index 792d6cc3a6..0000000000
--- a/blis_openmp/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:57 joerg Exp $
-
-BUILDLINK_TREE+=	blis_openmp
-
-.if !defined(BLIS_OPENMP_BUILDLINK3_MK)
-BLIS_OPENMP_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.blis_openmp+=	blis_openmp>=0.9.0
-BUILDLINK_ABI_DEPENDS.blis_openmp+=	blis_openmp>=0.9.0
-BUILDLINK_PKGSRCDIR.blis_openmp?=	../../wip/blis_openmp
-.endif # BLIS_OPENMP_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-blis_openmp
diff --git a/blis_pthread/DESCR b/blis_pthread/DESCR
deleted file mode 100644
index a99355823d..0000000000
--- a/blis_pthread/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-BLIS is an award-winning portable software framework for instantiating
-high-performance BLAS-like dense linear algebra libraries. The
-framework was designed to isolate essential kernels of computation that,
-when optimized, immediately enable optimized implementations of most
-of its commonly used and computationally intensive operations. BLIS is
-written in ISO C99 and available under a new/modified/3-clause BSD
-license. While BLIS exports a new BLAS-like API, it also includes
-a BLAS compatibility layer which gives application developers access
-to BLIS implementations via traditional BLAS routine calls. An
-object-based API unique to BLIS is also available.
-
-This variance builds blis with pthread support.
diff --git a/blis_pthread/Makefile b/blis_pthread/Makefile
deleted file mode 100644
index e67e287768..0000000000
--- a/blis_pthread/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile,v 1.39 2019/10/05 06:14:05 ryoon Exp $
-
-BLIS_VARIANT=	blis_pthread
-
-.include "../../wip/blis/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/blis_pthread/buildlink3.mk b/blis_pthread/buildlink3.mk
deleted file mode 100644
index 56f2d227f5..0000000000
--- a/blis_pthread/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:57 joerg Exp $
-
-BUILDLINK_TREE+=	blis_pthread
-
-.if !defined(BLIS_PTHREAD_BUILDLINK3_MK)
-BLIS_PTHREAD_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.blis_pthread+=	blis_pthread>=0.9.0
-BUILDLINK_ABI_DEPENDS.blis_pthread+=	blis_pthread>=0.9.0
-BUILDLINK_PKGSRCDIR.blis_pthread?=	../../wip/blis_pthread
-.endif # BLIS_PTHREAD_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-blis_pthread
Prev by Date: py-dask_expr: Update to 1.1.21
Next by Date: elvish-dev: sync HEAD
Previous by Thread: py-dask_expr: Update to 1.1.21
Next by Thread: hcloud: upgraded to latest release 1.49.0
Indexes:
Home | Main Index | Thread Index | Old Index