Skip to content
This repository was archived by the owner on Mar 12, 2021. It is now read-only.

Commit d8b5ab3

Browse files
authored
Merge pull request #577 from JuliaGPU/tb/reexport_fftw
Re-export AbstractFFTs functionality.
2 parents 3c12fd8 + 267fc2b commit d8b5ab3

File tree

5 files changed

+29
-2
lines changed

5 files changed

+29
-2
lines changed

Manifest.toml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ git-tree-sha1 = "b7720de347734f4716d1815b00ce5664ed6bbfd4"
5252
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
5353
version = "0.17.9"
5454

55+
[[Dates]]
56+
deps = ["Printf"]
57+
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
58+
5559
[[Distributed]]
5660
deps = ["Random", "Serialization", "Sockets"]
5761
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
@@ -74,6 +78,9 @@ git-tree-sha1 = "1d08d7e4250f452f6cb20e4574daaebfdbee0ff7"
7478
uuid = "929cbde3-209d-540e-8aea-75f648917ca0"
7579
version = "1.3.3"
7680

81+
[[LibGit2]]
82+
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
83+
7784
[[Libdl]]
7885
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
7986

@@ -106,14 +113,28 @@ git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1"
106113
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
107114
version = "1.1.0"
108115

116+
[[Pkg]]
117+
deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"]
118+
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
119+
109120
[[Printf]]
110121
deps = ["Unicode"]
111122
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
112123

124+
[[REPL]]
125+
deps = ["InteractiveUtils", "Markdown", "Sockets"]
126+
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
127+
113128
[[Random]]
114129
deps = ["Serialization"]
115130
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
116131

132+
[[Reexport]]
133+
deps = ["Pkg"]
134+
git-tree-sha1 = "7b1d07f411bc8ddb7977ec7f377b97b158514fe0"
135+
uuid = "189a3867-3050-52da-a836-e630ba90ab69"
136+
version = "0.2.0"
137+
117138
[[Requires]]
118139
deps = ["UUIDs"]
119140
git-tree-sha1 = "999513b7dea8ac17359ed50ae8ea089e4464e35e"

Project.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
1717
NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
1818
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
1919
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
20+
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
2021
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
2122
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
2223
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
@@ -32,6 +33,7 @@ DataStructures = "0.17"
3233
GPUArrays = "2.0"
3334
MacroTools = "0.5"
3435
NNlib = "0.6"
36+
Reexport = "0.2"
3537
Requires = "0.5, 1.0"
3638
TimerOutputs = "0.5"
3739
julia = "1.3"

src/fft/CUFFT.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ using CUDAnative
1212

1313
using CEnum
1414

15+
using Reexport
16+
1517
const libcufft = Ref("libcufft")
1618

1719
# core library

src/fft/fft.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# integration with AbstractFFTs.jl
22

3-
import AbstractFFTs: plan_fft, plan_fft!, plan_bfft, plan_bfft!,
3+
@reexport using AbstractFFTs
4+
5+
import AbstractFFTs: plan_fft, plan_fft!, plan_bfft, plan_bfft!, plan_ifft,
46
plan_rfft, plan_brfft, plan_inv, normalization, fft, bfft, ifft, rfft,
57
Plan, ScaledPlan
68

test/fft.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ using CuArrays.CUFFT
44

55
using CUDAdrv
66

7-
using FFTW
7+
import FFTW
88

99
# notes:
1010
# plan_bfft does not need separate testing since it is used by plan_ifft

0 commit comments

Comments
 (0)