vendor/scs/scs.mk in scs-0.2.3 vs vendor/scs/scs.mk in scs-0.3.0

- old
+ new

@@ -97,14 +97,10 @@ endif SFLOAT = 0 ifneq ($(SFLOAT), 0) OPT_FLAGS += -DSFLOAT=$(SFLOAT) # use floats rather than doubles endif -NOVALIDATE = 0 -ifneq ($(NOVALIDATE), 0) -OPT_FLAGS += -DNOVALIDATE=$(NOVALIDATE)$ # remove data validation step -endif NOTIMER = 0 ifneq ($(NOTIMER), 0) OPT_FLAGS += -DNOTIMER=$(NOTIMER) # no timing, times reported as nan endif COPYAMATRIX = 1 @@ -113,15 +109,23 @@ endif GPU_TRANSPOSE_MAT = 1 ifneq ($(GPU_TRANSPOSE_MAT), 0) OPT_FLAGS += -DGPU_TRANSPOSE_MAT=$(GPU_TRANSPOSE_MAT) # tranpose A mat in GPU memory endif - -### VERBOSITY LEVELS: 0,1,2 -EXTRA_VERBOSE = 0 -ifneq ($(EXTRA_VERBOSE), 0) -OPT_FLAGS += -DEXTRA_VERBOSE=$(EXTRA_VERBOSE) # extra verbosity level +NOVALIDATE = 0 +ifneq ($(NOVALIDATE), 0) +OPT_FLAGS += -DNOVALIDATE=$(NOVALIDATE) # perform problem validation or skip endif +### VERBOSITY LEVELS: 0,1,2,... +VERBOSITY = 0 +ifneq ($(VERBOSITY), 0) +OPT_FLAGS += -DVERBOSITY=$(VERBOSITY) # verbosity level +endif +COVERAGE = 0 +ifneq ($(COVERAGE), 0) +override CFLAGS += --coverage # generate test coverage data +endif + ############ OPENMP: ############ # set USE_OPENMP = 1 to allow openmp (multi-threaded matrix multiplies): # set the number of threads to, for example, 4 by entering the command: # export OMP_NUM_THREADS=4