Skip to content

Commit

Permalink
use Cubature_jll
Browse files Browse the repository at this point in the history
  • Loading branch information
stevengj committed Apr 4, 2020
1 parent 058ac1e commit 916d4ad
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ os:
- linux
- osx
julia:
- 1.0
- 1.1
- 1.3
- 1.4
- nightly
notifications:
email: false
8 changes: 3 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
name = "Cubature"
uuid = "667455a9-e2ce-5579-9412-b964f529a492"
version = "1.4.1"
version = "1.5.0"

[deps]
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
Cubature_jll = "7bc98958-0e37-5d67-a6ac-a3a19030071a"

[compat]
BinaryProvider = "≥ 0.3.0"
julia = "≥ 1.0.0"
julia = "1.3"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
environment:
matrix:
- julia_version: 1
- julia_version: 1.1
- julia_version: 1.3
- julia_version: 1.4
- julia_version: nightly

platform:
Expand Down
13 changes: 2 additions & 11 deletions src/Cubature.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,11 @@ integrals of scalar functions).
"""
module Cubature

using Cubature_jll

export hcubature, pcubature, hcubature_v, pcubature_v,
hquadrature, pquadrature, hquadrature_v, pquadrature_v

# Load cubature libraries from our deps.jl
const depsjl_path = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
if !isfile(depsjl_path)
error("Cubature not installed properly, run Pkg.build(\"Cubature\"), restart Julia, and try again")
end
include(depsjl_path)

function __init__()
check_deps()
end

# constants from cubature.h
const INDIVIDUAL = Int32(0)
const PAIRED = Int32(1)
Expand Down

0 comments on commit 916d4ad

Please sign in to comment.