manolas
/
ReducedModelOptimization
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactoring

This commit is contained in:
iasonmanolas 2022-01-03 15:30:59 +02:00
parent 233694563a
commit da04f1f9c3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -37,23 +37,23 @@ add_executable(${PROJECT_NAME} ${SOURCES})
if(${CMAKE_BUILD_TYPE} STREQUAL "Release") if(${CMAKE_BUILD_TYPE} STREQUAL "Release")
set(USE_POLYSCOPE false) set(USE_POLYSCOPE false)
set(MYSOURCES_STATIC_LINK true) set(MYSOURCES_STATIC_LINK true)
set(USE_ENSMALLEN false) set(USE_ENSMALLEN true)
else() 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) set(USE_POLYSCOPE true)
if(${USE_POLYSCOPE}) if(${USE_POLYSCOPE})
add_compile_definitions(POLYSCOPE_DEFINED) add_compile_definitions(POLYSCOPE_DEFINED)
endif() endif()
set(MYSOURCES_STATIC_LINK false) set(MYSOURCES_STATIC_LINK false)
set(USE_ENSMALLEN false) set(USE_ENSMALLEN true)
if(${USE_ENSMALLEN})
add_compile_definitions(USE_ENSMALLEN)
endif()
# if(NOT ${MYSOURCES_STATIC_LINK}) # if(NOT ${MYSOURCES_STATIC_LINK})
# set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" ) # set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
# set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" ) # set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
# endif() # endif()
endif() endif()
if(${USE_ENSMALLEN})
add_compile_definitions(USE_ENSMALLEN)
endif()
#dlib #dlib
set(DLIB_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/dlib) set(DLIB_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/dlib)

6
main.py
View File

@ -37,7 +37,6 @@ def listener(q,resultsDir):
global numberOfSkippedPatterns global numberOfSkippedPatterns
numberOfSkippedPatterns=numberOfSkippedPatterns+1 numberOfSkippedPatterns=numberOfSkippedPatterns+1
continue continue
print(m)
f.write(m) f.write(m)
f.flush() f.flush()
global start_time global start_time
@ -68,7 +67,7 @@ def optimize(fullPatternFilepath, reducedPatternFilepath,translationalObjectiveW
reducedPatternFilepath, reducedPatternFilepath,
str(numberOfFunctionCalls),str(translationalObjectiveWeight), str(numberOfFunctionCalls),str(translationalObjectiveWeight),
#os.path.join(resultsDir,os.path.basename(os.path.dirname(fullPatternFilepath)))) #os.path.join(resultsDir,os.path.basename(os.path.dirname(fullPatternFilepath))))
putResultsTo,optimizationParameters,intermediateResultsDir) putResultsTo,intermediateResultsDir,optimizationParameters)
patternStartTime=datetime.now() patternStartTime=datetime.now()
#print("Optimizing " + fullPatternFilepath+" at "+str(datetime.now())) #print("Optimizing " + fullPatternFilepath+" at "+str(datetime.now()))
@ -165,7 +164,8 @@ if __name__ == '__main__':
for key, optimizationParameters in optimizationParametersScenarios.items(): for key, optimizationParameters in optimizationParametersScenarios.items():
optimizationBatchName='variableComparison_'+key+'_'+str(int(numberOfFunctionCalls/1000))+'k' 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) optimizeBatch(fullPatternDirectory,optimizationParameters,resultsDir,intermediateResultsDir)
pool.close() pool.close()