Skip to content

Commit 695baba

Browse files
CarloLucibellomaleadt
authored andcommitted
Remove NNlib.
This functionality is now available under the NNlibCUDA subpackage of NNlib.jl
1 parent eaa47ed commit 695baba

File tree

13 files changed

+0
-925
lines changed

13 files changed

+0
-925
lines changed

Manifest.toml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ git-tree-sha1 = "215a9aa4a1f23fbd05b92769fdd62559488d70e9"
3232
uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82"
3333
version = "0.4.1"
3434

35-
[[ChainRulesCore]]
36-
deps = ["Compat", "LinearAlgebra", "SparseArrays"]
37-
git-tree-sha1 = "de4f08843c332d355852721adb1592bce7924da3"
38-
uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
39-
version = "0.9.29"
40-
4135
[[Compat]]
4236
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
4337
git-tree-sha1 = "919c7f3151e79ff196add81d7f4e45d91bbf420b"
@@ -153,12 +147,6 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804"
153147
[[MozillaCACerts_jll]]
154148
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
155149

156-
[[NNlib]]
157-
deps = ["ChainRulesCore", "Compat", "LinearAlgebra", "Pkg", "Requires", "Statistics"]
158-
git-tree-sha1 = "df42d0816edfc24f5b82a728f46381613c4dff79"
159-
uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
160-
version = "0.7.14"
161-
162150
[[NetworkOptions]]
163151
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
164152

Project.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1919
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
2020
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
2121
Memoize = "c03570c3-d221-55d1-a50c-7939bbd78826"
22-
NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
2322
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
2423
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
2524
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
@@ -40,7 +39,6 @@ GPUCompiler = "0.10.0"
4039
LLVM = "3"
4140
MacroTools = "0.5"
4241
Memoize = "0.4"
43-
NNlib = "0.7.7"
4442
Reexport = "0.2, 1.0"
4543
Requires = "0.5, 1.0"
4644
TimerOutputs = "0.5"

lib/cudnn/CUDNN.jl

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

1313
using DataStructures
1414

15-
import NNlib
16-
1715

1816
# core library
1917
include("libcudnn_common.jl")
@@ -38,10 +36,6 @@ include("rnn.jl")
3836
include("multiheadattn.jl")
3937
include("normalization.jl")
4038

41-
# high-level integrations
42-
include("nnlib.jl")
43-
include("batchnorm.jl")
44-
4539

4640
function math_mode(mode=CUDA.math_mode())
4741
if mode == CUDA.PEDANTIC_MATH

lib/cudnn/batchnorm.jl

Lines changed: 0 additions & 115 deletions
This file was deleted.

lib/cudnn/convolution.jl

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -120,24 +120,6 @@ function cudnnConvolutionForwardAD(w, x, bias, z; y, activation, convDesc, wDesc
120120
return y
121121
end
122122

123-
124-
# Deprecated methods
125-
using NNlib: DenseConvDims
126-
127-
function cudnnConvolutionForward(y::DenseCuArray{T,N}, x::DenseCuArray{T,N}, w::DenseCuArray{T,N},
128-
cdims::DenseConvDims; algo=0, alpha=1, beta=0) where {T,N}
129-
@warn "`cudnnConvolutionForward(y,x,w,c::DenseConvDims)` is deprecated, please use one of the methods in `@doc cudnnConvolutionForward!`." maxlog=1
130-
cudnnConvolutionForward!(y, w, x; alpha, beta, padding=nnlibPadding(cdims), stride=NNlib.stride(cdims), dilation=NNlib.dilation(cdims), mode=(NNlib.flipkernel(cdims) ? CUDNN_CROSS_CORRELATION : CUDNN_CONVOLUTION))
131-
end
132-
133-
function cudnnConvolutionBiasActivationForward(y::DenseCuArray{T,N}, x::DenseCuArray{T,N}, w::DenseCuArray{T,N}, z::DenseCuArray{T,N}, bias::DenseCuArray{T,N},
134-
cdims::DenseConvDims; algo=0, alpha1=1, alpha2=1,
135-
activationMode=CUDNN_ACTIVATION_RELU, activationCoeff=0.0, activationReluNanOpt=CUDNN_NOT_PROPAGATE_NAN) where {T,N}
136-
@warn "`cudnnConvolutionBiasActivationForward` is deprecated, please use one of the methods in `@doc cudnnConvolutionForward!`." maxlog=1
137-
cudnnConvolutionForward!(y, w, x; bias, activation=activationMode, z, alpha=alpha1, beta=alpha2, padding=nnlibPadding(cdims), stride=NNlib.stride(cdims), dilation=NNlib.dilation(cdims), mode=(NNlib.flipkernel(cdims) ? CUDNN_CROSS_CORRELATION : CUDNN_CONVOLUTION))
138-
end
139-
140-
141123
# Helper for cudnnConvolutionDescriptor
142124
function cudnnSetConvolutionDescriptor(
143125
ptr::cudnnConvolutionDescriptor_t,

0 commit comments

Comments
 (0)