Fixed DLONG bug on Windows. Disabled __int64

xianglunkai · Apr 10, 2017 · eb58c58 · eb58c58
1 parent 9e47551
commit eb58c58
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 14 deletions.
diff --git a/include/glob_opts.h b/include/glob_opts.h
@@ -69,11 +69,7 @@ extern "C" {
 
 /* Use customized number representation -----------------------------------   */
 #ifdef DLONG
-#ifdef _WIN64
-typedef __int64 c_int;
-#else
 typedef long c_int;                   /* for indeces */
-#endif
 #else
 typedef int c_int;                   /* for indeces */
 #endif

diff --git a/interfaces/python/module/codegen/files_to_generate/setup.py b/interfaces/python/module/codegen/files_to_generate/setup.py
@@ -19,6 +19,7 @@
         define_macros += [('IS_MAC', None)]
 
 
+define_macros += [('DLONG', None)]
 define_macros += [('EMBEDDED', EMBEDDED_FLAG)]
 define_macros += [('PYTHON', None)]
 

diff --git a/interfaces/python/setup.py b/interfaces/python/setup.py
@@ -15,7 +15,7 @@
 PRINTING = True
 PROFILING = True
 DFLOAT = False
-DLONG = False
+DLONG = True
 CTRLC = True
 
 

diff --git a/lin_sys/direct/suitesparse/SuiteSparse_config.h b/lin_sys/direct/suitesparse/SuiteSparse_config.h
@@ -52,19 +52,10 @@ extern "C" {
 
 #ifndef SuiteSparse_long
 
-#ifdef _WIN64
-
-#define SuiteSparse_long __int64
-#define SuiteSparse_long_max _I64_MAX
-#define SuiteSparse_long_idd "I64d"
-
-#else
-
 #define SuiteSparse_long long
 #define SuiteSparse_long_max LONG_MAX
 #define SuiteSparse_long_idd "ld"
 
-#endif
 #define SuiteSparse_long_id "%" SuiteSparse_long_idd
 #endif
 

diff --git a/roadmap.md b/roadmap.md
@@ -2,6 +2,7 @@
 
 -   [x] Parameter Selection: `rho`, `sigma` and `alpha` from examples (data driven)
 -   [ ] Avoid square roots -> Use eps tests to the 2
+-   [ ] Add option in CODEGEN to have floats
 -   [x] Add functions to update matrices in Python and Matlab
 -   [x] Add functions to update matrices in codegen
 -   [x] Replace PySys_WriteStdout by PyErr_SetString(PyExc_ValueError, <message>)