Skip to content

Commit 49254a4

Browse files
authored
Remove ARPACK and derived functions from julia repo (JuliaLang#27616)
* Remove ARPACK and derived functions from julia repo * Update docs/Manifest.toml * fix Pkg tests to not rely on Compat * Update to latest release of Compat
1 parent 7744985 commit 49254a4

27 files changed

+31
-1576
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,18 @@ before_install:
8484
contrib/travis_fastfail.sh || exit 1;
8585
brew tap staticfloat/julia > /dev/null;
8686
brew rm --force $(brew deps --HEAD julia);
87-
brew install -v gcc gmp mpfr pcre2 staticfloat/julia/openblas-julia staticfloat/julia/arpack-julia staticfloat/julia/suite-sparse-julia staticfloat/juliadeps/libgfortran;
87+
brew install -v gcc gmp mpfr pcre2 staticfloat/julia/openblas-julia staticfloat/julia/suite-sparse-julia staticfloat/juliadeps/libgfortran;
8888
BUILDOPTS="-j3 USECLANG=1 USECCACHE=1 BINARYBUILDER_TRIPLET=x86_64-apple-darwin14";
8989
BUILDOPTS="$BUILDOPTS USE_BINARYBUILDER_LLVM=1 LLVM_CONFIG=$TRAVIS_BUILD_DIR/usr/tools/llvm-config LLVM_SIZE=$TRAVIS_BUILD_DIR/usr/tools/llvm-size";
9090
BUILDOPTS="$BUILDOPTS VERBOSE=1 USE_BLAS64=0 SUITESPARSE_INC=-I$(brew --prefix suite-sparse-julia)/include FORCE_ASSERTIONS=1";
9191
BUILDOPTS="$BUILDOPTS LIBBLAS=-lopenblas LIBBLASNAME=libopenblas LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas";
92-
for lib in SUITESPARSE ARPACK BLAS LAPACK GMP MPFR PCRE LIBUNWIND; do
92+
for lib in SUITESPARSE BLAS LAPACK GMP MPFR PCRE LIBUNWIND; do
9393
BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1";
9494
done;
9595
export LDFLAGS="-L$(brew --prefix openblas-julia)/lib -L$(brew --prefix suite-sparse-julia)/lib";
9696
spawn_DYLD_FALLBACK_LIBRARY_PATH="/usr/local/lib:/lib:/usr/lib";
9797
spawn_DYLD_FALLBACK_LIBRARY_PATH+=":$(brew --prefix openblas-julia)/lib";
9898
spawn_DYLD_FALLBACK_LIBRARY_PATH+=":$(brew --prefix suite-sparse-julia)/lib";
99-
spawn_DYLD_FALLBACK_LIBRARY_PATH+=":$(brew --prefix arpack-julia)/lib";
10099
export JULIA_MACOS_SPAWN="DYLD_FALLBACK_LIBRARY_PATH=\"$spawn_DYLD_FALLBACK_LIBRARY_PATH\" \$1";
101100
export BUILDOPTS="$BUILDOPTS spawn=\$(JULIA_MACOS_SPAWN)";
102101
make $BUILDOPTS -C contrib -f repackage_system_suitesparse4.make;

Make.inc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ USE_SYSTEM_BLAS:=0
3838
USE_SYSTEM_LAPACK:=0
3939
USE_SYSTEM_GMP:=0
4040
USE_SYSTEM_MPFR:=0
41-
USE_SYSTEM_ARPACK:=0
4241
USE_SYSTEM_SUITESPARSE:=0
4342
USE_SYSTEM_LIBUV:=0
4443
USE_SYSTEM_UTF8PROC:=0
@@ -1075,16 +1074,9 @@ MKLLIB := $(MKLROOT)/lib/ia32
10751074
endif
10761075
USE_SYSTEM_BLAS:=1
10771076
USE_SYSTEM_LAPACK:=1
1078-
ifeq ($(OS), WINNT)
1079-
LIBBLASNAME := mkl_rt
1080-
LIBLAPACKNAME := mkl_rt
1081-
# work around libtool issue with arpack
1082-
MKL_LDFLAGS := -L$(MKLLIB) -Wl,-lmkl_rt
1083-
else
10841077
LIBBLASNAME := libmkl_rt
10851078
LIBLAPACKNAME := libmkl_rt
10861079
MKL_LDFLAGS := -L$(MKLLIB) -lmkl_rt
1087-
endif
10881080
ifneq ($(strip $(MKLLIB)),)
10891081
ifeq ($(OS), Linux)
10901082
RPATH_MKL := -Wl,-rpath,$(MKLLIB)

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBSSH2) += libssh2
225225
JL_PRIVATE_LIBS-$(USE_SYSTEM_MBEDTLS) += libmbedtls libmbedcrypto libmbedx509
226226
JL_PRIVATE_LIBS-$(USE_SYSTEM_CURL) += libcurl
227227
JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBGIT2) += libgit2
228-
JL_PRIVATE_LIBS-$(USE_SYSTEM_ARPACK) += libarpack
229228
ifeq ($(USE_LLVM_SHLIB),1)
230229
JL_PRIVATE_LIBS-$(USE_SYSTEM_LLVM) += libLLVM
231230
endif

NEWS.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,9 +1130,6 @@ Deprecated or removed
11301130
`normalize`, and moved to the new `Unicode` standard library module.
11311131
`graphemes` has also been moved to that module ([#25021]).
11321132

1133-
* The functions `eigs` and `svds` have been moved to the `IterativeEigensolvers` standard
1134-
library module ([#24714]).
1135-
11361133
* Sparse array functionality has moved to the `SparseArrays` standard library module ([#25249]).
11371134

11381135
* Linear algebra functionality, and specifically the `LinAlg` module has moved to the
@@ -1272,6 +1269,8 @@ Deprecated or removed
12721269

12731270
* `atan2` is now a 2-argument method of `atan` ([#27248]).
12741271

1272+
* The functions `eigs` and `svds` have been moved to the `Arpack.jl` package ([#27616]).
1273+
12751274
Command-line option changes
12761275
---------------------------
12771276

README.arm.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ override USE_SYSTEM_LAPACK=1
2929
override USE_SYSTEM_LIBM=1
3030
override USE_SYSTEM_GMP=1
3131
override USE_SYSTEM_MPFR=1
32-
override USE_SYSTEM_ARPACK=1
3332
````
3433

3534
The following command will install all the necessary libraries on Ubuntu:
3635

3736
````
38-
sudo apt-get install libblas3gf liblapack3gf libarpack2 libgmp3-dev \
37+
sudo apt-get install libblas3gf liblapack3gf libgmp3-dev \
3938
libmpfr-dev libblas-dev liblapack-dev cmake gcc-4.8 \
4039
g++-4.8 gfortran libgfortran3 m4 libedit-dev
4140
````

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ Julia uses the following external libraries, which are automatically downloaded
309309
- **[LAPACK]** (>= 3.5) — library of linear algebra routines for solving systems of simultaneous linear equations, least-squares solutions of linear systems of equations, eigenvalue problems, and singular value problems.
310310
- **[MKL]** (optional) – OpenBLAS and LAPACK may be replaced by Intel's MKL library.
311311
- **[SuiteSparse]** (>= 4.1) — library of linear algebra routines for sparse matrices (see [note below](#suitesparse)).
312-
- **[ARPACK]** — collection of subroutines designed to solve large, sparse eigenvalue problems.
313312
- **[PCRE]** (>= 10.00) — Perl-compatible regular expressions library.
314313
- **[GMP]** (>= 5.0) — GNU multiple precision arithmetic library, needed for `BigInt` support.
315314
- **[MPFR]** (>= 3.0) — GNU multiple precision floating point library, needed for arbitrary precision floating point (`BigFloat`) support.
@@ -339,7 +338,6 @@ Julia uses the following external libraries, which are automatically downloaded
339338
[LAPACK]: http://www.netlib.org/lapack
340339
[MKL]: http://software.intel.com/en-us/articles/intel-mkl
341340
[SuiteSparse]: http://faculty.cse.tamu.edu/davis/suitesparse.html
342-
[ARPACK]: http://forge.scilab.org/index.php/p/arpack-ng
343341
[PCRE]: http://www.pcre.org
344342
[LLVM]: http://www.llvm.org
345343
[FemtoLisp]: https://github.com/JeffBezanson/femtolisp

base/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ $(eval $(call symlink_system_library,$(LIBLAPACKNAME),LAPACK))
180180
endif
181181
$(eval $(call symlink_system_library,libgmp,GMP))
182182
$(eval $(call symlink_system_library,libmpfr,MPFR))
183-
$(eval $(call symlink_system_library,libarpack,ARPACK))
184183
$(eval $(call symlink_system_library,libmbedtls,MBEDTLS))
185184
$(eval $(call symlink_system_library,libssh2,LIBSSH2))
186185
$(eval $(call symlink_system_library,libcurl,CURL))

base/deprecated.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1720,6 +1720,8 @@ end
17201720

17211721
@deprecate atan2(y, x) atan(y, x)
17221722

1723+
@deprecate_moved eigs "Arpack"
1724+
@deprecate_moved svds "Arpack"
17231725

17241726
# END 0.7 deprecations
17251727

base/sysimg.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,6 @@ let
520520
:Future,
521521
:OldPkg,
522522
:LinearAlgebra,
523-
:IterativeEigensolvers,
524523
:SparseArrays,
525524
:SuiteSparse,
526525
:SharedArrays,
@@ -647,9 +646,6 @@ end
647646
@eval @deprecate_stdlib $(Symbol("@dateformat_str")) Dates true
648647
@deprecate_stdlib now Dates true
649648

650-
@deprecate_stdlib eigs IterativeEigensolvers true
651-
@deprecate_stdlib svds IterativeEigensolvers true
652-
653649
@eval @deprecate_stdlib $(Symbol("@printf")) Printf true
654650
@eval @deprecate_stdlib $(Symbol("@sprintf")) Printf true
655651

contrib/fixup-libgfortran.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ fi
2929

3030
private_libdir=$1
3131

32-
if [ ! -f "$private_libdir/libarpack.$SHLIB_EXT" ]; then
33-
echo "ERROR: Could not open $private_libdir/libarpack.$SHLIB_EXT" >&2
34-
exit 2
35-
fi
36-
3732
find_shlib()
3833
{
3934
lib_path="$1"
@@ -52,7 +47,7 @@ private_libname()
5247
}
5348

5449
# First, discover all the places where libgfortran/libgcc is, as well as their true SONAMES
55-
for lib in arpack lapack; do
50+
for lib in lapack; do
5651
if [ -f "$private_libdir/lib$lib.$SHLIB_EXT" ]; then
5752
# Find the paths to the libraries we're interested in. These are almost
5853
# always within the same directory, but we like to be general.
@@ -125,11 +120,11 @@ change_linkage()
125120
}
126121

127122
# For every library that remotely touches libgfortran stuff (the libraries we
128-
# have copied in ourselves as well as arpack, etc...) we must
123+
# have copied in ourselves) we must
129124
# update the linkage to point to @rpath (on OSX) or $ORIGIN (on Linux) so
130125
# that direct links to the old libgfortran directories are instead directed
131126
# to the proper location, which is our $private_libdir.
132-
for lib in libopenblas libarpack libcholmod liblapack $SONAMES; do
127+
for lib in libopenblas libcholmod liblapack $SONAMES; do
133128
# Grab every incarnation of that library that exists within $private_libdir
134129
# (e.g. "libopenblas.so", and "libopenblas.so.0", etc...)
135130
for lib_path in $private_libdir/$lib*; do

0 commit comments

Comments
 (0)