From b40426ce6f0ee56035508960cd10bed048355589 Mon Sep 17 00:00:00 2001 From: Gabriel Fougeron Date: Fri, 10 May 2024 00:55:35 +0200 Subject: [PATCH] test deploy --- choreo/find_new.py | 3 ++- choreo_GUI/anim.js | 2 +- setup.py | 24 ++++++++++++------------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/choreo/find_new.py b/choreo/find_new.py index 44ee953..f39daf8 100644 --- a/choreo/find_new.py +++ b/choreo/find_new.py @@ -94,7 +94,7 @@ def Find_Choreo( NBS.fftw_nthreads = fftw_nthreads NBS.fft_backend = fft_backend - nint_fac_init = 128 + # nint_fac_init = 128 NBS.nint_fac = nint_fac_init @@ -906,6 +906,7 @@ def load_target_files(filename, Workspace_folder, target_speed): n_reconverge_it_max = params_dict["Solver_Discr"] ['n_reconverge_it_max'] nint_init = params_dict["Solver_Discr"]["nint_init"] + nint_fac_init = nint_init disp_scipy_opt = (params_dict['Solver_Optim'] ['optim_verbose_lvl'] == "full") # disp_scipy_opt = False diff --git a/choreo_GUI/anim.js b/choreo_GUI/anim.js index e3d1aaf..88d9d4a 100644 --- a/choreo_GUI/anim.js +++ b/choreo_GUI/anim.js @@ -937,7 +937,7 @@ function canvasApp() { trailLayerContext.beginPath() trailLayerContext.moveTo(Pixx, Pixy) - for (i_pos = 1 ; i_pos < segm_size ; i_pos++){ + for (i_pos = 1 ; i_pos < segm_store ; i_pos++){ // Super ugly xl = Pos.data[ io + 2*i_pos ] diff --git a/setup.py b/setup.py index 093ee50..e9cc330 100644 --- a/setup.py +++ b/setup.py @@ -70,13 +70,13 @@ if ("PYODIDE" in os.environ): # Building for Pyodide - extra_compile_args_std = ["-O0", *ignore_warnings_args] - extra_compile_args_safe = ["-O0", *ignore_warnings_args] - extra_link_args = [] +# extra_compile_args_std = ["-O0", *ignore_warnings_args] +# extra_compile_args_safe = ["-O0", *ignore_warnings_args] +# extra_link_args = [] - # extra_compile_args_std = ["-O3","-ffast-math","-flto", *ignore_warnings_args] - # extra_compile_args_safe = ["-O3","-flto", *ignore_warnings_args] - # extra_link_args = ["-flto", ] + extra_compile_args_std = ["-O3","-ffast-math","-flto", *ignore_warnings_args] + extra_compile_args_safe = ["-O3","-flto", *ignore_warnings_args] + extra_link_args = ["-flto", ] else: @@ -94,13 +94,13 @@ break - extra_compile_args_std = ["-O0","-march=native", "-fopenmp", "-lm", *ignore_warnings_args] - extra_compile_args_safe = ["-O0", "-fopenmp", "-lm", *ignore_warnings_args] - extra_link_args = ["-fopenmp", "-lm",] + # extra_compile_args_std = ["-O0","-march=native", "-fopenmp", "-lm", *ignore_warnings_args] + # extra_compile_args_safe = ["-O0", "-fopenmp", "-lm", *ignore_warnings_args] + # extra_link_args = ["-fopenmp", "-lm",] - # extra_compile_args_std = ["-Ofast", "-march=native", "-fopenmp", "-lm", "-flto", *ignore_warnings_args] - # extra_compile_args_safe = ["-O3", "-fopenmp", "-lm", "-flto", *ignore_warnings_args] - # extra_link_args = ["-fopenmp", "-lm", "-flto", *ignore_warnings_args] + extra_compile_args_std = ["-Ofast", "-march=native", "-fopenmp", "-lm", "-flto", *ignore_warnings_args] + extra_compile_args_safe = ["-O3", "-fopenmp", "-lm", "-flto", *ignore_warnings_args] + extra_link_args = ["-fopenmp", "-lm", "-flto", *ignore_warnings_args] cython_extnames.append("choreo.cython.funs_parallel") cython_safemath_needed.append(False)