fixup! Move Sch.ThunkOptions into Options

Author: jpsamaroo

src/options.jl

@@ -14,7 +14,6 @@ Stores per-task options to be passed to the scheduler.
 - `proclist=nothing`: (Deprecated) Force task to use one or more processors that are instances/subtypes of a contained type. Alternatively, a function can be supplied, and the function will be called with a processor as the sole argument and should return a `Bool` result to indicate whether or not to use the given processor. `nothing` enables all default processors.
 - `get_result::Bool=false`: Whether the worker should store the result directly (`true`) or as a `Chunk` (`false`)
 - `meta::Bool=false`: When `true`, values are not `move`d, and are passed directly as `Chunk`, if they are not immediate values
-- `cache::Bool=false`: When `true`, caches the task's result in it's associated `Thunk` as `.cache_ref`
 - `syncdeps::Set{Any}`: Contains any additional tasks to synchronize with
 - `time_util::Dict{Type,Any}`: Indicates the maximum expected time utilization for this task. Each keypair maps a processor type to the utilization, where the value can be a real (approximately the number of nanoseconds taken), or `MaxUtilization()` (utilizes all processors of this type). By default, the scheduler assumes that this task only uses one processor.
 - `alloc_util::Dict{Type,UInt64}`: Indicates the maximum expected memory utilization for this task. Each keypair maps a processor type to the utilization, where the value is an integer representing approximately the maximum number of bytes allocated at any one time.
@@ -37,7 +36,6 @@ Base.@kwdef mutable struct Options
 
     get_result::Union{Bool,Nothing} = nothing
     meta::Union{Bool,Nothing} = nothing
-    cache::Union{Bool,Nothing} = nothing
 
     syncdeps::Union{Set{Any},Nothing} = nothing
 
@@ -112,7 +110,6 @@ function populate_defaults!(opts::Options, sig)
     maybe_default!(opts, Val{:proclist}(), sig)
     maybe_default!(opts, Val{:get_result}(), sig)
     maybe_default!(opts, Val{:meta}(), sig)
-    maybe_default!(opts, Val{:cache}(), sig)
     maybe_default!(opts, Val{:syncdeps}(), sig)
     maybe_default!(opts, Val{:time_util}(), sig)
     maybe_default!(opts, Val{:alloc_util}(), sig)

src/sch/Sch.jl

@@ -1517,7 +1517,7 @@ function do_task(to_proc, task::TaskSpec)
         else
             # TODO: Cache this Chunk locally in CHUNK_CACHE right now
             tochunk(result, to_proc;
-                    device, cache=something(options.cache, false),
+                    device,
                     tag=options.storage_root_tag,
                     leaf_tag=something(options.storage_leaf_tag, MemPool.Tag()),
                     retain=something(options.storage_retain, false))

src/thunk.jl

@@ -47,18 +47,6 @@ julia> collect(t)  # computes the result and returns it to the current process
 for each property are described in the next section.
 - `option=value`: The same as passing `kwargs` to `delayed`.
 
-## Public Properties
-- `meta::Bool=false`: If `true`, instead of fetching cached arguments from
-`Chunk`s and passing the raw arguments to the called function, instead pass the
-`Chunk`. Useful for doing manual fetching or manipulation of `Chunk`
-references. Non-`Chunk` arguments are still passed as-is. -
-`processor::Processor=OSProc()` - The processor associated with the called
-function. Useful if the called function is a callable struct that exists on a
-given processor and should be transferred appropriately. -
-`scope::Dagger.AbstractScope=DefaultScope()` - The scope associated with the
-called function. Useful if the called function is a callable struct that may
-only be transferred to, and executed within, the specified scope.
-
 ## Options
 - `options`: An `Options` struct providing the options for the `Thunk`.
 If omitted, options can also be specified by passing key-value pairs as
@@ -147,6 +135,9 @@ function Thunk(f, xs...;
     if kwargs !== nothing
         options_merge!(options, (;kwargs...))
     end
+    if haskey(kwargs, :cache)
+        @warn "The cache argument is deprecated, as it is now always true" maxlog=1
+    end
     spec.cache_ref = cache_ref
     spec.affinity = affinity
     return Thunk(spec)
@@ -166,7 +157,7 @@ function affinity(t::Thunk)
         return t.affinity
     end
 
-    if t.cache && t.cache_ref !== nothing
+    if t.cache_ref !== nothing
         aff_vec = affinity(t.cache_ref)
     else
         aff = Dict{OSProc,Int}()

src/utils/chunks.jl

@@ -152,7 +152,7 @@ new `Chunk`.
 
 All other kwargs are passed directly to `MemPool.poolset`.
 """
-function tochunk(x::X, proc::P=OSProc(), scope::S=AnyScope(); cache=false, device=nothing, rewrap=false, kwargs...) where {X,P,S}
+function tochunk(x::X, proc::P=OSProc(), scope::S=AnyScope(); device=nothing, rewrap=false, kwargs...) where {X,P,S}
     if device === nothing
         device = if Sch.walk_storage_safe(x)
             MemPool.GLOBAL_DEVICE[]