diff --git a/deps/build.jl b/deps/build.jl index 8f9d1b9..4c41b5b 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -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")) @@ -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.") diff --git a/src/Cubature.jl b/src/Cubature.jl index a6b20dc..1adf24b 100644 --- a/src/Cubature.jl +++ b/src/Cubature.jl @@ -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 @@ -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