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

Merge branch 'bAndHOptimization' of https://gitea-s2i2s.isti.cnr.it/manolas/ReducedModelOptimization into bAndHOptimization

This commit is contained in:
iasonmanolas 2021-02-09 20:01:39 +02:00
parent 0f77ce390b 6ba16b0343
commit a0466fd1cb
2 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.cpp
View File

@ -47,9 +47,11 @@ int main(int argc, char *argv[]) {
ReducedModelOptimizer::xRange beamDimensionsRatio{"bOverh", 0.7, 1.3}; ReducedModelOptimizer::xRange beamDimensionsRatio{"bOverh", 0.7, 1.3};
ReducedModelOptimizer::xRange beamE{"E", 0.1, 1.9}; ReducedModelOptimizer::xRange beamE{"E", 0.1, 1.9};
// Test set of full patterns // Test set of full patterns
std::string fullPatternsTestSetDirectory = "TestSet"; std::string fullPatternsTestSetDirectory = "../TestSet";
if (!std::filesystem::exists(std::filesystem::path(fullPatternsTestSetDirectory))) { if (!std::filesystem::exists(
std::cerr << "Full pattern directory does not exist:" << fullPatternsTestSetDirectory << std::endl; std::filesystem::path(fullPatternsTestSetDirectory))) {
std::cerr << "Full pattern directory does not exist: "
<< fullPatternsTestSetDirectory << std::endl;
return 1; return 1;
} }
// "/home/iason/Documents/PhD/Research/Approximating shapes with flat " // "/home/iason/Documents/PhD/Research/Approximating shapes with flat "
@ -132,7 +134,8 @@ int main(int argc, char *argv[]) {
totalError += optimizationResults.objectiveValue; totalError += optimizationResults.objectiveValue;
resultsPerPattern[patternPairIndex] = resultsPerPattern[patternPairIndex] =
std::make_pair(patternPairs[patternPairIndex].first->getLabel(), optimizationResults); std::make_pair(patternPairs[patternPairIndex].first->getLabel(),
optimizationResults);
totalNumberOfSimulationCrashes += totalNumberOfSimulationCrashes +=
optimizationResults.numberOfSimulationCrashes; optimizationResults.numberOfSimulationCrashes;
// std::cout << "Have optimized " << ++patternsOptimized << "/" // std::cout << "Have optimized " << ++patternsOptimized << "/"
@ -157,8 +160,10 @@ int main(int argc, char *argv[]) {
// resultsPerPattern[patternPairIndex].second.save(saveToPath); // resultsPerPattern[patternPairIndex].second.save(saveToPath);
// } // }
if (!std::filesystem::exists(std::filesystem::path("OptimizationResults/"))) { if (!std::filesystem::exists(
std::filesystem::create_directory(std::filesystem::path("OptimizationResults")); std::filesystem::path("OptimizationResults/"))) {
std::filesystem::create_directory(
std::filesystem::path("OptimizationResults"));
} }
csvfile statistics(std::filesystem::path("OptimizationResults") csvfile statistics(std::filesystem::path("OptimizationResults")

12
src/reducedmodeloptimizer.cpp
View File

@ -37,15 +37,11 @@ struct GlobalOptimizationVariables {
// static GlobalOptimizationVariables global; // static GlobalOptimizationVariables global;
const static int MAX_THREAD = 64; const static int MAX_THREAD = 64;
#if defined(_MSC_VER)
struct MY_TLS_ITEM
{
std::map<int, int> theMap;
char padding[64 - sizeof(theMap)];
};
__declspec(align(64)) GlobalOptimizationVariables tls[MAX_THREAD]; __declspec(align(64)) GlobalOptimizationVariables tls[MAX_THREAD];
#elif defined(__GNUC__)
GlobalOptimizationVariables tls[MAX_THREAD] __attribute__((aligned(64)));
#endif
//#pragma omp threadprivate(global) //#pragma omp threadprivate(global)
// struct OptimizationCallback { // struct OptimizationCallback {