Skip to content

Commit 1b3e201

Browse files
committed
Limit SMP-only symbols to SMP-enabled builds in gensymbol
gensymbol was updated in OpenMathLib#5594 to support the openblas_set_threads_callback_function symbol. This caused SMP-disabled builds to regress as openblas_set_threads_callback_function is only defined when SMP is enabled. Update gensymbol to only define openblas_set_threads_callback_function when SMP is enabled in the build.
1 parent 45e9820 commit 1b3e201

3 files changed

Lines changed: 22 additions & 5 deletions

File tree

exports/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -301,23 +301,23 @@ static : ../$(LIBNAME)
301301
rm -f goto.$(SUFFIX)
302302

303303
osx.def : $(GENSYM) ../Makefile.system ../getarch.c
304-
./$(GENSYM) osx $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_HFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) > $(@F)
304+
./$(GENSYM) osx $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_HFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) $(SMP) > $(@F)
305305

306306
aix.def : $(GENSYM) ../Makefile.system ../getarch.c
307-
./$(GENSYM) aix $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_HFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) > $(@F)
307+
./$(GENSYM) aix $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_HFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) $(SMP) > $(@F)
308308

309309
objcopy.def : $(GENSYM) ../Makefile.system ../getarch.c
310-
./$(GENSYM) objcopy $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_HFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) > $(@F)
310+
./$(GENSYM) objcopy $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_HFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) $(SMP) > $(@F)
311311

312312
objconv.def : $(GENSYM) ../Makefile.system ../getarch.c
313-
./$(GENSYM) objconv $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_HFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) > $(@F)
313+
./$(GENSYM) objconv $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_HFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) $(SMP) > $(@F)
314314

315315
test : linktest.c
316316
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) -lm && echo OK.
317317
rm -f linktest
318318

319319
linktest.c : $(GENSYM) ../Makefile.system ../getarch.c
320-
./$(GENSYM) linktest $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_HFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) > linktest.c
320+
./$(GENSYM) linktest $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_HFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) $(SMP) > linktest.c
321321

322322
clean ::
323323
@rm -f *.def *.dylib __.SYMDEF* *.renamed

exports/gensymbol

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,9 @@ misc_no_underscore_objs="
181181
goto_set_num_threads
182182
openblas_get_config
183183
openblas_get_corename
184+
"
185+
186+
smp_no_underscore_objs="
184187
openblas_set_threads_callback_function
185188
"
186189

@@ -3847,6 +3850,8 @@ shift
38473850
p17=$9
38483851
shift
38493852
p18=$9
3853+
shift
3854+
p19=$9
38503855

38513856
if [ $p13 -eq 1 ]; then
38523857
blasobjs="$blasobjs $bfblasobjs"
@@ -3973,6 +3978,11 @@ else
39733978
no_underscore_objs="$misc_no_underscore_objs"
39743979
fi
39753980

3981+
if [ $p19 -eq 1 ]; then
3982+
# SMP=1
3983+
no_underscore_objs="$no_underscore_objs $smp_no_underscore_objs"
3984+
fi
3985+
39763986
if [ $p7 -ne 1 ]; then
39773987
if [ $p12 -eq 1 ]; then
39783988
# BUILD_LAPACK_DEPRECATED=1

exports/gensymbol.pl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,9 @@
177177
goto_set_num_threads,
178178
openblas_get_config,
179179
openblas_get_corename,
180+
);
181+
182+
@smp_no_underscore_objs = (
180183
openblas_set_threads_callback_function,
181184
);
182185

@@ -3918,6 +3921,10 @@
39183921
#NO_CBLAS=1
39193922
@no_underscore_objs = (@misc_no_underscore_objs);
39203923
}
3924+
if ($ARGV[18]) == 1) {
3925+
#SMP=1
3926+
@no_underscore_objs = (@no_underscore_objs, @smp_no_underscore_objs);
3927+
}
39213928
if ($ARGV[6] == 1) {
39223929
#NO_LAPACKE=1
39233930
@no_underscore_objs = (@no_underscore_objs);

0 commit comments

Comments
 (0)