Skip to content

Merge cudss #2

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

Closed
bstellato wants to merge 9 commits into from
Closed

Merge cudss #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1bd5665
Add cuDSS support
imciner2 Oct 26, 2025
ea2800d
Allow building Float64 CUDA
imciner2 Oct 26, 2025
5f61374
Export solver error type enum
imciner2 Oct 26, 2025
8de928a
Update bindings with settings and info fields
imciner2 Oct 26, 2025
b3aee47
Merge remote-tracking branch 'origin/im/cudss' into im/cudss-merged-f…
imciner2 Nov 22, 2025
ab88722
Fix bindings.cpp.in: comment out fields not in im/cudss-rebased
bstellato Nov 18, 2025
87ef563
Add cuda-direct and cuda-indirect test configurations
bstellato Nov 18, 2025
5bf2807
updated gitignore
bstellato Nov 18, 2025
943f652
updated C branch
bstellato Nov 19, 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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ src/osqp/bindings.cpp



codegen_vec_out/
codegen_mat_out/
CMakeFiles/
INSTALL.vcxproj
INSTALL.vcxproj.filters
Expand Down
6 changes: 1 addition & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,7 @@ FetchContent_Declare(
osqp
# GIT_REPOSITORY https://github.com/osqp/osqp.git
GIT_REPOSITORY https://github.com/lb3825/osqp.git
# SOURCE_DIR "C:/Users/baice/Documents/GitHub/osqp"
# SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../osqp"
# GIT_TAG v1.0.0
GIT_TAG b/develop-halpern-ci-fixes
# GIT_TAG plot
GIT_TAG b/cudss-polish-fix
)
list(POP_BACK CMAKE_MESSAGE_INDENT)
FetchContent_MakeAvailable(osqp)
Expand Down
1 change: 1 addition & 0 deletions backend/cuda/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ OSQP_ALGEBRA_BACKEND = "cuda"
OSQP_EXT_MODULE_NAME = "osqp_cuda"
CMAKE_CUDA_COMPILER = {env="CMAKE_CUDA_COMPILER"}
CUDA_TOOLKIT_ROOT_DIR = {env="CUDA_TOOLKIT_ROOT_DIR"}
OSQP_USE_FLOAT = {env="OSQP_USE_FLOAT"}

[tool.setuptools_scm]
root = "../.."
6 changes: 4 additions & 2 deletions src/bindings.cpp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,9 @@ PYBIND11_MODULE(@OSQP_EXT_MODULE_NAME@, m) {
.value("OSQP_ALGEBRA_LOAD_ERROR", OSQP_ALGEBRA_LOAD_ERROR)
.value("OSQP_CODEGEN_DEFINES_ERROR", OSQP_CODEGEN_DEFINES_ERROR)
.value("OSQP_DATA_NOT_INITIALIZED", OSQP_DATA_NOT_INITIALIZED)
.value("OSQP_FUNC_NOT_IMPLEMENTED", OSQP_FUNC_NOT_IMPLEMENTED);
.value("OSQP_FUNC_NOT_IMPLEMENTED", OSQP_FUNC_NOT_IMPLEMENTED)
.value("OSQP_RUNTIME_ERROR", OSQP_RUNTIME_ERROR)
.export_values();

// Preconditioner Type
py::enum_<osqp_precond_type>(m, "osqp_precond_type", py::module_local())
Expand Down Expand Up @@ -523,7 +525,7 @@ PYBIND11_MODULE(@OSQP_EXT_MODULE_NAME@, m) {
.def_readonly("status_polish", &OSQPInfo::status_polish)
// obj_val is readwrite because Python wrappers may overwrite this value based on status_val
.def_readwrite("obj_val", &OSQPInfo::obj_val)
.def_readwrite("dual_obj_val", &OSQPInfo::dual_obj_val)
//.def_readwrite("dual_obj_val", &OSQPInfo::dual_obj_val)
.def_readonly("prim_res", &OSQPInfo::prim_res)
.def_readonly("dual_res", &OSQPInfo::dual_res)
.def_readonly("duality_gap", &OSQPInfo::duality_gap)
Expand Down
6 changes: 5 additions & 1 deletion src/osqp/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ def pytest_generate_tests(metafunc):
values.append(
('mkl', 'indirect', 1e-3, 1e-4, 3),
)
if algebra_available('cuda') and 'cuda' in algebras:
if algebra_available('cuda') and 'cuda-direct' in algebras:
values.append(
('cuda', 'direct', 1e-2, 1e-3, 2),
)
if algebra_available('cuda') and 'cuda-indirect' in algebras:
values.append(
('cuda', 'indirect', 1e-2, 1e-3, 2),
)
Expand Down
Loading