mirror of
https://github.com/amd/blis.git
synced 2026-04-20 07:38:53 +00:00
Added separate PC for mt blis library
Added separate package configuration file for st and mt library in blis Makefile and CMakeLists.txt Change-Id: I8d851fac10d63983358e1f4c67fd9451246056bf
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
An object-based framework for developing high-performance BLAS-like
|
||||
libraries.
|
||||
|
||||
Copyright (C) 2022 - 2024, Advanced Micro Devices, Inc. All rights reserved.
|
||||
Copyright (C) 2022 - 2025, Advanced Micro Devices, Inc. All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
@@ -1196,6 +1196,14 @@ if(WIN32)
|
||||
string(APPEND LIBBLIS_SHARED -dll)
|
||||
endif()
|
||||
|
||||
if(THREADING_MODEL STREQUAL "no")
|
||||
set(PC_IN_FILE "aocl-blas.pc.in")
|
||||
set(PC_OUT_FILE "aocl-blas.pc")
|
||||
else()
|
||||
set(PC_IN_FILE "aocl-blas-mt.pc.in")
|
||||
set(PC_OUT_FILE "aocl-blas-mt.pc")
|
||||
endif()
|
||||
|
||||
# Set directories for installation of libraries and header files.
|
||||
set(LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib)
|
||||
set(INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
|
||||
@@ -1208,8 +1216,8 @@ endif()
|
||||
string(JOIN " " LDFLAGS_STRING ${LDFLAGS_STRING})
|
||||
if(NOT WIN32)
|
||||
configure_file(
|
||||
${CMAKE_SOURCE_DIR}/build/cmake/aocl-blas.pc.in
|
||||
${CMAKE_BINARY_DIR}/aocl-blas.pc
|
||||
${CMAKE_SOURCE_DIR}/build/cmake/${PC_IN_FILE}
|
||||
${CMAKE_BINARY_DIR}/${PC_OUT_FILE}
|
||||
@ONLY
|
||||
)
|
||||
endif()
|
||||
@@ -1265,7 +1273,7 @@ endif()
|
||||
|
||||
if(NOT WIN32)
|
||||
# Install package-config file.
|
||||
install(FILES ${CMAKE_BINARY_DIR}/aocl-blas.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
|
||||
install(FILES ${CMAKE_BINARY_DIR}/${PC_OUT_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
|
||||
endif()
|
||||
|
||||
# Set libblis to the shared or static libblis depending on the option setting.
|
||||
|
||||
8
Makefile
8
Makefile
@@ -5,7 +5,7 @@
|
||||
# libraries.
|
||||
#
|
||||
# Copyright (C) 2014, The University of Texas at Austin
|
||||
# Copyright (C) 2022 - 2024, Advanced Micro Devices, Inc. All rights reserved.
|
||||
# Copyright (C) 2022 - 2025, Advanced Micro Devices, Inc. All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
@@ -337,8 +337,6 @@ HEADERS_TO_INSTALL += $(wildcard $(VEND_CPP_PATH)/*.hh)
|
||||
FRAGS_TO_INSTALL := $(CONFIG_MK_FILE) \
|
||||
$(COMMON_MK_FILE)
|
||||
|
||||
PC_IN_FILE := blis.pc.in
|
||||
PC_OUT_FILE := blis.pc
|
||||
|
||||
|
||||
#
|
||||
@@ -1125,8 +1123,12 @@ endif
|
||||
# BLIS library in pkg-configure blis.pc.in file.
|
||||
ifeq ($(THREADING_MODEL),off)
|
||||
AOCLLIB := blis
|
||||
PC_IN_FILE := blis.pc.in
|
||||
PC_OUT_FILE := blis.pc
|
||||
else
|
||||
AOCLLIB := blis-mt
|
||||
PC_IN_FILE := blis-mt.pc.in
|
||||
PC_OUT_FILE := blis-mt.pc
|
||||
endif
|
||||
|
||||
$(PC_SHARE_DIR_INST): $(PC_IN_FILE)
|
||||
|
||||
11
blis-mt.pc.in
Normal file
11
blis-mt.pc.in
Normal file
@@ -0,0 +1,11 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: BLIS
|
||||
Description: BLAS-like Library Instantiation Software Framework
|
||||
Version: @PACKAGE_VERSION@
|
||||
Libs: -L${libdir} -l@AOCLLIB@
|
||||
Libs.private: @LDFLAGS@
|
||||
Cflags: -I${includedir}/blis
|
||||
11
build/cmake/aocl-blas-mt.pc.in
Normal file
11
build/cmake/aocl-blas-mt.pc.in
Normal file
@@ -0,0 +1,11 @@
|
||||
prefix=@CMAKE_INSTALL_PREFIX@
|
||||
exec_prefix=${prefix}
|
||||
libdir=@LIB_DIR@
|
||||
includedir=@INCLUDE_DIR@
|
||||
|
||||
Name: AOCL-BLAS
|
||||
Description: BLAS-like Library Instantiation Software Framework
|
||||
Version: @VERSION_STRING@
|
||||
Libs: -L${libdir} -l@LIBBLIS@
|
||||
Libs.private: @LDFLAGS_STRING@
|
||||
Cflags: -I${includedir}
|
||||
Reference in New Issue
Block a user