slight changes to PYFFTW_AVAILABLE mechanics

Author: gabrielfougeron

choreo/cython/_NBodySyst.pyx

@@ -68,8 +68,8 @@ try:
 except:
     MKL_FFT_AVAILABLE = False
 
-from choreo.cython.optional_pyfftw cimport pyfftw, PYFFTW_AVAILABLE
-from choreo.cython.optional_pyfftw import p_pyfftw
+from choreo.cython.optional_pyfftw cimport pyfftw
+from choreo.cython.optional_pyfftw import p_pyfftw, PYFFTW_AVAILABLE
 
 cdef int USE_SCIPY_FFT = 0
 cdef int USE_MKL_FFT = 1

choreo/cython/optional_pyfftw_False.pyx

@@ -1,3 +1,4 @@
 cimport choreo.cython.pyfftw_fake as pyfftw
 import choreo.cython.pyfftw_fake as p_pyfftw   
-cdef bint PYFFTW_AVAILABLE = False
+PYFFTW_AVAILABLE = False
+

choreo/cython/optional_pyfftw_True.pyx

@@ -1,3 +1,3 @@
 cimport pyfftw
 import pyfftw as p_pyfftw   
-cdef bint PYFFTW_AVAILABLE = True
+PYFFTW_AVAILABLE = False

choreo/find_new.py

@@ -16,6 +16,11 @@
 import choreo.scipy_plus
 from choreo.cython._ActionSym import ActionSym
 
+import warnings 
+from choreo.cython.optional_pyfftw import PYFFTW_AVAILABLE
+if PYFFTW_AVAILABLE:
+    import pyfftw
+
 def Find_Choreo(
     *,
     geodim,
@@ -925,15 +930,15 @@ def Check_Duplicates(NBS, segmpos, params, hash_dict, action_dict, store_folder,
 
     return False, None
 
-try:
-    import pyfftw
+def wisdom_filename_divide(filename):
+    root, ext = os.path.splitext(filename) 
+    return [root+"_"+prec+ext for prec in ['d','f','l']]
 
-    def wisdom_filename_divide(filename):
-        root, ext = os.path.splitext(filename) 
-        return [root+"_"+prec+ext for prec in ['d','f','l']]
-
-    def Load_wisdom_file(DP_Wisdom_file):
-        
+def Load_wisdom_file(DP_Wisdom_file):
+    
+    if not(PYFFTW_AVAILABLE):
+        warnings.warn("The package pyfftw could not be loaded. Please check your local install.")
+    else:
         wis_list = []
 
         for i, filename in enumerate(wisdom_filename_divide(DP_Wisdom_file)):
@@ -946,14 +951,14 @@ def Load_wisdom_file(DP_Wisdom_file):
 
             wis_list.append(wis)
 
-        pyfftw.import_wisdom(wis_list)
-        
-    def Write_wisdom_file(DP_Wisdom_file):    
+            pyfftw.import_wisdom(wis_list)
+    
+def Write_wisdom_file(DP_Wisdom_file):    
+    if not(PYFFTW_AVAILABLE):
+        warnings.warn("The package pyfftw could not be loaded. Please check your local install.")
+    else:
         wis = pyfftw.export_wisdom()
 
         for i, filename in enumerate(wisdom_filename_divide(DP_Wisdom_file)):
             with open(filename, 'wb') as f:
                 f.write(wis[i])
-
-except:
-    pass

setup.py

@@ -101,13 +101,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)
@@ -130,13 +130,11 @@
     pyfftw_pxd_str = """
 cimport pyfftw
 import pyfftw as p_pyfftw   
-cdef bint PYFFTW_AVAILABLE
     """
 else:
     pyfftw_pxd_str = """
 cimport choreo.cython.pyfftw_fake as pyfftw
 import choreo.cython.pyfftw_fake as p_pyfftw   
-cdef bint PYFFTW_AVAILABLE
     """
 with open("choreo/cython/optional_pyfftw.pxd", "w") as text_file:
     text_file.write(pyfftw_pxd_str)
@@ -156,17 +154,17 @@
 }
 
 #### Profiler only ####
-# profile_compiler_directives = {
-#     'profile': True,
-#     'linetrace': True,
-#     'binding': True,
-# }
-# compiler_directives.update(profile_compiler_directives)
-# profile_define_macros = [
-#     ('CYTHON_TRACE', '1')   ,
-#     ('CYTHON_TRACE_NOGIL', '1')   ,
-# ]
-# define_macros.extend(profile_define_macros)
+profile_compiler_directives = {
+    'profile': True,
+    'linetrace': True,
+    'binding': True,
+}
+compiler_directives.update(profile_compiler_directives)
+profile_define_macros = [
+    ('CYTHON_TRACE', '1')   ,
+    ('CYTHON_TRACE_NOGIL', '1')   ,
+]
+define_macros.extend(profile_define_macros)
 
 include_dirs = [
     numpy.get_include()                 ,