Fix ROCm backend API

exanauts · May 16, 2023 · bfaa546 · bfaa546
1 parent cd84343
commit bfaa546
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "ExaTron"
 uuid = "28b18bf8-76f9-41ea-81fa-0f922810b349"
 authors = ["Youngdae Kim <youngdae@anl.gov>", "François Pacaud <fpacaud@anl.gov>", "Kibaek Kim <kimk@anl.gov>", "Michel Schanen <mschanen@anl.gov>"]
-version = "3.0.0"
+version = "3.0.1"
 
 [deps]
 DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"

diff --git a/examples/admm/acopf_admm_gpu.jl b/examples/admm/acopf_admm_gpu.jl
@@ -60,7 +60,7 @@ function get_generator_data(data::OPFData, ::CUDABackend)
     return pgmin,pgmax,qgmin,qgmax,c2,c1,c0
 end
 
-function get_generator_data(data::OPFData, ::ROCDevice)
+function get_generator_data(data::OPFData, ::ROCBackend)
     ngen = length(data.generators)
 
     pgmin = ROCArray{Float64}(undef, ngen)
@@ -143,7 +143,7 @@ function get_bus_data(data::OPFData, ::CUDABackend)
     return cuFrStart,cuFrIdx,cuToStart,cuToIdx,cuGenStart,cuGenIdx,cuPd,cuQd
 end
 
-function get_bus_data(data::OPFData, ::ROCDevice)
+function get_bus_data(data::OPFData, ::ROCBackend)
     nbus = length(data.buses)
 
     FrIdx = [l for b=1:nbus for l in data.FromLines[b]]
@@ -232,7 +232,7 @@ function get_branch_data(data::OPFData, device::CUDABackend)
             cuYttR, cuYttI, cuYtfR, cuYtfI, cuFrBound, cuToBound
 end
 
-function get_branch_data(data::OPFData, device::ROCDevice)
+function get_branch_data(data::OPFData, device::ROCBackend)
     buses = data.buses
     lines = data.lines
     BusIdx = data.BusIdx

diff --git a/examples/admm/environment.jl b/examples/admm/environment.jl
@@ -282,7 +282,7 @@ AdmmEnv(opfdata::OPFData, device::CUDABackend, rho_pq, rho_va; options...) = Adm
         opfdata, rho_pq, rho_va; device=device, options...
     )
 
-AdmmEnv(opfdata::OPFData, device::ROCDevice, rho_pq, rho_va; options...) = AdmmEnv{Float64, ROCArray{Float64, 1}, ROCArray{Int, 1}, ROCArray{Float64, 2}}(
+AdmmEnv(opfdata::OPFData, device::ROCBackend, rho_pq, rho_va; options...) = AdmmEnv{Float64, ROCArray{Float64, 1}, ROCArray{Int, 1}, ROCArray{Float64, 2}}(
         opfdata, rho_pq, rho_va; device=device, options...
     )
 

diff --git a/examples/opf.jl b/examples/opf.jl
@@ -31,7 +31,7 @@ max_iter = parse(Int, ARGS[3])
 # Indicate which GPU device to use
 device = CPU()
 # device = CUDABackend()
-# device = ROCDevice()
+# device = ROCBackend()
 # verbose = 0: No output
 # verbose = 1: Final result metrics
 # verbose = 2: Iteration output

diff --git a/test/KA.jl b/test/KA.jl
@@ -53,7 +53,6 @@ if has_cuda_gpu()
     AT = CuArray
 elseif has_rocm_gpu()
     # Set for crusher login node to avoid other users
-    AMDGPU.default_device!(AMDGPU.devices()[2])
     device = AMDGPU.ROCBackend()
     AT = ROCArray
 else

diff --git a/test/admmtest.jl b/test/admmtest.jl
@@ -53,4 +53,4 @@ function one_level_admm(case::String, device)
     return nothing
 end
 
-# one_level_admm(CASE, ROCDevice())
+# one_level_admm(CASE, ROCBackend())