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.

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

Prototype fixes for pardiso #487

Merged
merged 1 commit into from
Jan 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lin_sys/direct/pardiso/pardiso_interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void pardiso(void**, // pt
c_int* // error
);
c_int mkl_set_interface_layer(c_int);
c_int mkl_get_max_threads();
c_int mkl_get_max_threads(void);

// Free LDL Factorization structure
void free_linsys_solver_pardiso(pardiso_solver *s) {
Expand Down
6 changes: 3 additions & 3 deletions lin_sys/direct/pardiso/pardiso_loader.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ typedef void (*pardiso_t)(void**, const c_int*, const c_int*, const c_int*,
const c_int*, c_int*, const c_int*, c_float*,
c_float*, c_int*);
typedef int (*mkl_set_ifl_t)(int);
typedef int (*mkl_get_mt_t)();
typedef int (*mkl_get_mt_t)(void);


// Handlers are static variables
Expand Down Expand Up @@ -55,7 +55,7 @@ c_int mkl_set_interface_layer(c_int code) {
return (c_int)func_mkl_set_interface_layer((int)code);
}

c_int mkl_get_max_threads() {
c_int mkl_get_max_threads(void) {
return (c_int)func_mkl_get_max_threads();
}

Expand Down Expand Up @@ -87,7 +87,7 @@ c_int lh_load_pardiso(const char* libname) {
return 0;
}

c_int lh_unload_pardiso() {
c_int lh_unload_pardiso(void) {

if (Pardiso_handle == OSQP_NULL) return 0;

Expand Down
2 changes: 1 addition & 1 deletion lin_sys/direct/pardiso/pardiso_loader.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ c_int lh_load_pardiso(const char* libname);
* Unloads the loaded Pardiso shared library.
* @return Zero on success, nonzero on failure.
*/
c_int lh_unload_pardiso();
c_int lh_unload_pardiso(void);


#ifdef __cplusplus
Expand Down