Skip to content

No more scalar operations on CuArrays. #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ali-ramadhan merged 3 commits into from
Jun 4, 2019
Merged

No more scalar operations on CuArrays. #264

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4c8227
No more scalar ops on CuArrays.
ali-ramadhan Jun 3, 2019
ad88c50
Disable scalar operations on CuArrays
ali-ramadhan Jun 4, 2019
32fc894
Introducing the underlying_data function
ali-ramadhan Jun 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Oceananigans.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ device(::GPU) = GPUifyLoops.CUDA()
end
end

# @hascuda CuArrays.allowscalar(false)
@hascuda CuArrays.allowscalar(false)

abstract type Metadata end
abstract type ConstantsCollection end
Expand Down
6 changes: 3 additions & 3 deletions src/models.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ add_bcs!(model::Model; kwargs...) = add_bcs(model.boundary_conditions; kwargs...
function initialize_with_defaults!(eos, tracers, sets...)

# Default tracer initial condition is deteremined by eos.
tracers.S.data .= eos.S₀
tracers.T.data .= eos.T₀
tracers.S.data.parent .= eos.S₀
tracers.T.data.parent .= eos.T₀

# Set all further fields to 0
for set in sets
for fldname in propertynames(set)
fld = getproperty(set, fldname)
fld.data .= 0 # promotes to eltype of fld.data
fld.data.parent .= 0 # promotes to eltype of fld.data
end
end

Expand Down