Skip to content

Commit

Permalink
Stop building and shipping openspecfun (#23598)
Browse files Browse the repository at this point in the history
  • Loading branch information
ararslan authored and staticfloat committed Sep 12, 2017
1 parent 780407c commit a5e9844
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 65 deletions.
2 changes: 0 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ their own licenses:
- [ARPACK](http://www.caam.rice.edu/software/ARPACK/RiceBSD.txt#LICENSE) [BSD-3]
- [DSFMT](http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/LICENSE.txt) [BSD-3]
- [OPENLIBM](https://github.com/JuliaLang/openlibm/blob/master/LICENSE.md) [MIT, BSD-2, ISC]
- [OPENSPECFUN](https://github.com/JuliaLang/openspecfun) [MIT, public domain]
- [FADDEEVA](http://ab-initio.mit.edu/Faddeeva) [MIT]
- [GMP](http://gmplib.org/manual/Copying.html#Copying) [LGPL3+ or GPL2+]
- [LIBGIT2](https://github.com/libgit2/libgit2/blob/development/COPYING) [GPL2+ with unlimited linking exception]
- [CURL](https://curl.haxx.se/docs/copyright.html) [MIT/X derivative]
Expand Down
1 change: 0 additions & 1 deletion Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ USE_SYSTEM_PCRE:=0
USE_SYSTEM_LIBM:=0
USE_SYSTEM_OPENLIBM:=0
UNTRUSTED_SYSTEM_LIBM:=0
USE_SYSTEM_OPENSPECFUN:=0
USE_SYSTEM_DSFMT:=0
USE_SYSTEM_BLAS:=0
USE_SYSTEM_LAPACK:=0
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,6 @@ ifeq ($(USE_SYSTEM_LIBM),0)
JL_PRIVATE_LIBS += openlibm
endif
endif
ifeq ($(USE_SYSTEM_OPENSPECFUN),0)
JL_PRIVATE_LIBS += openspecfun
endif
ifeq ($(USE_SYSTEM_DSFMT),0)
JL_PRIVATE_LIBS += dSFMT
endif
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,9 @@ This section lists changes that do not have deprecation warnings.
They now return `CartesianIndex`es for all but 1-d arrays, and in general return
the `keys` of indexed collections (e.g. dictionaries) ([#22907]).

* The `openspecfun` library is no longer built and shipped with Julia, as it is no longer
used internally ([#22390]).

Library improvements
--------------------

Expand Down Expand Up @@ -1276,6 +1279,7 @@ Command-line option changes
[#22310]: https://github.com/JuliaLang/julia/issues/22310
[#22325]: https://github.com/JuliaLang/julia/issues/22325
[#22350]: https://github.com/JuliaLang/julia/issues/22350
[#22390]: https://github.com/JuliaLang/julia/issues/22390
[#22496]: https://github.com/JuliaLang/julia/issues/22496
[#22523]: https://github.com/JuliaLang/julia/issues/22523
[#22532]: https://github.com/JuliaLang/julia/issues/22532
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -289,12 +289,10 @@ Julia uses the following external libraries, which are automatically downloaded
- **[FemtoLisp]** — packaged with Julia source, and used to implement the compiler front-end.
- **[libuv]** — portable, high-performance event-based I/O library
- **[OpenLibm]** — portable libm library containing elementary math functions.
- **[OpenSpecFun]** (>= 0.4) — library containing Bessel and error functions of complex arguments.
- **[DSFMT]** — fast Mersenne Twister pseudorandom number generator library.
- **[OpenBLAS]** — fast, open, and maintained [basic linear algebra subprograms (BLAS)](https://en.wikipedia.org/wiki/Basic_Linear_Algebra_Subprograms) library, based on [Kazushige Goto's](https://en.wikipedia.org/wiki/Kazushige_Goto) famous [GotoBLAS](https://www.tacc.utexas.edu/research-development/tacc-software/gotoblas2).
- **[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.
- **[MKL]** (optional) – OpenBLAS and LAPACK may be replaced by Intel's MKL library.
- **[AMOS]** — subroutines for computing Bessel and Airy functions.
- **[SuiteSparse]** (>= 4.1) — library of linear algebra routines for sparse matrices.
- **[ARPACK]** — collection of subroutines designed to solve large, sparse eigenvalue problems.
- **[PCRE]** (>= 10.00) — Perl-compatible regular expressions library.
Expand All @@ -320,13 +318,11 @@ Julia uses the following external libraries, which are automatically downloaded
[perl]: http://www.perl.org
[cmake]: http://www.cmake.org
[OpenLibm]: https://github.com/JuliaLang/openlibm
[OpenSpecFun]: https://github.com/JuliaLang/openspecfun
[DSFMT]: http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/#dSFMT
[OpenBLAS]: https://github.com/xianyi/OpenBLAS
[LAPACK]: http://www.netlib.org/lapack
[MKL]: http://software.intel.com/en-us/articles/intel-mkl
[SuiteSparse]: http://faculty.cse.tamu.edu/davis/suitesparse.html
[AMOS]: http://netlib.org/amos
[ARPACK]: http://forge.scilab.org/index.php/p/arpack-ng
[PCRE]: http://www.pcre.org
[LLVM]: http://www.llvm.org
Expand Down
1 change: 0 additions & 1 deletion base/math.jl
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ log(b::Number, x::Number) = log(promote(b,x)...)
# type specific math functions

const libm = Base.libm_name
const openspecfun = "libopenspecfun"

# functions with no domain error
"""
Expand Down
8 changes: 4 additions & 4 deletions contrib/fixup-libgfortran.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ private_libname()
}

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

# For every library that remotely touches libgfortran stuff (the libraries we
# have copied in ourselves as well as arpack, openspecfun, etc...) we must
# have copied in ourselves as well as arpack, etc...) we must
# update the linkage to point to @rpath (on OSX) or $ORIGIN (on Linux) so
# that direct links to the old libgfortran directories are instead directed
# to the proper location, which is our $private_libdir.
for lib in libopenblas libarpack libcholmod liblapack libopenspecfun $SONAMES; do
for lib in libopenblas libarpack libcholmod liblapack $SONAMES; do
# Grab every incarnation of that library that exists within $private_libdir
# (e.g. "libopenspecfun.so", and "libopenspecfun.so.0", etc...)
# (e.g. "libopenblas.so", and "libopenblas.so.0", etc...)
for lib_path in $private_libdir/$lib*; do
# Iterate over dependency names that need to be changed
for soname in $SONAMES; do
Expand Down
2 changes: 1 addition & 1 deletion contrib/windows/appveyor_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ fi
chmod +x usr/bin/* usr/tools/*

for lib in SUITESPARSE ARPACK BLAS LAPACK \
GMP MPFR PCRE LIBUNWIND OPENSPECFUN; do
GMP MPFR PCRE LIBUNWIND; do
echo "USE_SYSTEM_$lib = 1" >> Make.user
done
echo 'override LIBLAPACK = $(LIBBLAS)' >> Make.user
Expand Down
9 changes: 2 additions & 7 deletions deps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ include $(SRCDIR)/tools/git-external.mk
# custom Makefile rules: openlibm dsfmt suitesparse-wrapper suitesparse lapack openblas utf8proc objconv osxunwind
# CMake libs: libgit2 libssh2 mbedtls
#
# downloaded from git: llvm-svn, libuv, libopenlibm, utf8proc, openspecfun, libgit2, libssh2
# downloaded from git: llvm-svn, libuv, libopenlibm, utf8proc, libgit2, libssh2
#
# there are rules in this file with the . replaced by a %
# this is some magic Makefile trick that tells make
Expand Down Expand Up @@ -79,10 +79,6 @@ DEP_LIBS += openlibm
endif
endif

ifeq ($(USE_SYSTEM_OPENSPECFUN), 0)
DEP_LIBS += openspecfun
endif

ifeq ($(USE_SYSTEM_DSFMT), 0)
DEP_LIBS += dsfmt
endif
Expand Down Expand Up @@ -172,13 +168,12 @@ uninstall: $(addprefix uninstall-, $(DEP_LIBS_STAGED))
cleanall: $(addprefix clean-, $(DEP_LIBS))
distcleanall: $(addprefix distclean-, $(DEP_LIBS))
rm -rf $(build_prefix)
getall: get-llvm get-libuv get-pcre get-openlibm get-openspecfun get-dsfmt get-openblas get-lapack get-suitesparse get-arpack get-unwind get-osxunwind get-gmp get-mpfr get-patchelf get-utf8proc get-objconv get-mbedtls get-libssh2 get-curl get-libgit2
getall: get-llvm get-libuv get-pcre get-openlibm get-dsfmt get-openblas get-lapack get-suitesparse get-arpack get-unwind get-osxunwind get-gmp get-mpfr get-patchelf get-utf8proc get-objconv get-mbedtls get-libssh2 get-curl get-libgit2

include $(SRCDIR)/llvm.mk
include $(SRCDIR)/libuv.mk
include $(SRCDIR)/pcre.mk
include $(SRCDIR)/openlibm.mk
include $(SRCDIR)/openspecfun.mk
include $(SRCDIR)/dsfmt.mk
include $(SRCDIR)/objconv.mk
include $(SRCDIR)/blas.mk
Expand Down
40 changes: 0 additions & 40 deletions deps/openspecfun.mk

This file was deleted.

2 changes: 0 additions & 2 deletions deps/openspecfun.version

This file was deleted.

0 comments on commit a5e9844

Please sign in to comment.