-
-
Notifications
You must be signed in to change notification settings - Fork 5.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add SuiteSparse symlinks #26577
Add SuiteSparse symlinks #26577
Conversation
These symlinks are needed to load SuiteSparse dynamically, yet they were not created with USE_SYSTEM_SUITEPARSE=1. This affects distribution packages.
@@ -13,7 +13,7 @@ ifeq ($(USE_SYSTEM_LAPACK),0) | |||
|
|||
$(build_libdir)/libgfortblas.dylib: | |||
mkdir -p $(build_libdir) | |||
make -C ../deps/ $(build_libdir)/libgfortblas.dylib | |||
make -C ../deps/ $(build_private_libdir)/libgfortblas.dylib |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use $@
make -C ../deps/ $(build_libdir)/libgfortblas.dylib | ||
$(build_private_libdir)/libgfortblas.dylib: | ||
mkdir -p $(build_private_libdir) | ||
make -C ../deps/ @$ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
$@
$(INSTALL_NAME_CMD)libumfpack.$(SHLIB_EXT) $(build_libdir)/libumfpack.$(SHLIB_EXT) | ||
$(CXX) -shared $(WHOLE_ARCHIVE) $(SS_LIB)/libspqr.a $(NO_WHOLE_ARCHIVE) -o $(build_libdir)/libspqr.$(SHLIB_EXT) $(LDFLAGS) $(LIBBLAS) -L$(build_libdir) -lsuitesparseconfig -lcolamd -lccolamd -lcamd -lamd -lcholmod $(RPATH_ORIGIN) | ||
$(INSTALL_NAME_CMD)libspqr.$(SHLIB_EXT) $(build_libdir)/libspqr.$(SHLIB_EXT) | ||
rm -f $(build_private_libdir)/lib{amd,cholmod,colamd,spqr,umfpack}.$(SHLIB_EXT) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add camd, ccolamd
.travis.yml
Outdated
for name in suitesparseconfig spqr umfpack colamd cholmod amd suitesparse_wrapper; do | ||
install -pm755 usr/lib/lib${name}*.dylib* /tmp/julia/lib/julia/; | ||
for name in suitesparseconfig spqr umfpack colamd cholmod amd; do | ||
install -pm755 usr/lib/julia/lib${name}*.dylib* /tmp/julia/lib/julia/; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I vaguely thought that we already copy everything inside this folder already, but doesn't hurt anything to do it again here in any case
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, this also looked suspicious to me, but since I can't test this locally I figured I'd better leave it as-is. I can remove it if you think it's redundant.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looking at the travis logs, it seems to confirm my expectation. There's doesn't seem to be any harm in leaving this in the .travis file either though, so do whatever you think best.
1393.707195 for suffix in libamd libcamd libccolamd libcholmod libcolamd libumfpack libspqr libsuitesparseconfig libpcre2-8 libgmp libmpfr libarpack libLLVM libopenblas ; do \
1393.707266 lib=/Users/travis/build/JuliaLang/julia/usr/lib/julia/${suffix}.dylib; \
1393.707286 /Users/travis/build/JuliaLang/julia/contrib/install.sh 755 $lib /tmp/julia/lib/julia ; \
1393.707304 done
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It worked!
These symlinks are needed to load SuiteSparse dynamically, yet they were not created with
USE_SYSTEM_SUITEPARSE=1
. This affects distribution packages (see https://discourse.julialang.org/t/nightly-builds-from-copr-missing-a-dependency-on-fedora-centos-rhel-etc/9857).@vtjnash I may well be missing something, since I don't understand why I excluded SuiteSparse from the list in the first place.
EDIT: the OS X failure looks real.