Skip to content

Commit

Permalink
use Cubature_jll (#49)
Browse files Browse the repository at this point in the history
* use Cubature_jll

* note HCubature

* updated badge
  • Loading branch information
stevengj authored Apr 4, 2020
1 parent 058ac1e commit 0f2e81f
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 21 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
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![Build Status](https://travis-ci.org/stevengj/Cubature.jl.svg?branch=master)](https://travis-ci.org/stevengj/Cubature.jl)
[![Build status](https://ci.appveyor.com/api/projects/status/bu4lciej14ct2rb0?svg=true)](https://ci.appveyor.com/project/StevenGJohnson/cubature-jl)
[![Build status](https://ci.appveyor.com/api/projects/status/0gsydibwwx59ruu7?svg=true)](https://ci.appveyor.com/project/StevenGJohnson/cubature-jl-ux9xb)


# The Cubature module for Julia
Expand All @@ -10,6 +10,10 @@ support for vector-valued integrands and facilitation of parallel
evaluation of integrands, based on the [Cubature
Package](https://github.com/stevengj/cubature) by Steven G. Johnson.

See also the [HCubature package] for a pure-Julia implementation of
h-adaptive cubature using the same algorithm (which is therefore much
more flexible in the types that it can integrate).

## h-adaptive versus p-adaptive integration

Adaptive integration works by evaluating the integrand at more and
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

4 comments on commit 0f2e81f

@stevengj
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Error while trying to register: Changing package repo URL not allowed, please submit a pull request with the URL change to the target registry and retry.

@stevengj
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/12248

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v1.5.0 -m "<description of version>" 0f2e81fe97572bd94fbacf4225f8189cb25cd39e
git push origin v1.5.0

Please sign in to comment.