Skip to content
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.

Sign up for GitHub

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

Fix for Julia 0.5: symbol → Symbol #17

Closed
wants to merge 2 commits into from
Closed

Fix for Julia 0.5: symbol → Symbol #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a955137
Fix for Julia 0.5: symbol → Symbol
giordano Jun 7, 2016
ed62178
WORD_SIZE → Sys.WORD_SIZE
giordano Jun 7, 2016
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
8 changes: 4 additions & 4 deletions deps/build.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ using Compat
cubvers="1.0.2"

tagfile = "installed_vers"
if !isfile(tagfile) || readchomp(tagfile) != "$cubvers $WORD_SIZE"
if !isfile(tagfile) || readchomp(tagfile) != "$cubvers $Sys.WORD_SIZE"
info("Installing Cubature $cubvers library...")
if OS_NAME == :Windows
run(download_cmd("http://ab-initio.mit.edu/cubature/libcubature$WORD_SIZE-$cubvers.dll", "libcubature.dll"))
run(download_cmd("http://ab-initio.mit.edu/cubature/libcubature$Sys.WORD_SIZE-$cubvers.dll", "libcubature.dll"))
elseif OS_NAME == :Darwin
run(download_cmd("http://ab-initio.mit.edu/cubature/libcubature$WORD_SIZE-$cubvers.dylib", "libcubature.dylib"))
run(download_cmd("http://ab-initio.mit.edu/cubature/libcubature$Sys.WORD_SIZE-$cubvers.dylib", "libcubature.dylib"))
else
if !isfile("cubature-$cubvers.tar.gz")
run(download_cmd("http://ab-initio.mit.edu/cubature/cubature-$cubvers.tgz", "cubature-$cubvers.tar.gz"))
Expand All @@ -25,7 +25,7 @@ if !isfile(tagfile) || readchomp(tagfile) != "$cubvers $WORD_SIZE"
end
end
open(tagfile, "w") do f
println(f, "$cubvers $WORD_SIZE")
println(f, "$cubvers $Sys.WORD_SIZE")
end
else
info("Cubature $cubvers is already installed.")
Expand Down
6 changes: 3 additions & 3 deletions src/Cubature.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ import Base.sigatomic_begin, Base.sigatomic_end
for fscalar in (false, true) # whether the integrand is a scalar
for vectorized in (false, true) # whether multiple x are passed at once
for xscalar in (false, true) # whether x is a scalar
f = symbol(string(fscalar ? :sintegrand : :integrand,
f = Symbol(string(fscalar ? :sintegrand : :integrand,
vectorized ? "_v" : ""))

if xscalar
f = symbol(string("q",f))
f = Symbol(string("q",f))
if vectorized
xex = :(pointer_to_array(x_, (convert(Int, npt),)))
else
Expand Down Expand Up @@ -216,7 +216,7 @@ end

for f in (:hcubature, :pcubature, :hquadrature, :pquadrature)
for vectorized in (true, false)
g = symbol(string(f, vectorized ? "_v" : ""))
g = Symbol(string(f, vectorized ? "_v" : ""))
xscalar = f == :pquadrature || f == :hquadrature
padaptive = f == :pcubature || f == :pquadrature
@eval begin
Expand Down