Skip to content

Commit

Permalink
Minor changes to support Julia 1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
pxl-th committed Jul 2, 2024
1 parent 3da141f commit b6897d3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
3 changes: 1 addition & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ authors = ["Anton Smirnov <[email protected]>"]
version = "0.1.4"

[deps]
AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e"
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
BSON = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
GPUCompiler = "61eb1bfa-7361-4325-ad38-22787b887f55"
ImageCore = "a09fc81d-aa75-5fe9-8630-4744c3626534"
ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
ImageTransformations = "02fcd773-0e25-5acc-982a-7f6622650795"
Expand All @@ -28,7 +28,6 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"

[compat]
AMDGPU = "0.8"
Adapt = "4"
BSON = "0.3"
BenchmarkTools = "1.3.2"
Expand Down
2 changes: 0 additions & 2 deletions benchmark/pipeline.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@ const Backend = Nerf.Backend

function trainer_benchmark(trainer::Nerf.Trainer, n::Int)
for i in 1:n
Core.println(i)
Nerf.step!(trainer)
end
end

function render_benchmark(renderer::Nerf.Renderer, trainer::Nerf.Trainer, n::Int)
for i in 1:n
Core.println(i)
Nerf.render!(trainer.model, renderer, trainer.occupancy, trainer.bbox)
end
end
Expand Down
7 changes: 5 additions & 2 deletions src/Nerf.jl
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,14 @@ end
using PrecompileTools

@setup_workload let
# TODO: KA.functional(Backend)
config_file = joinpath(pkgdir(Nerf), "data", "raccoon_sofa2", "transforms.json")
dataset = Dataset(Backend; config_file)
model = BasicModel(BasicField(Backend))
trainer = Trainer(model, dataset; n_rays=4)

trainer = Trainer(model, dataset; n_rays=128)
for _ in 1:20 # 20 step, since different steps run different kernels, to cover them all
step!(trainer)
end

camera = Camera(MMatrix{3, 4, Float32}(I), dataset.intrinsics)
renderer = Renderer(Backend, camera, trainer.bbox, trainer.cone)
Expand Down
2 changes: 1 addition & 1 deletion src/kautils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function is_valid_backend(name::String)
""")
end

backend_name() = is_valid_backend(@load_preference("backend", "AMDGPU"))
backend_name() = is_valid_backend(@load_preference("backend", "CUDA"))

function set_backend!(name::String)::Bool
backend_name() == name && return false
Expand Down

0 comments on commit b6897d3

Please sign in to comment.