Remove MIOpen softmax & batchnorm (#630)

JuliaGPU · May 15, 2024 · c2fe803 · c2fe803
1 parent ace0a2e
commit c2fe803
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 33 deletions.
diff --git a/src/dnn/MIOpen.jl b/src/dnn/MIOpen.jl
@@ -5,7 +5,6 @@ using CEnum
 using ..AMDGPU
 import AMDGPU: ROCArray, LockedObject, HandleCache, HIP, library_state
 import AMDGPU: libMIOpen_path
-import AMDGPU.Runtime.Mem # TODO remove?
 import .HIP: hipStream_t
 
 include("libMIOpen.jl")
@@ -89,8 +88,8 @@ stream() = lib_state().stream
 include("descriptors.jl")
 include("convolution.jl")
 include("pooling.jl")
-include("softmax.jl")
 include("activations.jl")
-include("batchnorm.jl")
+# include("softmax.jl")
+# include("batchnorm.jl")
 
 end
diff --git a/test/dnn/miopen.jl b/test/dnn/miopen.jl
@@ -28,16 +28,17 @@ end
     include("pool.jl")
 end
 
-@testset "Softmax" begin
-    include("softmax.jl")
-end
+# NOTE: https://github.com/ROCm/MIOpen/issues/2966
+# @testset "Softmax" begin
+#     include("softmax.jl")
+# end
 
 @testset "Activations" begin
     include("activations.jl")
 end
 
-@testset "Batch Normalization" begin
-    include("batchnorm.jl")
-end
+# @testset "Batch Normalization" begin
+#     include("batchnorm.jl")
+# end
 
 end
diff --git a/test/dnn/softmax.jl b/test/dnn/softmax.jl
@@ -12,38 +12,22 @@
             # Regular softmax.
 
             yd = MIOpen.softmax(xd; dims)
-            if T == Float16
-                @test !any(isnan.(Array(yd)))
-            else
-                y = NNlib.softmax(x; dims)
-                @test Array(yd) ≈ y atol=atol
-            end
+            y = NNlib.softmax(x; dims)
+            @test Array(yd) ≈ y atol=atol
 
             dxd = MIOpen.∇softmax(dyd, yd; dims)
-            if T == Float16
-                @test !any(isnan.(Array(dxd)))
-            else
-                dx = NNlib.∇softmax_data(dy, y; dims)
-                @test Array(dxd) ≈ dx atol=atol
-            end
+            dx = NNlib.∇softmax_data(dy, y; dims)
+            @test Array(dxd) ≈ dx atol=atol
 
             # Log softmax.
 
             yd = MIOpen.logsoftmax(xd; dims)
-            if T == Float16
-                @test !any(isnan.(Array(yd)))
-            else
-                y = NNlib.logsoftmax(x; dims)
-                @test Array(yd) ≈ y atol=atol
-            end
+            y = NNlib.logsoftmax(x; dims)
+            @test Array(yd) ≈ y atol=atol
 
             dxd = MIOpen.∇logsoftmax(dyd, yd; dims)
-            if T == Float16
-                @test !any(isnan.(Array(dxd)))
-            else
-                dx = NNlib.∇logsoftmax_data(dy, y; dims)
-                @test Array(dxd) ≈ dx atol=atol
-            end
+            dx = NNlib.∇logsoftmax_data(dy, y; dims)
+            @test Array(dxd) ≈ dx atol=atol
         end
     end
 end