Merge pull request #120 from Cthonios/deps/remove-accelerated-kernels

remove accelerated kernels as dependency.

Author: cmhamel

Project.toml

@@ -4,7 +4,6 @@ authors = ["Craig M. Hamel <[email protected]> and contributors"]
 version = "0.6.0"
 
 [deps]
-AcceleratedKernels = "6a4ca0a5-0e36-4168-a932-d9be78d558f1"
 Atomix = "a9b6321e-bd34-4604-b9c9-b65b8de01458"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
@@ -30,7 +29,6 @@ FiniteElementContainersExodusExt = "Exodus"
 
 [compat]
 AMDGPU = "1"
-AcceleratedKernels = "0.3"
 Adapt = "3, 4"
 Aqua = "0.8"
 Atomix = "1"

src/DofManagers.jl

@@ -230,41 +230,41 @@ function create_bcs(dof::DofManager, ::Type{H1Field})
 end
 
 # this one needs some TLC
-function create_bcs(dof::DofManager, ::Type{H1Field}, dirichlet_bcs, time)
-  backend = KA.get_backend(dof.H1_bc_dofs)
-
-  X = dof.H1_vars[1].fspace.coords
-  # ND = num_dimensions(dof.H1_vars[1].fspace)
-  ND = size(X, 1) # TODO do this in a type stable way
-  # ND = num_fields(X)
-  # gather all dirichlet dofs
-  dirichlet_dofs = vcat(map(x -> x.bookkeeping.dofs, dirichlet_bcs)...)
-  dirichlet_vals = KA.zeros(backend, Float64, 0)
-
-  dirichlet_perm = sortperm(dirichlet_dofs)
-  dirichlet_dofs = dirichlet_dofs[dirichlet_perm]
-  dof_unique = unique(i -> dirichlet_dofs[i], eachindex(dirichlet_dofs))
-  dirichlet_dofs = dirichlet_dofs[dof_unique]
-
-  # dirichlet_vals = vcat(map(x -> x.func.(X[:, x.bookkeeping.nodes], (time,)), dirichlet_bcs)...)
-
-  for bc in dirichlet_bcs
-    # for node in bc.bookkeeping.nodes
-    AK.foreachindex(bc.bookkeeping.nodes) do n
-      node = bc.bookkeeping.nodes[n]
-      X_temp = SVector{ND, Float64}(@views X[:, node])
-      # @show bc.func(X_temp, time)
-      push!(dirichlet_vals, bc.func(X_temp, time))
-    end
-  end
-  # @show dirichlet_vals
-  # dirichlet_dofs
-  # need to get the coordinates and time
-  # for bc in dirichlet_bcs
+# function create_bcs(dof::DofManager, ::Type{H1Field}, dirichlet_bcs, time)
+#   backend = KA.get_backend(dof.H1_bc_dofs)
+
+#   X = dof.H1_vars[1].fspace.coords
+#   # ND = num_dimensions(dof.H1_vars[1].fspace)
+#   ND = size(X, 1) # TODO do this in a type stable way
+#   # ND = num_fields(X)
+#   # gather all dirichlet dofs
+#   dirichlet_dofs = vcat(map(x -> x.bookkeeping.dofs, dirichlet_bcs)...)
+#   dirichlet_vals = KA.zeros(backend, Float64, 0)
+
+#   dirichlet_perm = sortperm(dirichlet_dofs)
+#   dirichlet_dofs = dirichlet_dofs[dirichlet_perm]
+#   dof_unique = unique(i -> dirichlet_dofs[i], eachindex(dirichlet_dofs))
+#   dirichlet_dofs = dirichlet_dofs[dof_unique]
+
+#   # dirichlet_vals = vcat(map(x -> x.func.(X[:, x.bookkeeping.nodes], (time,)), dirichlet_bcs)...)
+
+#   for bc in dirichlet_bcs
+#     # for node in bc.bookkeeping.nodes
+#     AK.foreachindex(bc.bookkeeping.nodes) do n
+#       node = bc.bookkeeping.nodes[n]
+#       X_temp = SVector{ND, Float64}(@views X[:, node])
+#       # @show bc.func(X_temp, time)
+#       push!(dirichlet_vals, bc.func(X_temp, time))
+#     end
+#   end
+#   # @show dirichlet_vals
+#   # dirichlet_dofs
+#   # need to get the coordinates and time
+#   # for bc in dirichlet_bcs
 
-  # end
-  dirichlet_vals[dirichlet_perm][dof_unique]
-end
+#   # end
+#   dirichlet_vals[dirichlet_perm][dof_unique]
+# end
 
 
 """
@@ -452,7 +452,11 @@ function update_dofs!(dof::DofManager, dirichlet_dofs::T) where T <: AbstractArr
   # for d in dirichlet_dofs
   #   @assert d >= 1 && d <= ND * NN
   # end
-  AK.foreachindex(dirichlet_dofs) do i
+  # AK.foreachindex(dirichlet_dofs) do i
+  #   d = dirichlet_dofs[i]
+  #   @assert d >= 1 && d <= ND * NN
+  # end
+  for i in axes(dirichlet_dofs, 1)
     d = dirichlet_dofs[i]
     @assert d >= 1 && d <= ND * NN
   end

src/FiniteElementContainers.jl

@@ -120,7 +120,6 @@ export MappedInterpolants
 export MappedSurfaceInterpolants
 
 # dependencies
-import AcceleratedKernels as AK
 import KernelAbstractions as KA
 using Atomix
 using DocStringExtensions