Merge pull request #26 from giordano/mg/jll-package

Use JLL package to provide the library

.drone.jsonnet

@@ -18,8 +18,7 @@ local Pipeline(os, arch, version) = {
 
 [
     Pipeline("linux", "arm",   "1.3"),
-    Pipeline("linux", "arm64", "1.0"),
-    Pipeline("linux", "arm64", "1.1"),
-    Pipeline("linux", "arm64", "1.2"),
-    Pipeline("linux", "arm64", "1.3")
+    Pipeline("linux", "arm",   "1.4"),
+    Pipeline("linux", "arm64", "1.3"),
+    Pipeline("linux", "arm64", "1.4")
 ]

.drone.yml

@@ -14,57 +14,43 @@ steps:
 
 ---
 kind: pipeline
-name: linux - arm64 - Julia 1.0
+name: linux - arm - Julia 1.4
 
 platform:
   os: linux
-  arch: arm64
-
-steps:
-- name: build
-  image: julia:1.0
-  commands:
-  - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
-
----
-kind: pipeline
-name: linux - arm64 - Julia 1.1
-
-platform:
-  os: linux
-  arch: arm64
+  arch: arm
 
 steps:
 - name: build
-  image: julia:1.1
+  image: julia:1.4
   commands:
   - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
 
 ---
 kind: pipeline
-name: linux - arm64 - Julia 1.2
+name: linux - arm64 - Julia 1.3
 
 platform:
   os: linux
   arch: arm64
 
 steps:
 - name: build
-  image: julia:1.2
+  image: julia:1.3
   commands:
   - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
 
 ---
 kind: pipeline
-name: linux - arm64 - Julia 1.3
+name: linux - arm64 - Julia 1.4
 
 platform:
   os: linux
   arch: arm64
 
 steps:
 - name: build
-  image: julia:1.3
+  image: julia:1.4
   commands:
   - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
 

.gitignore

@@ -1,9 +1,7 @@
 *.jl.cov
 *.jl.*.cov
 *.jl.mem
-/deps
-/docs/build/
 /docs/site/
-/test/benchmark-fortran
-/test/benchmark-c
+/benchmarks/benchmark-fortran
+/benchmarks/benchmark-c
 Manifest.toml

.travis.yml

@@ -3,15 +3,11 @@ language: julia
 os:
   - linux
   - osx
+  - freebsd
 julia:
-  - 1.0
   - 1.3
   - 1.4
   - nightly
-env:
-  matrix:
-    - JULIA_CUBA_BUILD_SOURCE=true
-    - JULIA_CUBA_BUILD_SOURCE=false
 notifications:
   email: false
 git:
@@ -20,12 +16,23 @@ git:
 after_success:
  - julia -e 'using Pkg; cd(Pkg.dir("Cuba")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'
 
+branches:
+  only:
+  - master
+  - gh-pages # For building documentation
+  - /^testing-.*$/ # testing branches
+  - /^v[0-9]+\.[0-9]+\.[0-9]+$/ # version tags
+
+cache:
+  directories:
+  - $HOME/.julia/artifacts
+
 jobs:
   allow_failures:
     - julia: nightly
   include:
     - stage: "Documentation"
-      julia: 1.0
+      julia: 1.4
       os: linux
       script:
         - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));

Project.toml

@@ -1,16 +1,15 @@
 name = "Cuba"
 uuid = "8a292aeb-7a57-582c-b821-06e4c11590b1"
 authors = ["Mosè Giordano <[email protected]>"]
-version = "2.0.0"
+version = "2.1.0"
 
 [deps]
-BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
-Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+Cuba_jll = "3bed1096-5ab2-53a1-92e2-6c1cc31d0f4b"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [compat]
-BinaryProvider = "≥ 0.5.0"
-julia = "≥ 1.0.0"
+Cuba_jll = "4.2"
+julia = "1.3.0"
 
 [extras]
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"

appveyor.yml

@@ -1,9 +1,7 @@
 environment:
   matrix:
-  - julia_version: 1
-  - julia_version: 1.1
-  - julia_version: 1.2
   - julia_version: 1.3
+  - julia_version: 1.4
   - julia_version: nightly
 
 platform:
@@ -21,6 +19,9 @@ branches:
     - master
     - /release-.*/
 
+cache:
+  - '%USERPROFILE%\.julia\artifacts'
+
 notifications:
   - provider: Email
     on_build_success: false

test/benchmark.jl → benchmarks/benchmark.jl

@@ -73,16 +73,20 @@ end
 
 cd(@__DIR__) do
     if mtime("benchmark.c") > mtime("benchmark-c")
-        run(`gcc -O3 -I ../deps/usr/include -o benchmark-c benchmark.c $(Cuba.libcuba) -lm`)
+        run(`gcc -O3 -I $(Cuba.Cuba_jll.artifact_dir)/include -o benchmark-c benchmark.c $(Cuba.Cuba_jll.libcuba_path) -lm`)
     end
     @info "Performance of Cuba Library in C:"
-    run(`./benchmark-c`)
+    withenv(Cuba.Cuba_jll.LIBPATH_env => Cuba.Cuba_jll.LIBPATH) do
+        run(`./benchmark-c`)
+    end
 
     if success(`which gfortran`)
         if mtime("benchmark.f") > mtime("benchmark-fortran")
-            run(`gfortran -O3 -fcheck=no-bounds -cpp -o benchmark-fortran benchmark.f $(Cuba.libcuba) -lm`)
+            run(`gfortran -O3 -fcheck=no-bounds -cpp -o benchmark-fortran benchmark.f $(Cuba.Cuba_jll.libcuba_path) -lm`)
         end
         @info "Performance of Cuba Library in Fortran:"
-        run(`./benchmark-fortran`)
+        withenv(Cuba.Cuba_jll.LIBPATH_env => Cuba.Cuba_jll.LIBPATH) do
+            run(`./benchmark-fortran`)
+        end
     end
 end

docs/Project.toml

@@ -3,4 +3,4 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 
 [compat]
-Documenter = "~0.20"
+Documenter = "~0.24"

docs/make.jl

@@ -2,7 +2,6 @@ using Documenter, Cuba
 
 makedocs(
     modules = [Cuba],
-    format = :html,
     sitename = "Cuba",
 )