From 3329c27fdf0737408369cf65fd7147505050f3dd Mon Sep 17 00:00:00 2001 From: govindchari Date: Wed, 5 Feb 2025 12:16:27 -0800 Subject: [PATCH] Enable printing by default --- qocogen/codegen.py | 12 ++++++------ tests/utils/run_generated_solver.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qocogen/codegen.py b/qocogen/codegen.py index dac5777..63da3ca 100644 --- a/qocogen/codegen.py +++ b/qocogen/codegen.py @@ -118,8 +118,8 @@ def generate_cmakelists(solver_dir): f = open(solver_dir + "/CMakeLists.txt", "a") f.write("cmake_minimum_required(VERSION 3.18)\n") f.write("project(qoco_custom)\n\n") - f.write("if(ENABLE_PRINTING)\n") - f.write(" add_compile_definitions(ENABLE_PRINTING)\n") + f.write("if(DISABLE_PRINTING)\n") + f.write(" add_compile_definitions(DISABLE_PRINTING)\n") f.write("endif()\n\n") f.write("if(QOCO_CUSTOM_BUILD_TYPE STREQUAL Debug)\n") f.write(" set(QOCO_CUSTOM_BUILD_TYPE Debug)\n") @@ -1083,7 +1083,7 @@ def generate_utils( f.write("unsigned char check_stopping(Workspace* work);\n") f.write("void copy_solution(Workspace* work);\n") f.write("void unscale_solution(Workspace* work);\n") - f.write("#ifdef ENABLE_PRINTING\n") + f.write("#ifndef DISABLE_PRINTING\n") f.write("#include \n") f.write("void print_header(Workspace* work);\n") f.write("void print_footer(Workspace* work);\n") @@ -1585,7 +1585,7 @@ def generate_utils( Gnnz = len(G.data) if G is not None else 0 f.write("void print_header(Workspace* work) {\n") - f.write("#ifdef ENABLE_PRINTING\n") + f.write("#ifndef DISABLE_PRINTING\n") f.write(' printf("\\n");\n') f.write( ' printf("+-------------------------------------------------------+\\n");\n' @@ -1665,7 +1665,7 @@ def generate_utils( f.write("}\n\n") f.write("void print_footer(Workspace* work) {\n") - f.write("#ifdef ENABLE_PRINTING\n") + f.write("#ifndef DISABLE_PRINTING\n") f.write( ' printf("\\nstatus: %s ", QOCO_CUSTOM_SOLVE_STATUS_MESSAGE[work->sol.status]);\n' ) @@ -1675,7 +1675,7 @@ def generate_utils( f.write("}\n\n") f.write("void log_iter(Workspace* work) {\n") - f.write("#ifdef ENABLE_PRINTING\n") + f.write("#ifndef DISABLE_PRINTING\n") f.write( 'printf("| %2d | %+.2e | %+.3e | %+.3e | %+.3e | %+.2e | %.3f |\\n",work->sol.iters, work->sol.obj, work->sol.pres, work->sol.dres, work->sol.gap, work->mu, work->a);' ) diff --git a/tests/utils/run_generated_solver.py b/tests/utils/run_generated_solver.py index 4033e34..b4eb2c9 100644 --- a/tests/utils/run_generated_solver.py +++ b/tests/utils/run_generated_solver.py @@ -6,7 +6,7 @@ def run_generated_solver(solver_dir): os.system( "cd " + solver_dir - + " && mkdir build && cd build && cmake -DQOCO_CUSTOM_BUILD_TYPE:STR=Release -DENABLE_PRINTING:BOOL=TRUE .. && make && ./runtest && cd ../.." + + " && mkdir build && cd build && cmake -DQOCO_CUSTOM_BUILD_TYPE:STR=Release .. && make && ./runtest && cd ../.." ) with open(solver_dir + "/build/result.bin", "rb") as file: # Read the unsigned int (4 bytes)