Merge pull request #74 from williamfgc/add-atomix

Add suport for Atomix.@atomic across back ends

Project.toml

@@ -4,6 +4,7 @@ authors = ["pedrovalerolara <valerolarap@ornl.gov>", "williamfgc <williamfgc@yah
 version = "0.0.3"
 
 [deps]
+Atomix = "a9b6321e-bd34-4604-b9c9-b65b8de01458"
 Preferences = "21216c6a-2e73-6563-6e65-726566657250"
 
 [weakdeps]

src/JACC.jl

@@ -1,11 +1,12 @@
 __precompile__(false)
 module JACC
 
+import Atomix: @atomic
 # module to set back end preferences 
 include("JACCPreferences.jl")
 include("helper.jl")
 
-export Array
+export Array, @atomic
 export parallel_for
 
 global Array

test/tests_amdgpu.jl

@@ -52,3 +52,23 @@ end
 
 	@test Array(x_device) ≈ x_expected rtol = 1e-1
 end
+
+@testset "AtomicCounter" begin
+
+	function axpy_counter!(i, alpha, x, y, counter)
+		@inbounds x[i] += alpha * y[i]
+		JACC.@atomic counter[1] += 1
+	end
+
+	N = Int32(10)
+	# Generate random vectors x and y of length N for the interval [0, 100]
+	alpha = 2.5
+
+	x = JACC.Array(round.(rand(Float32, N) * 100))
+	y = JACC.Array(round.(rand(Float32, N) * 100))
+	counter = JACC.Array{Int32}([0])
+	JACC.parallel_for(N, axpy_counter!, alpha, x, y, counter)
+
+	@test Array(counter)[1] == N
+end
+

test/tests_cuda.jl

@@ -53,6 +53,26 @@ end
 	@test Array(x_device) ≈ x_expected rtol = 1e-1
 end
 
+@testset "AtomicCounter" begin
+
+	function axpy_counter!(i, alpha, x, y, counter)
+		@inbounds x[i] += alpha * y[i]
+		JACC.@atomic counter[1] += 1
+	end
+
+	N = Int32(10)
+	# Generate random vectors x and y of length N for the interval [0, 100]
+	alpha = 2.5
+
+	x = JACC.Array(round.(rand(Float32, N) * 100))
+	y = JACC.Array(round.(rand(Float32, N) * 100))
+	counter = JACC.Array{Int32}([0])
+	JACC.parallel_for(N, axpy_counter!, alpha, x, y, counter)
+
+	@test Array(counter)[1] == N
+end
+
+
 
 
 

test/tests_threads.jl

@@ -52,6 +52,27 @@ end
 	@test x_host_JACC ≈ x_expected rtol = 1e-1
 end
 
+@testset "AtomicCounter" begin
+
+	function axpy_counter!(i, alpha, x, y, counter)
+		@inbounds x[i] += alpha * y[i]
+		JACC.@atomic counter[1] += 1
+	end
+
+	N = Int32(10)
+	# Generate random vectors x and y of length N for the interval [0, 100]
+	alpha = 2.5
+	counter = zeros(Int32, 1)
+
+	x_device = JACC.Array(round.(rand(Float32, N) * 100))
+	y_device = JACC.Array(round.(rand(Float32, N) * 100))
+	counter = JACC.Array{Int32}([0])
+	JACC.parallel_for(N, axpy_counter!, alpha, x_device, y_device, counter)
+
+	@test counter[1] == N
+
+end
+
 @testset "CG" begin
 
 	function matvecmul(i, a1, a2, a3, x, y, SIZE)
@@ -112,9 +133,6 @@ end
 		ccond = JACC.parallel_reduce(SIZE, dot, r, r)
 		global cond = ccond
 		p = copy(r_aux)
-
-		println(cond)
-
 	end
 	@test cond[1, 1] <= 1e-14
 end