Skip to content

Commit 43d1c1a

Browse files
authored
Merge pull request #191 from giordano/mg/test-project
Simplify `test/Project.toml` and remove redundant deps in `Project.toml`
2 parents 2fe1568 + cc7eed9 commit 43d1c1a

File tree

5 files changed

+3
-18
lines changed

5 files changed

+3
-18
lines changed

Project.toml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,14 @@ version = "1.3.2"
55
[compat]
66
AbstractFFTs = "1.0"
77
FFTW_jll = "3.3"
8-
IntelOpenMP_jll = "2018.0.3"
98
MKL_jll = "2019.0.117, 2020, 2021"
109
Reexport = "0.2, 1.0"
1110
julia = "1.6"
1211

1312
[deps]
1413
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
1514
FFTW_jll = "f5851436-0d7a-5f13-b9de-f02708fd171a"
16-
IntelOpenMP_jll = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0"
17-
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
1815
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1916
MKL_jll = "856f044c-d86e-5d09-b602-aeab76dc8ba7"
2017
Preferences = "21216c6a-2e73-6563-6e65-726566657250"
2118
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
22-
23-
24-
[extras]
25-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
26-
27-
[targets]
28-
test = ["Test"]

src/FFTW.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module FFTW
22

33
using LinearAlgebra, Reexport, Preferences
4-
import Libdl
54
@reexport using AbstractFFTs
65
using Base.Threads
76

src/providers.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ end
7474

7575
# If we're using MKL, load it in and set library paths appropriately.
7676
@static if fftw_provider == "mkl"
77-
using IntelOpenMP_jll, MKL_jll
77+
using MKL_jll
7878
const libfftw3 = MKL_jll.libmkl_rt_path
7979
const libfftw3f = libfftw3
8080
end

test/Project.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,5 @@
44

55
[deps]
66
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
7-
FFTW_jll = "f5851436-0d7a-5f13-b9de-f02708fd171a"
8-
IntelOpenMP_jll = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0"
9-
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
107
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
11-
MKL_jll = "856f044c-d86e-5d09-b602-aeab76dc8ba7"
12-
Preferences = "21216c6a-2e73-6563-6e65-726566657250"
13-
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
148
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

test/runtests.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ using AbstractFFTs: Plan, plan_inv
55
using Test
66
using LinearAlgebra
77

8+
@info "FFTW provider: $(fftw_provider)"
9+
810
@testset "colmajorstrides" begin
911
@test @inferred(FFTW.colmajorstrides((3, 5, 7))) == (1, 3, 15)
1012
end

0 commit comments

Comments
 (0)