Skip to content

Commit ee31e98

Browse files
remove binaryprovider
1 parent fb75e4c commit ee31e98

File tree

3 files changed

+11
-22
lines changed

3 files changed

+11
-22
lines changed

Project.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
name = "FastTransforms"
22
uuid = "057dd010-8810-581a-b7be-e3fc3b93f78c"
3-
version = "0.13.8"
3+
version = "0.13.9"
44

55
[deps]
66
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
77
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
8-
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
98
DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"
109
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
1110
FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"
@@ -21,7 +20,6 @@ ToeplitzMatrices = "c751599d-da0a-543b-9d20-d0a503d91d24"
2120
[compat]
2221
AbstractFFTs = "1.0"
2322
ArrayLayouts = "0.4, 0.5, 0.6, 0.7, 0.8"
24-
BinaryProvider = "0.5"
2523
DSP = "0.6, 0.7"
2624
FFTW = "1"
2725
FastGaussQuadrature = "0.4"

deps/build.jl

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
11
if get(ENV, "FT_BUILD_FROM_SOURCE", "false") == "true"
2-
using BinaryProvider
3-
import Libdl
4-
5-
const extension = Sys.isapple() ? "dylib" : Sys.islinux() ? "so" : Sys.iswindows() ? "dll" : ""
6-
7-
print_error() = error(
8-
"FastTransforms could not be properly installed.\n Please check that you have all dependencies installed. " *
9-
"Sample installation of dependencies:\n" *
10-
print_platform_error(platform_key_abi())
11-
)
12-
13-
print_platform_error(p::Platform) = "On $(BinaryProvider.platform_name(p)), please consider opening a pull request to add support to build from source.\n"
14-
print_platform_error(p::MacOS) = "On MacOS\n\tbrew install libomp fftw mpfr\n"
15-
print_platform_error(p::Linux) = "On Linux\n\tsudo apt-get install libomp-dev libblas-dev libopenblas-base libfftw3-dev libmpfr-dev\n"
16-
print_platform_error(p::Windows) = "On Windows\n\tvcpkg install openblas:x64-windows fftw3[core,threads]:x64-windows mpir:x64-windows mpfr:x64-windows\n"
17-
2+
extension = Sys.isapple() ? "dylib" : Sys.islinux() ? "so" : Sys.iswindows() ? "dll" : ""
183
make = Sys.iswindows() ? "mingw32-make" : "make"
194
flags = Sys.isapple() ? "FT_USE_APPLEBLAS=1" : Sys.iswindows() ? "FT_FFTW_WITH_COMBINED_THREADS=1" : ""
205
script = """
@@ -38,7 +23,14 @@ if get(ENV, "FT_BUILD_FROM_SOURCE", "false") == "true"
3823
try
3924
run(`bash -c $(script)`)
4025
catch
41-
print_error()
26+
error(
27+
"FastTransforms could not be properly installed.\n Please check that you have all dependencies installed. " *
28+
"Sample installation of dependencies:\n" *
29+
(Sys.isapple() ? "On MacOS\n\tbrew install libomp fftw mpfr\n" :
30+
Sys.islinux() ? "On Linux\n\tsudo apt-get install libomp-dev libblas-dev libopenblas-base libfftw3-dev libmpfr-dev\n" :
31+
Sys.iswindows() ? "On Windows\n\tvcpkg install openblas:x64-windows fftw3[core,threads]:x64-windows mpir:x64-windows mpfr:x64-windows\n" :
32+
"On your platform, please consider opening a pull request to add support to build from source.\n")
33+
)
4234
end
4335
println("FastTransforms built from source.")
4436
else

src/libfasttransforms.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
ft_build_from_source = get(ENV, "FT_BUILD_FROM_SOURCE", "false")
2-
if ft_build_from_source == "true"
1+
if get(ENV, "FT_BUILD_FROM_SOURCE", "false") == "true"
32
using Libdl
43
const libfasttransforms = find_library("libfasttransforms", [joinpath(dirname(@__DIR__), "deps")])
54
if libfasttransforms nothing || length(libfasttransforms) == 0

0 commit comments

Comments
 (0)