Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
restore OpenBLAS-specific build file fixes
  • Loading branch information
martin-frbg committed May 11, 2022
commit 884e6da73b501c6994380ae579f8bd9fc9ab407e
3 changes: 2 additions & 1 deletion lapack-netlib/TESTING/EIG/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ set(ZEIGTST zchkee.F

macro(add_eig_executable name)
add_executable(${name} ${ARGN})
target_link_libraries(${name} ${TMGLIB} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
target_link_libraries(${name} openblas${SUFFIX64_UNDERSCORE})
#${TMGLIB} ../${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
endmacro()

if(BUILD_SINGLE)
Expand Down
8 changes: 4 additions & 4 deletions lapack-netlib/TESTING/EIG/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,16 @@ double: xeigtstd
complex16: xeigtstz

xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST) $(TMGLIB) ../$(LAPACKLIB) $(BLASLIB)
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^

xeigtstc: $(CEIGTST) $(SCIGTST) $(AEIGTST) $(TMGLIB) ../$(LAPACKLIB) $(BLASLIB)
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^

xeigtstd: $(DEIGTST) $(DZIGTST) $(AEIGTST) $(TMGLIB) ../$(LAPACKLIB) $(BLASLIB)
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^

xeigtstz: $(ZEIGTST) $(DZIGTST) $(AEIGTST) $(TMGLIB) ../$(LAPACKLIB) $(BLASLIB)
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^

$(AEIGTST): $(FRC)
$(SCIGTST): $(FRC)
Expand Down
3 changes: 2 additions & 1 deletion lapack-netlib/TESTING/LIN/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,8 @@ set(ZLINTSTRFP zchkrfp.f zdrvrfp.f zdrvrf1.f zdrvrf2.f zdrvrf3.f zdrvrf4.f zerrr

macro(add_lin_executable name)
add_executable(${name} ${ARGN})
target_link_libraries(${name} ${TMGLIB} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
target_link_libraries(${name} openblas${SUFFIX64_UNDERSCORE})
#${TMGLIB} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
endmacro()

if(BUILD_SINGLE)
Expand Down
20 changes: 10 additions & 10 deletions lapack-netlib/TESTING/LIN/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -270,34 +270,34 @@ proto-complex: xlintstrfc
proto-complex16: xlintstzc xlintstrfz

xlintsts: $(ALINTST) $(SLINTST) $(SCLNTST) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB)
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^

xlintstc: $(ALINTST) $(CLINTST) $(SCLNTST) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB)
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^

xlintstd: $(ALINTST) $(DLINTST) $(DZLNTST) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB)
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^

xlintstz: $(ALINTST) $(ZLINTST) $(DZLNTST) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB)
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^

xlintstds: $(DSLINTST) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(BLASLIB)
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^

xlintstzc: $(ZCLINTST) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(BLASLIB)
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^

xlintstrfs: $(SLINTSTRFP) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(BLASLIB)
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^

xlintstrfd: $(DLINTSTRFP) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(BLASLIB)
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^

xlintstrfc: $(CLINTSTRFP) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(BLASLIB)
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^

xlintstrfz: $(ZLINTSTRFP) $(TMGLIB) $(VARLIB) ../$(LAPACKLIB) $(BLASLIB)
$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
$(LOADER) $(FFLAGS) $(LDFLAGS) -o $@ $^

$(ALINTST): $(FRC)
$(SCLNTST): $(FRC)
Expand Down
5 changes: 5 additions & 0 deletions lapack-netlib/TESTING/MATGEN/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,10 @@ cleanobj:
cleanlib:
rm -f $(TMGLIB)

ifneq ($(C_LAPACK), 1)
slaran.o: slaran.f ; $(FC) $(FFLAGS_NOOPT) -c -o $@ $<
dlaran.o: dlaran.f ; $(FC) $(FFLAGS_NOOPT) -c -o $@ $<
else
slaran.o: slaran.c ; $(CC) $(CFLAGS_NOOPT) -c -o $@ $<
dlaran.o: dlaran.c ; $(CC) $(CFLAGS_NOOPT) -c -o $@ $<
endif