Skip to content

Commit ba833b1

Browse files
committed
Simplify logic now that we require 0.7
1 parent 2144631 commit ba833b1

File tree

4 files changed

+429
-459
lines changed

4 files changed

+429
-459
lines changed

REQUIRE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
julia 0.7
2-
Compat 0.59.0
32
BinaryProvider 0.4
43
BinDeps

deps/scratch.jl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ using BinDeps
44
using BinDeps: libdir, srcdir, includedir, depsdir, builddir
55
using Base.Math: libm
66
import BinaryProvider
7-
8-
if VERSION >= v"0.7.0-DEV.3382"
9-
using Libdl
10-
end
11-
7+
using Libdl
128

139
BinDeps.@setup
1410
const OSF_VERS = v"0.5.3"
@@ -114,4 +110,4 @@ provides(BuildProcess,
114110
end
115111
end), openspecfun)
116112

117-
BinDeps.@install Dict(:libopenspecfun => :openspecfun)
113+
BinDeps.@install Dict(:libopenspecfun => :openspecfun)

src/SpecialFunctions.jl

Lines changed: 57 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,75 @@
1-
__precompile__()
21
module SpecialFunctions
32

4-
using Compat
5-
6-
if VERSION >= v"0.7.0-DEV.1760"
7-
# Load openspecfun libraries from our deps.jl
8-
const depsjl_path = joinpath(@__DIR__, "..", "deps", "deps.jl")
3+
# Load openspecfun libraries from our deps.jl
4+
let depsjl_path = joinpath(@__DIR__, "..", "deps", "deps.jl")
95
if !isfile(depsjl_path)
10-
error("SpecialFunctions not installed properly, run Pkg.build(\"SpecialFunctions\"), restart Julia and try again")
6+
error("SpecialFunctions is not installed properly, run `Pkg.build(\"SpecialFunctions\")`," *
7+
"restart Julia and try again")
118
end
129
include(depsjl_path)
13-
else
14-
using Base.Math: openspecfun
1510
end
1611

17-
if isdefined(Base, :airyai) && VERSION < v"0.7.0-DEV.986" #22763
18-
import Base: airyai, airyaix, airyaiprime, airyaiprimex,
19-
airybi, airybix, airybiprime, airybiprimex,
20-
besselh, besselhx, besseli, besselix, besselj, besselj0, besselj1,
21-
besseljx, besselk, besselkx, bessely, bessely0, bessely1, besselyx,
22-
hankelh1, hankelh1x, hankelh2, hankelh2x,
23-
dawson, erf, erfc, erfcinv, erfcx, erfi, erfinv,
24-
eta, digamma, invdigamma, polygamma, trigamma, zeta,
25-
# deprecated
26-
airy, airyx, airyprime
27-
else
28-
export
29-
airyai,
30-
airyaiprime,
31-
airybi,
32-
airybiprime,
33-
airyaix,
34-
airyaiprimex,
35-
airybix,
36-
airybiprimex,
37-
besselh,
38-
besselhx,
39-
besseli,
40-
besselix,
41-
besselj,
42-
besselj0,
43-
besselj1,
44-
besseljx,
45-
besselk,
46-
besselkx,
47-
bessely,
48-
bessely0,
49-
bessely1,
50-
besselyx,
51-
dawson,
52-
erf,
53-
erfc,
54-
erfcinv,
55-
erfcx,
56-
erfi,
57-
erfinv,
58-
eta,
59-
digamma,
60-
invdigamma,
61-
polygamma,
62-
trigamma,
63-
hankelh1,
64-
hankelh1x,
65-
hankelh2,
66-
hankelh2x,
67-
zeta
68-
end
12+
__init__() = check_deps()
6913

70-
export sinint,
71-
cosint,
72-
lbinomial
14+
export
15+
airyai,
16+
airyaiprime,
17+
airybi,
18+
airybiprime,
19+
airyaix,
20+
airyaiprimex,
21+
airybix,
22+
airybiprimex,
23+
besselh,
24+
besselhx,
25+
besseli,
26+
besselix,
27+
besselj,
28+
besselj0,
29+
besselj1,
30+
besseljx,
31+
besselk,
32+
besselkx,
33+
bessely,
34+
bessely0,
35+
bessely1,
36+
besselyx,
37+
dawson,
38+
erf,
39+
erfc,
40+
erfcinv,
41+
erfcx,
42+
erfi,
43+
erfinv,
44+
eta,
45+
digamma,
46+
invdigamma,
47+
polygamma,
48+
trigamma,
49+
hankelh1,
50+
hankelh1x,
51+
hankelh2,
52+
hankelh2x,
53+
zeta,
54+
sinint,
55+
cosint,
56+
lbinomial
7357

7458
include("bessel.jl")
7559
include("erf.jl")
7660
include("sincosint.jl")
7761
include("gamma.jl")
7862
include("deprecated.jl")
7963

80-
@static if isdefined(Base, :missing)
81-
for f in (:digamma, :erf, :erfc, :erfcinv, :erfcx, :erfi, :erfinv,
82-
:eta, :gamma, :invdigamma, :lfactorial, :lgamma, :trigamma)
83-
@eval $(f)(::Missing) = missing
84-
end
85-
for f in (:beta, :lbeta)
86-
@eval $(f)(::Number, ::Missing) = missing
87-
@eval $(f)(::Missing, ::Number) = missing
88-
@eval $(f)(::Missing, ::Missing) = missing
89-
end
90-
polygamma(m::Integer, x::Missing) = missing
64+
for f in (:digamma, :erf, :erfc, :erfcinv, :erfcx, :erfi, :erfinv,
65+
:eta, :gamma, :invdigamma, :lfactorial, :lgamma, :trigamma)
66+
@eval $(f)(::Missing) = missing
67+
end
68+
for f in (:beta, :lbeta)
69+
@eval $(f)(::Number, ::Missing) = missing
70+
@eval $(f)(::Missing, ::Number) = missing
71+
@eval $(f)(::Missing, ::Missing) = missing
9172
end
73+
polygamma(m::Integer, x::Missing) = missing
9274

9375
end # module

0 commit comments

Comments
 (0)