Skip to content
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

fix create_pipeline crash in vulkan-enabled layer without calling load_param/load_model first #5410

Merged
merged 6 commits into from
Apr 8, 2024
Merged

fix create_pipeline crash in vulkan-enabled layer without calling load_param/load_model first #5410

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
056f592
fix create_pipeline crash in vulkan-enabled layer without calling loa…
nihui Apr 7, 2024
e5e7f10
guard destroy_pipeline
nihui Apr 7, 2024
095563c
Merge branch 'master' into fix-create-layer-vulkan-crash
nihui Apr 7, 2024
d61ea93
wip
nihui Apr 8, 2024
394fc96
Merge branch 'fix-create-layer-vulkan-crash' of github.com:nihui/ncnn…
nihui Apr 8, 2024
7c09a1b
wip
nihui Apr 8, 2024
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
13 changes: 10 additions & 3 deletions src/layer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,9 +362,16 @@ class Layer_final : public Layer
#if NCNN_VULKAN
if (layer_vulkan)
{
int ret = layer_vulkan->create_pipeline(opt);
get_layer_properties();
return ret;
if (vkdev)
{
int ret = layer_vulkan->create_pipeline(opt);
get_layer_properties();
return ret;
}

// fallback to cpu layer
delete layer_vulkan;
layer_vulkan = 0;
}
#endif // NCNN_VULKAN

Expand Down
Loading