Merge pull request #273 from FourierFlows/ncc/drop-has-cuda

Drop the in-house `@has_cuda` macro

Author: navidcy

src/FourierFlows.jl

@@ -8,9 +8,6 @@ $(EXPORTS)
 module FourierFlows
 
 export
-  # Helper variables and macros for determining if machine is CUDA-enabled.
-  @has_cuda,
-
   Device,
   CPU,
   GPU,
@@ -114,16 +111,10 @@ include("timesteppers.jl")
 # Physics
 include("diffusion.jl")
 
-"""
-    @has_cuda expr
-A macro to compile and execute `expr` only if CUDA is installed and available.
-"""
-macro has_cuda(expr)
-  return has_cuda() ? :($(esc(expr))) : :(nothing)
-end
-
 # CUDA functionality
-@has_cuda include("CuFourierFlows.jl")
+if CUDA.has_cuda()
+  include("CuFourierFlows.jl")
+end
 
 function __init__()
   threads = Threads.nthreads()
@@ -132,7 +123,7 @@ function __init__()
     FFTW.set_num_threads(threads)
   end
 
-  @has_cuda begin
+  if CUDA.has_cuda()
     @debug "CUDA-enabled GPU(s) detected:"
     for (gpu, dev) in enumerate(CUDA.devices())
       @debug "$dev: $(CUDA.name(dev))"

test/createffttestfunctions.jl

@@ -139,7 +139,7 @@ function create_testfuncs(g::ThreeDGrid{Tg,<:Array}) where Tg
 end
 
 
-@has_cuda begin
+if CUDA.has_cuda()
   function create_testfuncs(g::OneDGrid{Tg, <:CuArray}) where Tg
     cpugrid = OneDGrid(g.nx, g.Lx)
     out = create_testfuncs(cpugrid)

test/runtests.jl

@@ -3,7 +3,6 @@ using
   LinearAlgebra,
   Printf,
   JLD2,
-  CUDA,
   Test
 
 using
@@ -15,8 +14,7 @@ using FourierFlows: parsevalsum2
 using LinearAlgebra: mul!, ldiv!, norm
 
 # the devices on which tests will run
-devices = (CPU(),)
-@has_cuda devices = (CPU(), GPU())
+devices = CUDA.has_cuda() ? (CPU(), GPU()) : (CPU(),)
 
 const rtol_fft = 1e-12
 const rtol_output = 1e-12