test deploy

gabrielfougeron · May 9, 2024 · b40426c · b40426c
1 parent 716394f
commit b40426c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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)