Skip to content

Commit e284c04

Browse files
xianyixianyi
committed
Merge branch 'develop' into risc-v
2 parents 448fe1c + 0a24f63 commit e284c04

File tree

458 files changed

+132219
-96524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

458 files changed

+132219
-96524
lines changed

‎.github/workflows/dynamic_arch.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: continuous build
22

33
on: [push, pull_request]
44

5+
permissions:
6+
contents: read # to fetch code (actions/checkout)
7+
58
jobs:
69
build:
710
runs-on: ${{ matrix.os }}
@@ -150,6 +153,7 @@ jobs:
150153
matrix:
151154
msystem: [MINGW64, MINGW32, CLANG64]
152155
idx: [int32, int64]
156+
build-type: [Release]
153157
include:
154158
- msystem: MINGW64
155159
idx: int32
@@ -173,6 +177,11 @@ jobs:
173177
idx64-flags: -DBINARY=64 -DINTERFACE64=1
174178
target-prefix: mingw-w64-clang-x86_64
175179
c-lapack-flags: -DC_LAPACK=ON
180+
- msystem: MINGW64
181+
idx: int32
182+
target-prefix: mingw-w64-x86_64
183+
fc-pkg: mingw-w64-x86_64-gcc-fortran
184+
build-type: None
176185
exclude:
177186
- msystem: MINGW32
178187
idx: int64
@@ -215,11 +224,11 @@ jobs:
215224
path: C:/msys64/home/runneradmin/.ccache
216225
# We include the commit sha in the cache key, as new cache entries are
217226
# only created if there is no existing entry for the key yet.
218-
key: ccache-msys2-${{ matrix.msystem }}-${{ matrix.idx }}-${{ github.ref }}-${{ github.sha }}
227+
key: ccache-msys2-${{ matrix.msystem }}-${{ matrix.idx }}-${{ matrix.build-type }}-${{ github.ref }}-${{ github.sha }}
219228
# Restore a matching ccache cache entry. Prefer same branch.
220229
restore-keys: |
221-
ccache-msys2-${{ matrix.msystem }}-${{ matrix.idx }}-${{ github.ref }}
222-
ccache-msys2-${{ matrix.msystem }}-${{ matrix.idx }}
230+
ccache-msys2-${{ matrix.msystem }}-${{ matrix.idx }}-${{ matrix.build-type }}-${{ github.ref }}
231+
ccache-msys2-${{ matrix.msystem }}-${{ matrix.idx }}-${{ matrix.build-type }}
223232
224233
- name: Configure ccache
225234
# Limit the maximum size and switch on compression to avoid exceeding the total disk or cache quota.
@@ -235,7 +244,8 @@ jobs:
235244
- name: Configure OpenBLAS
236245
run: |
237246
mkdir build && cd build
238-
cmake -DBUILD_SHARED_LIBS=ON \
247+
cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} \
248+
-DBUILD_SHARED_LIBS=ON \
239249
-DBUILD_STATIC_LIBS=ON \
240250
-DDYNAMIC_ARCH=ON \
241251
-DUSE_THREAD=ON \
@@ -258,6 +268,7 @@ jobs:
258268
timeout-minutes: 60
259269
run: cd build && ctest
260270

271+
261272
cross_build:
262273
runs-on: ubuntu-22.04
263274

@@ -267,7 +278,7 @@ jobs:
267278
include:
268279
- target: mips64el
269280
triple: mips64el-linux-gnuabi64
270-
opts: DYNAMIC_ARCH=1
281+
opts: DYNAMIC_ARCH=1 TARGET=GENERIC
271282
- target: riscv64
272283
triple: riscv64-linux-gnu
273284
opts: TARGET=RISCV64_GENERIC

‎.github/workflows/mips64.yml

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
name: mips64 qemu test
2+
3+
on: [push, pull_request]
4+
5+
permissions:
6+
contents: read # to fetch code (actions/checkout)
7+
8+
jobs:
9+
TEST:
10+
runs-on: ubuntu-latest
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
include:
15+
- target: MIPS64_GENERIC
16+
triple: mips64el-linux-gnuabi64
17+
opts: NO_SHARED=1 TARGET=MIPS64_GENERIC
18+
- target: SICORTEX
19+
triple: mips64el-linux-gnuabi64
20+
opts: NO_SHARED=1 TARGET=SICORTEX
21+
- target: I6400
22+
triple: mipsisa64r6el-linux-gnuabi64
23+
opts: NO_SHARED=1 TARGET=I6400
24+
- target: P6600
25+
triple: mipsisa64r6el-linux-gnuabi64
26+
opts: NO_SHARED=1 TARGET=P6600
27+
- target: I6500
28+
triple: mipsisa64r6el-linux-gnuabi64
29+
opts: NO_SHARED=1 TARGET=I6500
30+
31+
steps:
32+
- name: Checkout repository
33+
uses: actions/checkout@v3
34+
35+
- name: install build deps
36+
run: |
37+
sudo apt-get update
38+
sudo apt-get install autoconf automake autotools-dev ninja-build make ccache \
39+
gcc-${{ matrix.triple }} gfortran-${{ matrix.triple }} libgomp1-mips64el-cross
40+
41+
- name: checkout qemu
42+
uses: actions/checkout@v3
43+
with:
44+
repository: qemu/qemu
45+
path: qemu
46+
ref: 79dfa177ae348bb5ab5f97c0915359b13d6186e2
47+
48+
- name: build qemu
49+
run: |
50+
cd qemu
51+
./configure --prefix=$GITHUB_WORKSPACE/qemu-install --target-list=mips64el-linux-user --disable-system
52+
make -j$(nproc)
53+
make install
54+
55+
- name: Compilation cache
56+
uses: actions/cache@v3
57+
with:
58+
path: ~/.ccache
59+
key: ccache-${{ runner.os }}-${{ matrix.target }}-${{ github.ref }}-${{ github.sha }}
60+
restore-keys: |
61+
ccache-${{ runner.os }}-${{ matrix.target }}-${{ github.ref }}
62+
ccache-${{ runner.os }}-${{ matrix.target }}
63+
64+
- name: Configure ccache
65+
run: |
66+
test -d ~/.ccache || mkdir -p ~/.ccache
67+
echo "max_size = 300M" > ~/.ccache/ccache.conf
68+
echo "compression = true" >> ~/.ccache/ccache.conf
69+
ccache -s
70+
71+
- name: build OpenBLAS
72+
run: make CC='ccache ${{ matrix.triple }}-gcc -static' FC='ccache ${{ matrix.triple }}-gfortran -static' ${{ matrix.opts }} HOSTCC='ccache gcc' -j$(nproc)
73+
74+
- name: test
75+
run: |
76+
export PATH=$GITHUB_WORKSPACE/qemu-install/bin/:$PATH
77+
qemu-mips64el ./utest/openblas_utest
78+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xscblat1
79+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xdcblat1
80+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xccblat1
81+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xzcblat1
82+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xscblat2 < ./ctest/sin2
83+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xdcblat2 < ./ctest/din2
84+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xccblat2 < ./ctest/cin2
85+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xzcblat2 < ./ctest/zin2
86+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xscblat3 < ./ctest/sin3
87+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xdcblat3 < ./ctest/din3
88+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xccblat3 < ./ctest/cin3
89+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./ctest/xzcblat3 < ./ctest/zin3
90+
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/sblat1
91+
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/dblat1
92+
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/cblat1
93+
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/zblat1
94+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/sblat1
95+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/dblat1
96+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/cblat1
97+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/zblat1
98+
rm -f ./test/?BLAT2.SUMM
99+
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/sblat2 < ./test/sblat2.dat
100+
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/dblat2 < ./test/dblat2.dat
101+
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/cblat2 < ./test/cblat2.dat
102+
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/zblat2 < ./test/zblat2.dat
103+
rm -f ./test/?BLAT2.SUMM
104+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/sblat2 < ./test/sblat2.dat
105+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/dblat2 < ./test/dblat2.dat
106+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/cblat2 < ./test/cblat2.dat
107+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/zblat2 < ./test/zblat2.dat
108+
rm -f ./test/?BLAT3.SUMM
109+
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/sblat3 < ./test/sblat3.dat
110+
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/dblat3 < ./test/dblat3.dat
111+
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/cblat3 < ./test/cblat3.dat
112+
OPENBLAS_NUM_THREADS=1 OMP_NUM_THREADS=1 qemu-mips64el ./test/zblat3 < ./test/zblat3.dat
113+
rm -f ./test/?BLAT3.SUMM
114+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/sblat3 < ./test/sblat3.dat
115+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/dblat3 < ./test/dblat3.dat
116+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/cblat3 < ./test/cblat3.dat
117+
OPENBLAS_NUM_THREADS=2 qemu-mips64el ./test/zblat3 < ./test/zblat3.dat

‎.github/workflows/nightly-Homebrew-build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ on:
1717
# it only makes sense to test if this file has been changed
1818

1919
name: Nightly-Homebrew-Build
20+
21+
permissions:
22+
contents: read # to fetch code (actions/checkout)
23+
2024
jobs:
2125
build-OpenBLAS-with-Homebrew:
2226
runs-on: macos-latest

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ matrix:
3030
before_script: &common-before
3131
- COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=POWER8 NUM_THREADS=32"
3232
script:
33-
- travis_wait 40 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
33+
- travis_wait 50 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
3434
- make -C test $COMMON_FLAGS $BTYPE
3535
- make -C ctest $COMMON_FLAGS $BTYPE
3636
- make -C utest $COMMON_FLAGS $BTYPE
@@ -104,7 +104,7 @@ matrix:
104104
- sudo apt-get update
105105
- sudo apt-get install gcc-9 gfortran-9 -y
106106
script:
107-
- travis_wait 40 make QUIET_MAKE=1 BINARY=64 USE_OPENMP=1 CC=gcc-9 FC=gfortran-9
107+
- travis_wait 50 make QUIET_MAKE=1 BINARY=64 USE_OPENMP=1 CC=gcc-9 FC=gfortran-9
108108
- make -C test $COMMON_FLAGS $BTYPE
109109
- make -C ctest $COMMON_FLAGS $BTYPE
110110
- make -C utest $COMMON_FLAGS $BTYPE
@@ -121,7 +121,7 @@ matrix:
121121
- sudo apt-get update
122122
- sudo apt-get install gcc-9 gfortran-9 -y
123123
script:
124-
- travis_wait 40 make QUIET_MAKE=1 BUILD_BFLOAT16=1 BINARY=64 USE_OPENMP=1 CC=gcc-9 FC=gfortran-9
124+
- travis_wait 50 make QUIET_MAKE=1 BUILD_BFLOAT16=1 BINARY=64 USE_OPENMP=1 CC=gcc-9 FC=gfortran-9
125125
- make -C test $COMMON_FLAGS $BTYPE
126126
- make -C ctest $COMMON_FLAGS $BTYPE
127127
- make -C utest $COMMON_FLAGS $BTYPE

‎CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,10 @@ if(NOT NO_LAPACKE)
212212
add_library(LAPACKE OBJECT ${LAPACKE_SOURCES})
213213
list(APPEND TARGET_OBJS "$<TARGET_OBJECTS:LAPACKE>")
214214
endif()
215-
if(BUILD_RELAPACK)
216-
add_library(RELAPACK OBJECT ${RELA_SOURCES})
217-
list(APPEND TARGET_OBJS "$<TARGET_OBJECTS:RELAPACK>")
218-
endif()
215+
#if(BUILD_RELAPACK)
216+
# add_library(RELAPACK OBJECT ${RELA_SOURCES})
217+
# list(APPEND TARGET_OBJS "$<TARGET_OBJECTS:RELAPACK>")
218+
#endif()
219219
set(OpenBLAS_LIBS "")
220220
if(BUILD_STATIC_LIBS)
221221
add_library(${OpenBLAS_LIBNAME}_static STATIC ${TARGET_OBJS} ${OpenBLAS_DEF_FILE})

‎CONTRIBUTORS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,4 +211,5 @@ In chronological order:
211211
* PLCT Lab, Institute of Software Chinese Academy of Sciences
212212
* [2022-03] Support RISC-V Vector Intrinisc 1.0 version.
213213

214-
214+
* Pablo Romero <https://github.com/pablorcum>
215+
* [2022-08] Fix building from sources for QNX

‎Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,11 @@ prof_lapack : lapack_prebuild
278278
lapack_prebuild :
279279
ifeq ($(NO_LAPACK), $(filter 0,$(NO_LAPACK)))
280280
-@echo "FC = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
281+
ifeq ($(F_COMPILER), GFORTRAN)
282+
-@echo "override FFLAGS = $(LAPACK_FFLAGS) -fno-tree-vectorize" >> $(NETLIB_LAPACK_DIR)/make.inc
283+
else
281284
-@echo "override FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
285+
endif
282286
-@echo "FFLAGS_DRV = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
283287
-@echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
284288
-@echo "FFLAGS_NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc

‎Makefile.arm64

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ endif
7070
ifeq ($(CORE), NEOVERSEN1)
7171
ifeq (1, $(filter 1,$(GCCVERSIONGTEQ7) $(ISCLANG)))
7272
ifeq ($(GCCVERSIONGTEQ9), 1)
73-
CCOMMON_OPT += -march=armv8.2-a -mtune=neoverse-n1
73+
CCOMMON_OPT += -march=armv8.2-a+sve -mtune=neoverse-n1
7474
ifneq ($(F_COMPILER), NAG)
7575
FCOMMON_OPT += -march=armv8.2-a -mtune=neoverse-n1
7676
endif
7777
else
78-
CCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a72
78+
CCOMMON_OPT += -march=armv8.2-a+sve -mtune=cortex-a72
7979
ifneq ($(F_COMPILER), NAG)
8080
FCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a72
8181
endif
@@ -89,17 +89,17 @@ endif
8989
endif
9090

9191
# Use a72 tunings because Neoverse-V1 is only available
92-
# in GCC>=9.4
92+
# in GCC>=10.4
9393
ifeq ($(CORE), NEOVERSEV1)
9494
ifeq (1, $(filter 1,$(GCCVERSIONGTEQ7) $(ISCLANG)))
95-
ifeq ($(GCCVERSIONGTEQ9), 1)
96-
ifeq (1, $(filter 1,$(GCCMINORVERSIONGTEQ4) $(GCCVERSIONGTEQ10)))
97-
CCOMMON_OPT += -march=armv8.4-a -mtune=neoverse-v1
95+
ifeq ($(GCCVERSIONGTEQ10), 1)
96+
ifeq (1, $(filter 1,$(GCCMINORVERSIONGTEQ4) $(GCCVERSIONGTEQ11)))
97+
CCOMMON_OPT += -march=armv8.4-a+sve -mtune=neoverse-v1
9898
ifneq ($(F_COMPILER), NAG)
9999
FCOMMON_OPT += -march=armv8.4-a -mtune=neoverse-v1
100100
endif
101101
else
102-
CCOMMON_OPT += -march=armv8.4-a -mtune=native
102+
CCOMMON_OPT += -march=armv8.4-a+sve -mtune=native
103103
ifneq ($(F_COMPILER), NAG)
104104
FCOMMON_OPT += -march=armv8.4-a -mtune=native
105105
endif
@@ -119,17 +119,21 @@ endif
119119
endif
120120

121121
# Use a72 tunings because Neoverse-N2 is only available
122-
# in GCC>=9.4
122+
# in GCC>=10.4
123123
ifeq ($(CORE), NEOVERSEN2)
124124
ifeq (1, $(filter 1,$(GCCVERSIONGTEQ7) $(ISCLANG)))
125-
ifeq ($(GCCVERSIONGTEQ9), 1)
126-
ifeq (1, $(filter 1,$(GCCMINORVERSIONGTEQ4) $(GCCVERSIONGTEQ10)))
125+
ifeq ($(GCCVERSIONGTEQ10), 1)
126+
ifeq (1, $(filter 1,$(GCCMINORVERSIONGTEQ4) $(GCCVERSIONGTEQ11)))
127+
ifneq ($(OSNAME), Darwin)
127128
CCOMMON_OPT += -march=armv8.5-a+sve+sve2+bf16 -mtune=neoverse-n2
129+
else
130+
CCOMMON_OPT += -march=armv8.2-a -mtune=cortex-a72
131+
endif
128132
ifneq ($(F_COMPILER), NAG)
129133
FCOMMON_OPT += -march=armv8.5-a+sve+sve2+bf16 -mtune=neoverse-n2
130134
endif
131135
else
132-
CCOMMON_OPT += -march=armv8.5-a -mtune=native
136+
CCOMMON_OPT += -march=armv8.5-a+sve -mtune=native
133137
ifneq ($(F_COMPILER), NAG)
134138
FCOMMON_OPT += -march=armv8.5-a -mtune=native
135139
endif

‎Makefile.install

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ OPENBLAS_CMAKE_CONFIG := OpenBLASConfig.cmake
1414
OPENBLAS_CMAKE_CONFIG_VERSION := OpenBLASConfigVersion.cmake
1515
OPENBLAS_PKGCONFIG_DIR := $(OPENBLAS_LIBRARY_DIR)/pkgconfig
1616
PKG_EXTRALIB := $(EXTRALIB)
17+
ifeq ($(INTERFACE64),1)
18+
SUFFIX64=64
19+
endif
20+
PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE)$(SUFFIX64).pc"
21+
1722
ifeq ($(USE_OPENMP), 1)
1823
ifeq ($(C_COMPILER), PGI)
1924
PKG_EXTRALIB += -lomp
@@ -150,13 +155,19 @@ endif
150155
endif
151156

152157
#Generating openblas.pc
153-
@echo Generating $(LIBSONAMEBASE).pc in "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)"
154-
@echo 'libdir='$(OPENBLAS_LIBRARY_DIR) > "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE).pc"
155-
@echo 'includedir='$(OPENBLAS_INCLUDE_DIR) >> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE).pc"
156-
@echo 'openblas_config= USE_64BITINT='$(USE_64BITINT) 'DYNAMIC_ARCH='$(DYNAMIC_ARCH) 'DYNAMIC_OLDER='$(DYNAMIC_OLDER) 'NO_CBLAS='$(NO_CBLAS) 'NO_LAPACK='$(NO_LAPACK) 'NO_LAPACKE='$(NO_LAPACKE) 'NO_AFFINITY='$(NO_AFFINITY) 'USE_OPENMP='$(USE_OPENMP) $(CORE) 'MAX_THREADS='$(NUM_THREADS)>> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE).pc"
157-
@echo 'version='$(VERSION) >> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE).pc"
158-
@echo 'extralib='$(PKG_EXTRALIB) >> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE).pc"
159-
@cat openblas.pc.in >> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE).pc"
158+
ifeq ($(INTERFACE64),1)
159+
SUFFIX64=64
160+
endif
161+
PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE)$(SUFFIX64).pc"
162+
163+
@echo Generating $(LIBSONAMEBASE)$(SUFFIX64).pc in "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)"
164+
@echo 'libdir='$(OPENBLAS_LIBRARY_DIR) > "$(PKGFILE)"
165+
@echo 'libsuffix='$(SYMBOLSUFFIX) >> "$(PKGFILE)"
166+
@echo 'includedir='$(OPENBLAS_INCLUDE_DIR) >> "$(PKGFILE)"
167+
@echo 'openblas_config= USE_64BITINT='$(INTERFACE64) 'DYNAMIC_ARCH='$(DYNAMIC_ARCH) 'DYNAMIC_OLDER='$(DYNAMIC_OLDER) 'NO_CBLAS='$(NO_CBLAS) 'NO_LAPACK='$(NO_LAPACK) 'NO_LAPACKE='$(NO_LAPACKE) 'NO_AFFINITY='$(NO_AFFINITY) 'USE_OPENMP='$(USE_OPENMP) $(CORE) 'MAX_THREADS='$(NUM_THREADS)>> "$(PKGFILE)"
168+
@echo 'version='$(VERSION) >> "$(PKGFILE)"
169+
@echo 'extralib='$(PKG_EXTRALIB) >> "$(PKGFILE)"
170+
@cat openblas.pc.in >> "$(PKGFILE)"
160171

161172

162173
#Generating OpenBLASConfig.cmake

‎Makefile.prebuild

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ all: getarch_2nd
6060
./getarch_2nd 1 >> $(TARGET_CONF)
6161

6262
$(TARGET_CONF): c_check$(SCRIPTSUFFIX) f_check$(SCRIPTSUFFIX) getarch
63-
./c_check$(SCRIPTSUFFIX) $(TARGET_MAKE) $(TARGET_CONF) "$(CC)" "$(TARGET_FLAGS) $(CFLAGS)"
63+
./c_check$(SCRIPTSUFFIX) $(TARGET_MAKE) $(TARGET_CONF) "$(CC)" $(TARGET_FLAGS) $(CFLAGS)
6464
ifneq ($(ONLY_CBLAS), 1)
65-
./f_check$(SCRIPTSUFFIX) $(TARGET_MAKE) $(TARGET_CONF) "$(FC)" "$(TARGET_FLAGS)"
65+
./f_check$(SCRIPTSUFFIX) $(TARGET_MAKE) $(TARGET_CONF) "$(FC)" $(TARGET_FLAGS)
6666
else
6767
#When we only build CBLAS, we set NOFORTRAN=2
6868
echo "NOFORTRAN=2" >> $(TARGET_MAKE)
@@ -77,8 +77,8 @@ endif
7777

7878

7979
getarch : getarch.c cpuid.S dummy $(CPUIDEMU)
80-
avx512=$$(./c_check$(SCRIPTSUFFIX) - - "$(CC)" "$(TARGET_FLAGS) $(CFLAGS)" | grep NO_AVX512); \
81-
rv64gv=$$(./c_check$(SCRIPTSUFFIX) - - "$(CC)" "$(TARGET_FLAGS) $(CFLAGS)" | grep NO_RV64GV); \
80+
avx512=$$(./c_check$(SCRIPTSUFFIX) - - "$(CC)" $(TARGET_FLAGS) $(CFLAGS) | grep NO_AVX512); \
81+
rv64gv=$$(./c_check$(SCRIPTSUFFIX) - - "$(CC)" $(TARGET_FLAGS) $(CFLAGS) | grep NO_RV64GV); \
8282
$(HOSTCC) $(HOST_CFLAGS) $(EXFLAGS) $${avx512:+-D$${avx512}} $${rv64gv:+-D$${rv64gv}} -o $(@F) getarch.c cpuid.S $(CPUIDEMU)
8383

8484
getarch_2nd : getarch_2nd.c $(TARGET_CONF) dummy

0 commit comments

Comments
 (0)