From 4e55ad8332b4496ef41d374b98a0b01e21baad61 Mon Sep 17 00:00:00 2001 From: souvikdas95 Date: Fri, 25 Aug 2017 16:18:57 +0530 Subject: [PATCH 01/14] Update .gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index a552a21a..ff0cc1a2 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,12 @@ __.SYMDEF ecostester +ecos_bb_test runecos +runecosexp python/build python/dist python/*.pyc + +# VS temp files +*.vs From 54229c10f5ac9bf09bb9e7e750855f4fb6c831bc Mon Sep 17 00:00:00 2001 From: Souvik Das Date: Fri, 25 Aug 2017 12:40:01 +0530 Subject: [PATCH 02/14] Allow DEBUG, PRINTLEVEL and PROFILING to be set via Compile Time Preprocessor --- include/glblopts.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/glblopts.h b/include/glblopts.h index 824570a3..26f4511f 100644 --- a/include/glblopts.h +++ b/include/glblopts.h @@ -27,10 +27,12 @@ typedef double pfloat; /* for numerical values */ /* SET PRINT LEVEL ----------------------------------------------------- */ +#ifndef PRINTLEVEL #define PRINTLEVEL (2) /* 0: no prints */ /* 1: only final info */ /* 2: progress print per iteration */ /* 3: debug level, enables print & dump fcns. */ +#endif #define MATLAB_FLUSH_PRINTS /* print each iteration directly to Matlab. */ @@ -39,14 +41,18 @@ typedef double pfloat; /* for numerical values */ /* problems. */ /* SET PROFILING LEVEL ------------------------------------------------- */ +#ifndef PROFILING #define PROFILING (1) /* 0: no timing information */ /* 1: runtime (divided in setup and solve) */ /* 2: detailed profiling */ +#endif /* SET DEBUG LEVEL ----------------------------------------------------- */ +#ifndef DEBUG #define DEBUG (0) /* 0: no debugging information */ /* 1: debug info & dump intermediate results */ /* (flag used only for development) */ +#endif /* NAN ----------------------------------------------------------------- */ #ifndef NAN From d36ebfb5387919aa97f9757ac706b4d4f48dc874 Mon Sep 17 00:00:00 2001 From: Souvik Das Date: Fri, 25 Aug 2017 12:44:13 +0530 Subject: [PATCH 03/14] Fix DEBUG & PRINTLEVEL usage & functions --- include/glblopts.h | 6 +++++- include/splamm.h | 3 +++ src/splamm.c | 27 ++++++++++++++++++++------- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/include/glblopts.h b/include/glblopts.h index 26f4511f..87fa732c 100644 --- a/include/glblopts.h +++ b/include/glblopts.h @@ -68,6 +68,11 @@ typedef double pfloat; /* for numerical values */ #define EXPCONE /*When defined the exponential cone solver code is enabled*/ /* SYSTEM INCLUDES FOR PRINTING ---------------------------------------- */ +#if DEBUG || PRINTLEVEL > 0 +#include +#endif + +/* PRINTTEXT ----------------------------------------------------------- */ #if PRINTLEVEL > 0 #ifdef MATLAB_MEX_FILE #include "mex.h" @@ -78,7 +83,6 @@ typedef double pfloat; /* for numerical values */ #else #define PRINTTEXT printf #endif -#include #else #define PRINTTEXT(...) #endif diff --git a/include/splamm.h b/include/splamm.h index b3be9c3a..2e287dab 100644 --- a/include/splamm.h +++ b/include/splamm.h @@ -100,6 +100,9 @@ void printDenseMatrix_i(idxint *M, idxint dim1, idxint dim2, char *name); */ void printSparseMatrix(spmat* M); +#endif + +#if DEBUG /** * Dumps a sparse matrix in Matlab format. diff --git a/src/splamm.c b/src/splamm.c index 5523e46e..feb71b78 100644 --- a/src/splamm.c +++ b/src/splamm.c @@ -26,8 +26,8 @@ #include "splamm.h" /* SYSTEM INCLUDES FOR MEMORY ALLOCATION ------------------------------- */ -#if PRINTLEVEL > 2 -#include +#if DEBUG || PRINTLEVEL > 0 +#include #endif @@ -274,8 +274,9 @@ void printSparseMatrix(spmat* M) } } } +#endif - +#if DEBUG /* dump a sparse matrix in Matlab format */ /* use LOAD and SPCONVERT to read in the file in MATLAB */ void dumpSparseMatrix(spmat* M, char* fn) @@ -297,9 +298,13 @@ void dumpSparseMatrix(spmat* M, char* fn) } fprintf(f,"%d\t%d\t%20.18e\n", (int)M->m, (int)M->n, 0.0); fclose(f); +#if PRINTLEVEL > 0 PRINTTEXT("File %s successfully written.\n", fn); +#endif } else { +#if PRINTLEVEL > 0 PRINTTEXT("Error during writing file %s.\n", fn); +#endif } } @@ -332,9 +337,13 @@ void dumpDenseMatrix(pfloat *M, int dim1, int dim2, char *fn) } } fclose(f); - printf("Written %d x %d matrix to '%s'.\n",i,dim2,fn); +#if PRINTLEVEL > 0 + PRINTTEXT("Written %d x %d matrix to '%s'.\n",i,dim2,fn); +#endif } else { - printf("ERROR: file %s could not be opened. Exiting.",fn); +#if PRINTLEVEL > 0 + PRINTTEXT("ERROR: file %s could not be opened. Exiting.",fn); +#endif exit(1); } } @@ -368,9 +377,13 @@ void dumpDenseMatrix_i(idxint *M, int dim1, int dim2, char *fn) } } fclose(f); - printf("Written %d x %d matrix to '%s'.\n",i,dim2,fn); +#if PRINTLEVEL > 0 + PRINTTEXT("Written %d x %d matrix to '%s'.\n",i,dim2,fn); +#endif } else { - printf("ERROR: file %s could not be opened. Exiting.",fn); +#if PRINTLEVEL > 0 + PRINTTEXT("ERROR: file %s could not be opened. Exiting.",fn); +#endif exit(1); } } From 76503cf22a3dbea1015f38f78a04d9e0baee8651 Mon Sep 17 00:00:00 2001 From: Souvik Das Date: Fri, 25 Aug 2017 12:44:58 +0530 Subject: [PATCH 04/14] Include "math.h" to get definitions for NaN and Infinity. --- include/glblopts.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/glblopts.h b/include/glblopts.h index 87fa732c..0adb8400 100644 --- a/include/glblopts.h +++ b/include/glblopts.h @@ -54,6 +54,9 @@ typedef double pfloat; /* for numerical values */ /* (flag used only for development) */ #endif +/* SYSTEM INCLUDES FOR NAN & INFINITY ---------------------------------- */ +#include + /* NAN ----------------------------------------------------------------- */ #ifndef NAN #define NAN ((double)0x7ff8000000000000) From 54e959b3af9014f4d1631befa870f41918fd905f Mon Sep 17 00:00:00 2001 From: Souvik Das Date: Fri, 25 Aug 2017 12:46:03 +0530 Subject: [PATCH 05/14] Rename "createSparseMatrix" to "EcosCreateSparseMatrix" to prevent possible conflicts with other libraries. --- include/splamm.h | 2 +- src/preproc.c | 10 +++++----- src/splamm.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/splamm.h b/include/splamm.h index 2e287dab..813bc23d 100644 --- a/include/splamm.h +++ b/include/splamm.h @@ -33,7 +33,7 @@ /** * Create a sparse matrix from existing arrays. */ -spmat* createSparseMatrix(idxint m, idxint n, idxint nnz, idxint* jc, idxint* ir, pfloat* pr); +spmat* EcosCreateSparseMatrix(idxint m, idxint n, idxint nnz, idxint* jc, idxint* ir, pfloat* pr); /** diff --git a/src/preproc.c b/src/preproc.c index ddb2ec96..9bf74aec 100644 --- a/src/preproc.c +++ b/src/preproc.c @@ -432,7 +432,7 @@ void createKKT_U(spmat* Gt, spmat* At, cone* C, idxint** S, spmat** K, /* return Sign vector and KKT matrix */ *S = Sign; - *K = createSparseMatrix(nK, nK, nnzK, Kjc, Kir, Kpr); + *K = EcosCreateSparseMatrix(nK, nK, nnzK, Kjc, Kir, Kpr); } /** @@ -791,15 +791,15 @@ pwork* ECOS_setup(idxint n, idxint m, idxint p, idxint l, idxint ncones, idxint* /* Store problem data */ if(Apr && Ajc && Air) { - mywork->A = createSparseMatrix(p, n, Ajc[n], Ajc, Air, Apr); + mywork->A = EcosCreateSparseMatrix(p, n, Ajc[n], Ajc, Air, Apr); } else { mywork->A = NULL; } if (Gpr && Gjc && Gir) { - mywork->G = createSparseMatrix(m, n, Gjc[n], Gjc, Gir, Gpr); + mywork->G = EcosCreateSparseMatrix(m, n, Gjc[n], Gjc, Gir, Gpr); } else { /* create an empty sparse matrix */ - mywork->G = createSparseMatrix(m, n, 0, Gjc, Gir, Gpr); + mywork->G = EcosCreateSparseMatrix(m, n, 0, Gjc, Gir, Gpr); } #if defined EQUILIBRATE && EQUILIBRATE > 0 @@ -992,7 +992,7 @@ pwork* ECOS_setup(idxint n, idxint m, idxint p, idxint l, idxint ncones, idxint* #endif Lir = (idxint *)MALLOC(lnz*sizeof(idxint)); Lpr = (pfloat *)MALLOC(lnz*sizeof(pfloat)); - mywork->KKT->L = createSparseMatrix(nK, nK, lnz, Ljc, Lir, Lpr); + mywork->KKT->L = EcosCreateSparseMatrix(nK, nK, lnz, Ljc, Lir, Lpr); #if PRINTLEVEL > 2 PRINTTEXT("Created Cholesky factor of K in KKT struct\n"); #endif diff --git a/src/splamm.c b/src/splamm.c index feb71b78..1839ad58 100644 --- a/src/splamm.c +++ b/src/splamm.c @@ -103,14 +103,14 @@ spmat* newSparseMatrix(idxint m, idxint n, idxint nnz) idxint* ir = (idxint *)MALLOC(nnz*sizeof(idxint)); pfloat* pr = (pfloat *)MALLOC(nnz*sizeof(pfloat)); jc[n] = nnz; - return createSparseMatrix(m, n, nnz, jc, ir, pr); + return EcosCreateSparseMatrix(m, n, nnz, jc, ir, pr); } /** * Create a sparse matrix from existing arrays (no MALLOC) */ -spmat* createSparseMatrix(idxint m, idxint n, idxint nnz, idxint* jc, idxint* ir, pfloat* pr) +spmat* EcosCreateSparseMatrix(idxint m, idxint n, idxint nnz, idxint* jc, idxint* ir, pfloat* pr) { spmat* M = (spmat *)MALLOC(sizeof(spmat)); M->m = m; From 0b6154df1aa1ade0eae2656023b27bd35b2dcd04 Mon Sep 17 00:00:00 2001 From: Souvik Das Date: Fri, 25 Aug 2017 12:46:46 +0530 Subject: [PATCH 06/14] Remove unused header "stdio.h" from cone.c --- src/cone.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cone.c b/src/cone.c index 0938da70..66675b47 100644 --- a/src/cone.c +++ b/src/cone.c @@ -24,7 +24,6 @@ #include "ecos.h" #include "expcone.h" -#include #include #include From 84cf1c1b03df01b27f9d02b7a40b9f479d4e8cf9 Mon Sep 17 00:00:00 2001 From: Souvik Das Date: Fri, 25 Aug 2017 12:47:20 +0530 Subject: [PATCH 07/14] Remove unused variable "old_output_format" ("_set_output_format" is deprecated) --- src/ecos.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/ecos.c b/src/ecos.c index 6404e23d..30f9d5c3 100644 --- a/src/ecos.c +++ b/src/ecos.c @@ -28,10 +28,11 @@ /* NEEDED FOR SQRT ----------------------------------------------------- */ #include -#if (defined _WIN32 || defined _WIN64 ) -/* include stdio.h for _set_output_format */ -#include -#endif +// DEPRICATED - _set_output_format +// #if (defined _WIN32 || defined _WIN64 ) +// /* include stdio.h for _set_output_format */ +// #include +// #endif @@ -1088,10 +1089,11 @@ idxint ECOS_solve(pwork* w) char fn[20]; #endif -#if (defined _WIN32 || defined _WIN64 ) - /* sets width of exponent for floating point numbers to 2 instead of 3 */ - unsigned int old_output_format = _set_output_format(_TWO_DIGIT_EXPONENT); -#endif +// DEPRICATED - _set_output_format +// #if (defined _WIN32 || defined _WIN64 ) +// /* sets width of exponent for floating point numbers to 2 instead of 3 */ +// unsigned int old_output_format = _set_output_format(_TWO_DIGIT_EXPONENT); +// #endif #if PROFILING > 0 timer tsolve; From 8a1cd211bb17aadbfaec7b03951071ea1faded76 Mon Sep 17 00:00:00 2001 From: Souvik Das Date: Fri, 25 Aug 2017 12:49:01 +0530 Subject: [PATCH 08/14] AMD: Transfer "NDEBUG" control to Compile Time Preprocessor --- external/amd/include/amd_internal.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/external/amd/include/amd_internal.h b/external/amd/include/amd_internal.h index c5f54930..142803ed 100644 --- a/external/amd/include/amd_internal.h +++ b/external/amd/include/amd_internal.h @@ -47,14 +47,14 @@ AMD will be exceedingly slow when running in debug mode. The next three lines ensure that debugging is turned off. */ -#ifndef NDEBUG -#define NDEBUG -#endif +// #ifndef NDEBUG +// #define NDEBUG +// #endif /* To enable debugging, uncomment the following line: -#undef NDEBUG */ +// #undef NDEBUG /* ------------------------------------------------------------------------- */ /* ANSI include files */ From 1e0983876ff5ee85095aa1bd67ddf21f91b2c8db Mon Sep 17 00:00:00 2001 From: Souvik Das Date: Fri, 25 Aug 2017 12:51:30 +0530 Subject: [PATCH 09/14] Fix empty structure in C error in VS2017 --- test/generated/inv_pos/inv_pos.h | 2 +- test/generated/norm/norm.h | 2 +- test/generated/quad_over_lin/quad_over_lin.h | 2 +- test/generated/sq_norm/sq_norm.h | 2 +- test/generated/sum_sq/sum_sq.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/generated/inv_pos/inv_pos.h b/test/generated/inv_pos/inv_pos.h index 27a3dac0..0d6444fe 100644 --- a/test/generated/inv_pos/inv_pos.h +++ b/test/generated/inv_pos/inv_pos.h @@ -16,7 +16,7 @@ extern "C" { /* the parameter struct */ typedef struct inv_pos_params { - + int : 0; } inv_pos_params; /* the input dimensions struct */ diff --git a/test/generated/norm/norm.h b/test/generated/norm/norm.h index 87526f4f..55146ae3 100644 --- a/test/generated/norm/norm.h +++ b/test/generated/norm/norm.h @@ -16,7 +16,7 @@ extern "C" { /* the parameter struct */ typedef struct norm_params { - + int : 0; } norm_params; /* the input dimensions struct */ diff --git a/test/generated/quad_over_lin/quad_over_lin.h b/test/generated/quad_over_lin/quad_over_lin.h index 872cafa9..2291c1f9 100644 --- a/test/generated/quad_over_lin/quad_over_lin.h +++ b/test/generated/quad_over_lin/quad_over_lin.h @@ -16,7 +16,7 @@ extern "C" { /* the parameter struct */ typedef struct quad_over_lin_params { - + int : 0; } quad_over_lin_params; /* the input dimensions struct */ diff --git a/test/generated/sq_norm/sq_norm.h b/test/generated/sq_norm/sq_norm.h index 84bb3bc2..86d85e15 100644 --- a/test/generated/sq_norm/sq_norm.h +++ b/test/generated/sq_norm/sq_norm.h @@ -16,7 +16,7 @@ extern "C" { /* the parameter struct */ typedef struct sq_norm_params { - + int : 0; } sq_norm_params; /* the input dimensions struct */ diff --git a/test/generated/sum_sq/sum_sq.h b/test/generated/sum_sq/sum_sq.h index eec1de28..8ce65720 100644 --- a/test/generated/sum_sq/sum_sq.h +++ b/test/generated/sum_sq/sum_sq.h @@ -16,7 +16,7 @@ extern "C" { /* the parameter struct */ typedef struct sum_sq_params { - + int : 0; } sum_sq_params; /* the input dimensions struct */ From ac525ce8c20eae4d07dd9e8649cf8c85795c7a2f Mon Sep 17 00:00:00 2001 From: Souvik Das Date: Fri, 25 Aug 2017 12:52:49 +0530 Subject: [PATCH 10/14] Add "stdio.h" dependency when building bb_test on Windows --- test/bb_test.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/bb_test.c b/test/bb_test.c index b484478b..007b2b7a 100644 --- a/test/bb_test.c +++ b/test/bb_test.c @@ -1,3 +1,5 @@ +#include + #include "timer.h" #include "ecos.h" #include "ecos_bb.h" From bced1f76ad64091f923274ef6c7f404ce53588f8 Mon Sep 17 00:00:00 2001 From: Souvik Das Date: Fri, 25 Aug 2017 12:55:39 +0530 Subject: [PATCH 11/14] Makefile: Add shared library building for ECOS_BB --- Makefile | 6 ++++-- ecos.mk | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 73dc6909..fe2936cb 100644 --- a/Makefile +++ b/Makefile @@ -68,8 +68,10 @@ runecosexp: src/runecos_exp.c libecos.a # Shared library .PHONY: shared -shared: $(SHAREDNAME) -$(SHAREDNAME): $(LDL) $(AMD) $(ECOS_OBJS) +shared: $(SHARED_ECOS) $(SHARED_ECOS_BB) +$(SHARED_ECOS): $(LDL) $(AMD) $(ECOS_OBJS) + $(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) +$(SHARED_ECOS_BB): $(LDL) $(AMD) $(ECOS_BB_OBJS) $(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) # ECOS tester diff --git a/ecos.mk b/ecos.mk index a3b82077..e3f0d4a3 100644 --- a/ecos.mk +++ b/ecos.mk @@ -39,17 +39,20 @@ ifeq ($(UNAME), Darwin) # we're on apple, no need to link rt library LDFLAGS = -lm # shared library has extension .dylib -SHAREDNAME = libecos.dylib +SHARED_ECOS = libecos.dylib +SHARED_ECOS_BB = libecos_bb.dylib else ifeq ($(ISWINDOWS), 1) # we're on windows (cygwin or msys) LDFLAGS = -lm # shared library has extension .dll -SHAREDNAME = libecos.dll +SHARED_ECOS = libecos.dll +SHARED_ECOS_BB = libecos_bb.dll else # we're on a linux system, use accurate timer provided by clock_gettime() LDFLAGS = -lm -lrt # shared library has extension .so -SHAREDNAME = libecos.so +SHARED_ECOS = libecos.so +SHARED_ECOS_BB = libecos_bb.so endif From ae6406d4d30a0cc2c9d925c30d669c96b87528b8 Mon Sep 17 00:00:00 2001 From: Souvik Das Date: Fri, 25 Aug 2017 12:57:16 +0530 Subject: [PATCH 12/14] Makefile: Improve CLEAN and PURGE operations --- Makefile | 5 ++++- ecos.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fe2936cb..0d94dd83 100644 --- a/Makefile +++ b/Makefile @@ -103,4 +103,7 @@ clean: purge: clean ( cd external/ldl ; $(MAKE) purge ) ( cd external/amd ; $(MAKE) purge ) - - $(RM) libecos.a libecos_bb.a runecos runecosexp + - $(RM) runecos runecosexp \ + libecos*.a libecos*.so libecos*.dylib libecos*.dll \ + ecos_bb_test ecos_bb_test.exe \ + ecostester ecostester.exe diff --git a/ecos.mk b/ecos.mk index e3f0d4a3..b5caa9d3 100644 --- a/ecos.mk +++ b/ecos.mk @@ -63,4 +63,4 @@ ARCHIVE = $(AR) $(ARFLAGS) RANLIB = ranlib ## WHICH FILES TO CLEAN UP -CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno libecos*.a libecos*.so libecos*.dylib libecos*.dll ecos_bb_test ecostester ecostester.exe runecosexp +CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno From 0284e70227af7d0173cac18b6a5ca557dc30cbaa Mon Sep 17 00:00:00 2001 From: Souvik Das Date: Fri, 25 Aug 2017 13:28:18 +0530 Subject: [PATCH 13/14] Upgrade MSVS solution to run with VS2017 1. Added: Support for "x64" platform (Preprocessor: DLONG, ZLONG, LDL_LONG) 2. Added: Pre-processor "NPRINT" to AMD to prevent "printf" usage 3. Fixed: Configuration "Release" & "Debug" to work properly in MSVS (May add Optimization Flags in future commits) 4. Added: New Configuration "Export": Fixes trouble with STDIO when the static library that is compiled in Newer MSVC (>=2013) is loaded with Older MSVC runtime (<=2012). This change by default removes dependency on "stdio.h" hence Demo Projects "RUNECOS" and "RUNECOSEXP" are not functional under this configuration. For more info. check: https://community.microfocus.com/microfocus/mainframe_solutions/enterprise_developer_21/w/knowledge_base/27927/compatibility-issues-with-visual-studio-2015 --- vstudio/.gitignore | 6 + vstudio/AMD/AMD.vcxproj | 198 ++++++++++++++--- vstudio/AMD/AMD.vcxproj.filters | 65 ------ vstudio/ECOS.sln | 89 +++++++- vstudio/ECOS.v11.suo | Bin 157184 -> 0 bytes vstudio/ECOS/ECOS.vcxproj | 145 +++++++++++- vstudio/ECOS/ECOS.vcxproj.filters | 83 ------- vstudio/ECOS/ECOS.vcxproj.user | 8 - vstudio/ECOS_BB/ECOS_BB.vcxproj | 236 ++++++++++++++++++++ vstudio/LDL/LDL.vcxproj | 135 ++++++++++-- vstudio/LDL/LDL.vcxproj.filters | 26 --- vstudio/RUNECOS/RUNECOS.vcxproj | 161 ++++++++++++-- vstudio/RUNECOS/RUNECOS.vcxproj.filters | 26 --- vstudio/RUNECOSEXP/RUNECOSEXP.vcxproj | 145 ++++++++++-- vstudio/TEST_ECOS/TEST_ECOS.vcxproj | 254 ++++++++++++++++++++++ vstudio/TEST_ECOS_BB/TEST_ECOS_BB.vcxproj | 220 +++++++++++++++++++ 16 files changed, 1488 insertions(+), 309 deletions(-) create mode 100644 vstudio/.gitignore delete mode 100644 vstudio/AMD/AMD.vcxproj.filters delete mode 100644 vstudio/ECOS.v11.suo delete mode 100644 vstudio/ECOS/ECOS.vcxproj.filters delete mode 100644 vstudio/ECOS/ECOS.vcxproj.user create mode 100644 vstudio/ECOS_BB/ECOS_BB.vcxproj delete mode 100644 vstudio/LDL/LDL.vcxproj.filters delete mode 100644 vstudio/RUNECOS/RUNECOS.vcxproj.filters create mode 100644 vstudio/TEST_ECOS/TEST_ECOS.vcxproj create mode 100644 vstudio/TEST_ECOS_BB/TEST_ECOS_BB.vcxproj diff --git a/vstudio/.gitignore b/vstudio/.gitignore new file mode 100644 index 00000000..9039c83c --- /dev/null +++ b/vstudio/.gitignore @@ -0,0 +1,6 @@ +# VS temp files +Debug +Export +Release +*.vcxproj.filters +*.vcxproj.user \ No newline at end of file diff --git a/vstudio/AMD/AMD.vcxproj b/vstudio/AMD/AMD.vcxproj index 7bdba0c5..1d932dc4 100644 --- a/vstudio/AMD/AMD.vcxproj +++ b/vstudio/AMD/AMD.vcxproj @@ -1,32 +1,92 @@  - + Debug Win32 + + Debug + x64 + + + Export + Win32 + + + Export + x64 + Release Win32 + + Release + x64 + + + + + + + + + + + + + + + + + + + + + {530A3224-506F-4C26-853B-475E069FDDD6} Project1 AMD + 7.0 StaticLibrary true - v110 + v141_xp MultiByte - Application - false - v110 - true + StaticLibrary + true + v141_xp + MultiByte + + + StaticLibrary + true + v141_xp + MultiByte + + + StaticLibrary + true + v141_xp + MultiByte + + + StaticLibrary + true + v141_xp + MultiByte + + + StaticLibrary + true + v141_xp MultiByte @@ -35,59 +95,125 @@ - + + + + + + + + + + + + + + + + Level3 Disabled - $(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) - MultiThreadedDLL + $(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) false + NPRINT;DLONG;ZLONG;%(PreprocessorDefinitions) + NDEBUG;%(UndefinePreprocessorDefinitions) true true + + $(SolutionDir)$(Configuration)\;%(AdditionalLibraryDirectories) + Level3 - MaxSpeed - true - true - Speed - $(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + Disabled + $(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + false + NPRINT;NDEBUG;DLONG;ZLONG;%(PreprocessorDefinitions) true - true - true + true + + $(SolutionDir)$(Configuration)\;%(AdditionalLibraryDirectories) + + + + + Level3 + Disabled + $(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + false + NPRINT;NDEBUG;DLONG;ZLONG;%(PreprocessorDefinitions) + + + true + true + + + $(SolutionDir)$(Configuration)\;%(AdditionalLibraryDirectories) + + + + + Level3 + Disabled + $(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + false + NPRINT;DLONG;ZLONG;%(PreprocessorDefinitions) + NDEBUG;%(UndefinePreprocessorDefinitions) + + + true + true + + + + $(SolutionDir)$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) + + + + + Level3 + Disabled + $(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + false + NPRINT;NDEBUG;DLONG;ZLONG;%(PreprocessorDefinitions) + + + true + true + + + $(SolutionDir)$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) + + + + + Level3 + Disabled + $(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + false + NPRINT;NDEBUG;DLONG;ZLONG;%(PreprocessorDefinitions) + + + true + true + + + $(SolutionDir)$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories) + - - - - - - - - - - - - - - - - - - - - diff --git a/vstudio/AMD/AMD.vcxproj.filters b/vstudio/AMD/AMD.vcxproj.filters deleted file mode 100644 index f2e829b5..00000000 --- a/vstudio/AMD/AMD.vcxproj.filters +++ /dev/null @@ -1,65 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/vstudio/ECOS.sln b/vstudio/ECOS.sln index a3ab60e6..c978acd3 100644 --- a/vstudio/ECOS.sln +++ b/vstudio/ECOS.sln @@ -1,12 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.4 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD", "AMD\AMD.vcxproj", "{530A3224-506F-4C26-853B-475E069FDDD6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LDL", "LDL\LDL.vcxproj", "{724D412D-5DA9-4FB0-A5C9-AD28AC037305}" - ProjectSection(ProjectDependencies) = postProject - {530A3224-506F-4C26-853B-475E069FDDD6} = {530A3224-506F-4C26-853B-475E069FDDD6} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ECOS", "ECOS\ECOS.vcxproj", "{BD19D8A4-021F-440D-9C95-5CB13F20CBD9}" EndProject @@ -14,32 +13,114 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RUNECOS", "RUNECOS\RUNECOS. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RUNECOSEXP", "RUNECOSEXP\RUNECOSEXP.vcxproj", "{2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TEST_ECOS", "TEST_ECOS\TEST_ECOS.vcxproj", "{87755E44-8CEC-4B20-A4B9-73AD1D2F190B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TEST_ECOS_BB", "TEST_ECOS_BB\TEST_ECOS_BB.vcxproj", "{D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ECOS_BB", "ECOS_BB\ECOS_BB.vcxproj", "{D4850429-67BC-4051-AD8D-B6D72EEB51DB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Export|Win32 = Export|Win32 + Export|x64 = Export|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {530A3224-506F-4C26-853B-475E069FDDD6}.Debug|Win32.ActiveCfg = Debug|Win32 {530A3224-506F-4C26-853B-475E069FDDD6}.Debug|Win32.Build.0 = Debug|Win32 + {530A3224-506F-4C26-853B-475E069FDDD6}.Debug|x64.ActiveCfg = Debug|x64 + {530A3224-506F-4C26-853B-475E069FDDD6}.Debug|x64.Build.0 = Debug|x64 + {530A3224-506F-4C26-853B-475E069FDDD6}.Export|Win32.ActiveCfg = Export|Win32 + {530A3224-506F-4C26-853B-475E069FDDD6}.Export|Win32.Build.0 = Export|Win32 + {530A3224-506F-4C26-853B-475E069FDDD6}.Export|x64.ActiveCfg = Export|x64 + {530A3224-506F-4C26-853B-475E069FDDD6}.Export|x64.Build.0 = Export|x64 {530A3224-506F-4C26-853B-475E069FDDD6}.Release|Win32.ActiveCfg = Release|Win32 {530A3224-506F-4C26-853B-475E069FDDD6}.Release|Win32.Build.0 = Release|Win32 + {530A3224-506F-4C26-853B-475E069FDDD6}.Release|x64.ActiveCfg = Release|x64 + {530A3224-506F-4C26-853B-475E069FDDD6}.Release|x64.Build.0 = Release|x64 {724D412D-5DA9-4FB0-A5C9-AD28AC037305}.Debug|Win32.ActiveCfg = Debug|Win32 {724D412D-5DA9-4FB0-A5C9-AD28AC037305}.Debug|Win32.Build.0 = Debug|Win32 + {724D412D-5DA9-4FB0-A5C9-AD28AC037305}.Debug|x64.ActiveCfg = Debug|x64 + {724D412D-5DA9-4FB0-A5C9-AD28AC037305}.Debug|x64.Build.0 = Debug|x64 + {724D412D-5DA9-4FB0-A5C9-AD28AC037305}.Export|Win32.ActiveCfg = Export|Win32 + {724D412D-5DA9-4FB0-A5C9-AD28AC037305}.Export|Win32.Build.0 = Export|Win32 + {724D412D-5DA9-4FB0-A5C9-AD28AC037305}.Export|x64.ActiveCfg = Export|x64 + {724D412D-5DA9-4FB0-A5C9-AD28AC037305}.Export|x64.Build.0 = Export|x64 {724D412D-5DA9-4FB0-A5C9-AD28AC037305}.Release|Win32.ActiveCfg = Release|Win32 {724D412D-5DA9-4FB0-A5C9-AD28AC037305}.Release|Win32.Build.0 = Release|Win32 + {724D412D-5DA9-4FB0-A5C9-AD28AC037305}.Release|x64.ActiveCfg = Release|x64 + {724D412D-5DA9-4FB0-A5C9-AD28AC037305}.Release|x64.Build.0 = Release|x64 {BD19D8A4-021F-440D-9C95-5CB13F20CBD9}.Debug|Win32.ActiveCfg = Debug|Win32 {BD19D8A4-021F-440D-9C95-5CB13F20CBD9}.Debug|Win32.Build.0 = Debug|Win32 + {BD19D8A4-021F-440D-9C95-5CB13F20CBD9}.Debug|x64.ActiveCfg = Debug|x64 + {BD19D8A4-021F-440D-9C95-5CB13F20CBD9}.Debug|x64.Build.0 = Debug|x64 + {BD19D8A4-021F-440D-9C95-5CB13F20CBD9}.Export|Win32.ActiveCfg = Export|Win32 + {BD19D8A4-021F-440D-9C95-5CB13F20CBD9}.Export|Win32.Build.0 = Export|Win32 + {BD19D8A4-021F-440D-9C95-5CB13F20CBD9}.Export|x64.ActiveCfg = Export|x64 + {BD19D8A4-021F-440D-9C95-5CB13F20CBD9}.Export|x64.Build.0 = Export|x64 {BD19D8A4-021F-440D-9C95-5CB13F20CBD9}.Release|Win32.ActiveCfg = Release|Win32 {BD19D8A4-021F-440D-9C95-5CB13F20CBD9}.Release|Win32.Build.0 = Release|Win32 + {BD19D8A4-021F-440D-9C95-5CB13F20CBD9}.Release|x64.ActiveCfg = Release|x64 + {BD19D8A4-021F-440D-9C95-5CB13F20CBD9}.Release|x64.Build.0 = Release|x64 {8DAB4734-3693-4430-848F-68AA005565B3}.Debug|Win32.ActiveCfg = Debug|Win32 {8DAB4734-3693-4430-848F-68AA005565B3}.Debug|Win32.Build.0 = Debug|Win32 + {8DAB4734-3693-4430-848F-68AA005565B3}.Debug|x64.ActiveCfg = Debug|x64 + {8DAB4734-3693-4430-848F-68AA005565B3}.Debug|x64.Build.0 = Debug|x64 + {8DAB4734-3693-4430-848F-68AA005565B3}.Export|Win32.ActiveCfg = Export|Win32 + {8DAB4734-3693-4430-848F-68AA005565B3}.Export|x64.ActiveCfg = Export|x64 {8DAB4734-3693-4430-848F-68AA005565B3}.Release|Win32.ActiveCfg = Release|Win32 {8DAB4734-3693-4430-848F-68AA005565B3}.Release|Win32.Build.0 = Release|Win32 + {8DAB4734-3693-4430-848F-68AA005565B3}.Release|x64.ActiveCfg = Release|x64 + {8DAB4734-3693-4430-848F-68AA005565B3}.Release|x64.Build.0 = Release|x64 {2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}.Debug|Win32.ActiveCfg = Debug|Win32 {2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}.Debug|Win32.Build.0 = Debug|Win32 + {2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}.Debug|x64.ActiveCfg = Debug|x64 + {2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}.Debug|x64.Build.0 = Debug|x64 + {2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}.Export|Win32.ActiveCfg = Export|Win32 + {2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}.Export|x64.ActiveCfg = Export|x64 {2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}.Release|Win32.ActiveCfg = Release|Win32 {2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}.Release|Win32.Build.0 = Release|Win32 + {2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}.Release|x64.ActiveCfg = Release|x64 + {2AB26548-4B88-4D0C-83DC-C4F3C1B0417A}.Release|x64.Build.0 = Release|x64 + {87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Debug|Win32.ActiveCfg = Debug|Win32 + {87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Debug|Win32.Build.0 = Debug|Win32 + {87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Debug|x64.ActiveCfg = Debug|x64 + {87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Debug|x64.Build.0 = Debug|x64 + {87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Export|Win32.ActiveCfg = Export|Win32 + {87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Export|Win32.Build.0 = Export|Win32 + {87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Export|x64.ActiveCfg = Export|x64 + {87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Export|x64.Build.0 = Export|x64 + {87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Release|Win32.ActiveCfg = Release|Win32 + {87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Release|Win32.Build.0 = Release|Win32 + {87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Release|x64.ActiveCfg = Release|x64 + {87755E44-8CEC-4B20-A4B9-73AD1D2F190B}.Release|x64.Build.0 = Release|x64 + {D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Debug|Win32.ActiveCfg = Debug|Win32 + {D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Debug|Win32.Build.0 = Debug|Win32 + {D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Debug|x64.ActiveCfg = Debug|x64 + {D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Debug|x64.Build.0 = Debug|x64 + {D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Export|Win32.ActiveCfg = Export|Win32 + {D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Export|Win32.Build.0 = Export|Win32 + {D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Export|x64.ActiveCfg = Export|x64 + {D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Export|x64.Build.0 = Export|x64 + {D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Release|Win32.ActiveCfg = Release|Win32 + {D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Release|Win32.Build.0 = Release|Win32 + {D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Release|x64.ActiveCfg = Release|x64 + {D1E6B3E5-0511-41A2-A84C-DC76FA88AA29}.Release|x64.Build.0 = Release|x64 + {D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Debug|Win32.ActiveCfg = Debug|Win32 + {D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Debug|Win32.Build.0 = Debug|Win32 + {D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Debug|x64.ActiveCfg = Debug|x64 + {D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Debug|x64.Build.0 = Debug|x64 + {D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Export|Win32.ActiveCfg = Export|Win32 + {D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Export|Win32.Build.0 = Export|Win32 + {D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Export|x64.ActiveCfg = Export|x64 + {D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Export|x64.Build.0 = Export|x64 + {D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Release|Win32.ActiveCfg = Release|Win32 + {D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Release|Win32.Build.0 = Release|Win32 + {D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Release|x64.ActiveCfg = Release|x64 + {D4850429-67BC-4051-AD8D-B6D72EEB51DB}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vstudio/ECOS.v11.suo b/vstudio/ECOS.v11.suo deleted file mode 100644 index 84828ebc71d79b57eb5eaf20c8b81b76171215c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157184 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 p)&nYQ4%?5VW=f - + Debug Win32 + + Debug + x64 + + + Export + Win32 + + + Export + x64 + Release Win32 + + Release + x64 + {BD19D8A4-021F-440D-9C95-5CB13F20CBD9} Win32Proj + ECOS + 7.0 StaticLibrary true - v110 + v141_xp - DynamicLibrary - false - v110 + StaticLibrary + true + v141_xp + + + StaticLibrary + true + v141_xp + + + StaticLibrary + true + v141_xp + + + StaticLibrary + true + v141_xp + + + StaticLibrary + true + v141_xp @@ -31,7 +69,19 @@ - + + + + + + + + + + + + + @@ -41,10 +91,21 @@ true + + true + + + true + + + true + + + true + - WIN32;_DEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL + WIN32;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;DEBUG;%(PreprocessorDefinitions) Level3 ProgramDatabase Disabled @@ -59,17 +120,74 @@ - WIN32;NDEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL + WIN32;_DEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;%(PreprocessorDefinitions) + Level3 + ProgramDatabase + Disabled + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + + + MachineX86 + true + Windows + %(AdditionalDependencies) + + + + + WIN32;_DEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;PRINTLEVEL=0;%(PreprocessorDefinitions) Level3 ProgramDatabase + Disabled + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) MachineX86 true Windows - true - true + %(AdditionalDependencies) + + + + + WIN32;_DEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;PRINTLEVEL=0 + Level3 + ProgramDatabase + Disabled + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + + + true + Windows + %(AdditionalDependencies) + + + + + WIN32;_DEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;%(PreprocessorDefinitions) + Level3 + ProgramDatabase + Disabled + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + + + true + Windows + %(AdditionalDependencies) + + + + + WIN32;_DEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;PRINTLEVEL=0;%(PreprocessorDefinitions) + Level3 + ProgramDatabase + Disabled + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + + + true + Windows + %(AdditionalDependencies) @@ -105,6 +223,9 @@ {724d412d-5da9-4fb0-a5c9-ad28ac037305} + + {CA776687-65F0-47CA-8578-45160B8D9AA6} + diff --git a/vstudio/ECOS/ECOS.vcxproj.filters b/vstudio/ECOS/ECOS.vcxproj.filters deleted file mode 100644 index bdb2dee0..00000000 --- a/vstudio/ECOS/ECOS.vcxproj.filters +++ /dev/null @@ -1,83 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/vstudio/ECOS/ECOS.vcxproj.user b/vstudio/ECOS/ECOS.vcxproj.user deleted file mode 100644 index e6de397a..00000000 --- a/vstudio/ECOS/ECOS.vcxproj.user +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - WindowsLocalDebugger - - \ No newline at end of file diff --git a/vstudio/ECOS_BB/ECOS_BB.vcxproj b/vstudio/ECOS_BB/ECOS_BB.vcxproj new file mode 100644 index 00000000..715e2ea9 --- /dev/null +++ b/vstudio/ECOS_BB/ECOS_BB.vcxproj @@ -0,0 +1,236 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Export + Win32 + + + Export + x64 + + + Release + Win32 + + + Release + x64 + + + + {D4850429-67BC-4051-AD8D-B6D72EEB51DB} + Win32Proj + ECOS_BB + 7.0 + + + + StaticLibrary + true + v141_xp + + + StaticLibrary + true + v141_xp + + + StaticLibrary + true + v141_xp + + + StaticLibrary + true + v141_xp + + + StaticLibrary + true + v141_xp + + + StaticLibrary + true + v141_xp + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + + WIN32;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;DEBUG;%(PreprocessorDefinitions) + Level3 + ProgramDatabase + Disabled + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + + + MachineX86 + true + Windows + %(AdditionalDependencies) + + + + + WIN32;_DEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;%(PreprocessorDefinitions) + Level3 + ProgramDatabase + Disabled + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + + + MachineX86 + true + Windows + %(AdditionalDependencies) + + + + + WIN32;_DEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;PRINTLEVEL=0;%(PreprocessorDefinitions) + Level3 + ProgramDatabase + Disabled + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + + + MachineX86 + true + Windows + %(AdditionalDependencies) + + + + + WIN32;_DEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;PRINTLEVEL=0 + Level3 + ProgramDatabase + Disabled + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + + + true + Windows + %(AdditionalDependencies) + + + + + WIN32;_DEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;%(PreprocessorDefinitions) + Level3 + ProgramDatabase + Disabled + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + + + true + Windows + %(AdditionalDependencies) + + + + + WIN32;_DEBUG;_WINDOWS;_USRDLL;ECOS_EXPORTS;DLONG;ZLONG;LDL_LONG;PRINTLEVEL=0;%(PreprocessorDefinitions) + Level3 + ProgramDatabase + Disabled + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + + + true + Windows + %(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {530a3224-506f-4c26-853b-475e069fddd6} + + + {724d412d-5da9-4fb0-a5c9-ad28ac037305} + + + {CA776687-65F0-47CA-8578-45160B8D9AA6} + + + + + + \ No newline at end of file diff --git a/vstudio/LDL/LDL.vcxproj b/vstudio/LDL/LDL.vcxproj index ff3158a0..0dde707b 100644 --- a/vstudio/LDL/LDL.vcxproj +++ b/vstudio/LDL/LDL.vcxproj @@ -1,32 +1,78 @@  - + Debug Win32 + + Debug + x64 + + + Export + Win32 + + + Export + x64 + Release Win32 + + Release + x64 + + + + + + + {724D412D-5DA9-4FB0-A5C9-AD28AC037305} Project2 LDL + 7.0 StaticLibrary true - v110 + v141_xp MultiByte - Application - false - v110 - true + StaticLibrary + true + v141_xp + MultiByte + + + StaticLibrary + true + v141_xp + MultiByte + + + StaticLibrary + true + v141_xp + MultiByte + + + StaticLibrary + true + v141_xp + MultiByte + + + StaticLibrary + true + v141_xp MultiByte @@ -35,16 +81,32 @@ - + + + + + + + + + + + + + + + + Level3 Disabled $(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + LDL_LONG;%(PreprocessorDefinitions) true @@ -53,23 +115,58 @@ Level3 - MaxSpeed - true - true + Disabled + $(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + LDL_LONG;%(PreprocessorDefinitions) + + + true + + + + + Level3 + Disabled + $(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + LDL_LONG;%(PreprocessorDefinitions) + + + true + + + + + Level3 + Disabled + $(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + LDL_LONG;%(PreprocessorDefinitions) + + + true + + + + + Level3 + Disabled + $(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + LDL_LONG;%(PreprocessorDefinitions) + + + true + + + + + Level3 + Disabled + $(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\SuiteSparse_config;%(AdditionalIncludeDirectories) + LDL_LONG;%(PreprocessorDefinitions) true - true - true - - - - - - - diff --git a/vstudio/LDL/LDL.vcxproj.filters b/vstudio/LDL/LDL.vcxproj.filters deleted file mode 100644 index a0404a68..00000000 --- a/vstudio/LDL/LDL.vcxproj.filters +++ /dev/null @@ -1,26 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Header Files - - - Header Files - - - - - Source Files - - - \ No newline at end of file diff --git a/vstudio/RUNECOS/RUNECOS.vcxproj b/vstudio/RUNECOS/RUNECOS.vcxproj index a25b8482..da83453c 100644 --- a/vstudio/RUNECOS/RUNECOS.vcxproj +++ b/vstudio/RUNECOS/RUNECOS.vcxproj @@ -1,33 +1,73 @@  - + Debug Win32 + + Debug + x64 + + + Export + Win32 + + + Export + x64 + Release Win32 + + Release + x64 + {8DAB4734-3693-4430-848F-68AA005565B3} Win32Proj - ConsoleApplication1 + RUNECOS RUNECOS + 8.1 Application true - v110 + v141_xp Unicode Application - false - v110 - true + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp Unicode @@ -36,7 +76,19 @@ - + + + + + + + + + + + + + @@ -44,7 +96,19 @@ true - false + true + + + true + + + true + + + true + + + true @@ -53,28 +117,93 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\external\amd\include + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include + MultiThreadedDebugDLL Console true + %(AdditionalOptions) + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + NotUsing Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include + MultiThreadedDebugDLL Console true - true - true + %(AdditionalOptions) diff --git a/vstudio/RUNECOS/RUNECOS.vcxproj.filters b/vstudio/RUNECOS/RUNECOS.vcxproj.filters deleted file mode 100644 index 888a0082..00000000 --- a/vstudio/RUNECOS/RUNECOS.vcxproj.filters +++ /dev/null @@ -1,26 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/vstudio/RUNECOSEXP/RUNECOSEXP.vcxproj b/vstudio/RUNECOSEXP/RUNECOSEXP.vcxproj index 89fa0c17..32ab04e1 100644 --- a/vstudio/RUNECOSEXP/RUNECOSEXP.vcxproj +++ b/vstudio/RUNECOSEXP/RUNECOSEXP.vcxproj @@ -1,32 +1,72 @@  - + Debug Win32 + + Debug + x64 + + + Export + Win32 + + + Export + x64 + Release Win32 + + Release + x64 + {2AB26548-4B88-4D0C-83DC-C4F3C1B0417A} Win32Proj RUNECOSEXP + 8.1 Application true - v110 + v141_xp Unicode Application - false - v110 - true + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp Unicode @@ -35,7 +75,19 @@ - + + + + + + + + + + + + + @@ -43,7 +95,19 @@ true - false + true + + + true + + + true + + + true + + + true @@ -52,7 +116,7 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\external\amd\include + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include Console @@ -61,19 +125,72 @@ + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include + + + Console + true + + + + - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include + + + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include + + + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include + + + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include Console true - true - true diff --git a/vstudio/TEST_ECOS/TEST_ECOS.vcxproj b/vstudio/TEST_ECOS/TEST_ECOS.vcxproj new file mode 100644 index 00000000..ec1f3bbb --- /dev/null +++ b/vstudio/TEST_ECOS/TEST_ECOS.vcxproj @@ -0,0 +1,254 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Export + Win32 + + + Export + x64 + + + Release + Win32 + + + Release + x64 + + + + {87755E44-8CEC-4B20-A4B9-73AD1D2F190B} + Win32Proj + TEST_ECOS + TEST_ECOS + 8.1 + + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\test;$(ProjectDir)\..\..\test\generated + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\test;$(ProjectDir)\..\..\test\generated + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\test;$(ProjectDir)\..\..\test\generated + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\test;$(ProjectDir)\..\..\test\generated + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\test;$(ProjectDir)\..\..\test\generated + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\test;$(ProjectDir)\..\..\test\generated + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {bd19d8a4-021f-440d-9c95-5cb13f20cbd9} + + + + + + \ No newline at end of file diff --git a/vstudio/TEST_ECOS_BB/TEST_ECOS_BB.vcxproj b/vstudio/TEST_ECOS_BB/TEST_ECOS_BB.vcxproj new file mode 100644 index 00000000..86eb7fa5 --- /dev/null +++ b/vstudio/TEST_ECOS_BB/TEST_ECOS_BB.vcxproj @@ -0,0 +1,220 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Export + Win32 + + + Export + x64 + + + Release + Win32 + + + Release + x64 + + + + {D1E6B3E5-0511-41A2-A84C-DC76FA88AA29} + Win32Proj + TEST_ECOS_BB + TEST_ECOS_BB + 8.1 + + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + Application + true + v141_xp + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\test;$(ProjectDir)\..\..\test\generated + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\test;$(ProjectDir)\..\..\test\generated + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\test;$(ProjectDir)\..\..\test\generated + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\test;$(ProjectDir)\..\..\test\generated + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\test;$(ProjectDir)\..\..\test\generated + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(ProjectDir)\..\..\include;$(ProjectDir)\..\..\external\SuiteSparse_config;$(ProjectDir)\..\..\external\ldl\include;$(ProjectDir)\..\..\external\amd\include;$(ProjectDir)\..\..\test;$(ProjectDir)\..\..\test\generated + MultiThreadedDebugDLL + + + Console + true + %(AdditionalOptions) + + + + + + + + {D4850429-67BC-4051-AD8D-B6D72EEB51DB} + + + + + + \ No newline at end of file From 6e6241a6bc6b153188bc1bc470c4586da9920e4f Mon Sep 17 00:00:00 2001 From: souvikdas95 Date: Tue, 26 Sep 2017 01:43:43 +0530 Subject: [PATCH 14/14] Prevent unnecessary redifinition of INFINITY & isinf() in ecos_bb --- include/ecos_bb.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/ecos_bb.h b/include/ecos_bb.h index aec87430..dc95b03a 100644 --- a/include/ecos_bb.h +++ b/include/ecos_bb.h @@ -69,10 +69,14 @@ /* define INFINITY and isinf for MSFT */ #ifdef _MSC_VER #include "float.h" +#ifndef INFINITY #define INFINITY (DBL_MAX+DBL_MAX) +#endif /* this will also return true if x is nan, but we don't check that anyway */ +#ifndef isinf #define isinf(x) (!_finite(x)) #endif +#endif #ifdef __cplusplus extern "C" {