Reverted reordering of f32/f64 and gpu.

JuliaHealth · Jan 5, 2023 · e090350 · e090350 · cncastillo · Jan 5, 2023
1 parent d40e589
commit e090350
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/simulation/SimulatorCore.jl b/src/simulation/SimulatorCore.jl
@@ -194,7 +194,15 @@ function simulate(obj::Phantom, seq::Sequence, sys::Scanner; simParams=Dict{Stri
     Nadc = sum(seq.ADC.N)
     Ncoils = 1 #This should consider the input Scanner type
     sig = zeros(ComplexF64, Nadc, Ncoils, Nthreads)
-    #Change precision: Only for CPU simulations
+    # Objects to GPU
+    if enable_gpu #Default
+        device!(gpu_device)
+        gpu_name = name.(devices())[gpu_device+1]
+        obj  = obj  |> gpu #Phantom
+        seqd = seqd |> gpu #DiscreteSequence
+        Xt   = Xt   |> gpu #SpinStateRepresentation
+        sig  = sig  |> gpu #Signal
+    end
     if precision == "f32" #Default
         obj  = obj  |> f32 #Phantom
         seqd = seqd |> f32 #DiscreteSequence
@@ -206,15 +214,6 @@ function simulate(obj::Phantom, seq::Sequence, sys::Scanner; simParams=Dict{Stri
         Xt   = Xt   |> f64 #SpinStateRepresentation
         sig  = sig  |> f64 #Signal
     end
-    # Objects to GPU
-    if enable_gpu #Default
-        device!(gpu_device)
-        gpu_name = name.(devices())[gpu_device+1]
-        obj  = obj  |> gpu #Phantom
-        seqd = seqd |> gpu #DiscreteSequence
-        Xt   = Xt   |> gpu #SpinStateRepresentation
-        sig  = sig  |> gpu #Signal
-    end
     # Simulation
     koma_version = VersionNumber(Pkg.TOML.parsefile(joinpath(@__DIR__, "..", "..", "Project.toml"))["version"])
     @info "Running simulation in the $(enable_gpu ? "GPU ($gpu_name)" : "CPU with $Nthreads thread(s)")" koma_version=koma_version sim_method = sim_method spins = length(obj) time_points = length(t) adc_points=Nadc