Skip to content

Fix pybind #75

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
merged 2 commits into from
Feb 8, 2025
Merged

Fix pybind #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
041d2fd
Fix pybind
junjihashimoto Feb 7, 2025
89f9097
Fix haskell binding
junjihashimoto Feb 7, 2025
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 bindings/haskell/gpu-cpp.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ library
hs-source-dirs: src
default-language: Haskell2010
ghc-options: -optcxx-std=c++17
extra-libraries: dawn
extra-libraries: webgpu_dawn

executable gpu-cpp
import: warnings
Expand Down
5 changes: 2 additions & 3 deletions bindings/python/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ else
STDLIB := -stdlib=libc++
endif

FLAGS=-shared -fPIC -std=c++17 $(STDLIB) -I$(GPUCPP) -I$(GPUCPP)/third_party/headers -L$(GPUCPP)/third_party/lib -ldawn \
FLAGS=-shared -fPIC -std=c++17 $(STDLIB) -I$(GPUCPP) -I$(GPUCPP)/third_party/headers -L$(GPUCPP)/third_party/lib -lwebgpu_dawn \
`python3 -m pybind11 --includes` \
`python3-config --include --ldflags --embed`
`python3-config --includes --ldflags`

SUFFIX=$(shell $(PYTHON)-config --extension-suffix)

gpu_cpp$(SUFFIX): gpu_cpp.cpp
$(CXX) $(FLAGS) -o $@ $<
install_name_tool -change @rpath/libdawn.dylib $(LIBDIR)/libdawn.dylib gpu_cpp$(SUFFIX)

test: test_gpu_cpp.py gpu_cpp$(SUFFIX)
$(PYTHON) test_gpu_cpp.py
Expand Down
12 changes: 6 additions & 6 deletions bindings/python/gpu_cpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ KernelCode* py_createKernelCode(const std::string &pData, size_t workgroupSize,
return new KernelCode(pData, workgroupSize, (NumType)precision);
}

Kernel* py_createKernel(Context *ctx, const KernelCode *code,
Kernel py_createKernel(Context *ctx, const KernelCode *code,
// const Tensor *dataBindings, size_t numTensors,
const py::list& dataBindings_py,
// const size_t *viewOffsets,
Expand All @@ -54,7 +54,7 @@ Kernel* py_createKernel(Context *ctx, const KernelCode *code,
for (auto item : viewOffsets_py) {
viewOffsets.push_back(item.cast<size_t>());
}
return new Kernel(createKernel(*ctx, *code, bindings.data(), bindings.size(), viewOffsets.data(), vector_to_shape(totalWorkgroups)));
return createKernel(*ctx, *code, bindings.data(), bindings.size(), viewOffsets.data(), vector_to_shape(totalWorkgroups));
}

Tensor* py_createTensor(Context *ctx, const std::vector<int> &dims, int dtype) {
Expand Down Expand Up @@ -82,9 +82,9 @@ struct GpuAsync {
}
};

GpuAsync* py_dispatchKernel(Context *ctx, Kernel *kernel) {
GpuAsync* py_dispatchKernel(Context *ctx, Kernel kernel) {
auto async = new GpuAsync();
dispatchKernel(*ctx, *kernel, async->promise);
dispatchKernel(*ctx, kernel, async->promise);
return async;
}

Expand All @@ -96,12 +96,12 @@ PYBIND11_MODULE(gpu_cpp, m) {
m.doc() = "gpu.cpp plugin";
py::class_<Context>(m, "Context");
py::class_<Tensor>(m, "Tensor");
py::class_<Kernel>(m, "Kernel");
py::class_<RawKernel, std::shared_ptr<RawKernel>>(m, "Kernel");
py::class_<KernelCode>(m, "KernelCode");
py::class_<GpuAsync>(m, "GpuAsync");
m.def("create_context", &py_createContext, py::return_value_policy::take_ownership);
m.def("create_tensor", &py_createTensor, py::return_value_policy::take_ownership);
m.def("create_kernel", &py_createKernel, py::return_value_policy::take_ownership);
m.def("create_kernel", &py_createKernel);
m.def("create_kernel_code", &py_createKernelCode, py::return_value_policy::take_ownership);
m.def("dispatch_kernel", &py_dispatchKernel, py::return_value_policy::take_ownership);
m.def("wait", &py_wait, "Wait for GPU");
Expand Down