diff --git a/CMakeLists.txt b/CMakeLists.txt index c0b1aa2..37da0e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,23 +37,23 @@ add_executable(${PROJECT_NAME} ${SOURCES}) if(${CMAKE_BUILD_TYPE} STREQUAL "Release") set(USE_POLYSCOPE false) set(MYSOURCES_STATIC_LINK true) - set(USE_ENSMALLEN false) + set(USE_ENSMALLEN true) else() - set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE TRUE) +# set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE TRUE) set(USE_POLYSCOPE true) if(${USE_POLYSCOPE}) add_compile_definitions(POLYSCOPE_DEFINED) endif() set(MYSOURCES_STATIC_LINK false) - set(USE_ENSMALLEN false) - if(${USE_ENSMALLEN}) - add_compile_definitions(USE_ENSMALLEN) - endif() + set(USE_ENSMALLEN true) # if(NOT ${MYSOURCES_STATIC_LINK}) # set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" ) # set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" ) # endif() endif() +if(${USE_ENSMALLEN}) + add_compile_definitions(USE_ENSMALLEN) +endif() #dlib set(DLIB_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/dlib) diff --git a/main.py b/main.py index e691ccd..7611ae3 100644 --- a/main.py +++ b/main.py @@ -37,7 +37,6 @@ def listener(q,resultsDir): global numberOfSkippedPatterns numberOfSkippedPatterns=numberOfSkippedPatterns+1 continue - print(m) f.write(m) f.flush() global start_time @@ -68,7 +67,7 @@ def optimize(fullPatternFilepath, reducedPatternFilepath,translationalObjectiveW reducedPatternFilepath, str(numberOfFunctionCalls),str(translationalObjectiveWeight), #os.path.join(resultsDir,os.path.basename(os.path.dirname(fullPatternFilepath)))) - putResultsTo,optimizationParameters,intermediateResultsDir) + putResultsTo,intermediateResultsDir,optimizationParameters) patternStartTime=datetime.now() #print("Optimizing " + fullPatternFilepath+" at "+str(datetime.now())) @@ -165,7 +164,8 @@ if __name__ == '__main__': for key, optimizationParameters in optimizationParametersScenarios.items(): optimizationBatchName='variableComparison_'+key+'_'+str(int(numberOfFunctionCalls/1000))+'k' - resultsDir=os.path.join(dirOfThisFile,os.path.join('Results/OptimizationResults/',optimizationBatchName)) + resultsDir=os.path.join(dirOfThisFile,os.path.join('Results/OptimizationResults/variableComparison_ensmallen/', + optimizationBatchName)) optimizeBatch(fullPatternDirectory,optimizationParameters,resultsDir,intermediateResultsDir) pool.close()