refactoring: removed unnecessary

src/CFGraph/CFGraph.cpp

@@ -8,8 +8,8 @@
 #include <chrono>
 #include <functional>
 
-#include "../Utils/SgUtils.h"
-#include "../Utils/CommonBlock.h"
+#include "SgUtils.h"
+#include "CommonBlock.h"
 #include "graph_calls.h"
 
 #include "dvm.h"

src/CFGraph/DataFlow/backward_data_flow.h

@@ -5,7 +5,7 @@
 #include <set>
 #include <algorithm>
 
-#include "../../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "../CFGraph.h"
 #include "../IR.h"
 

src/CFGraph/DataFlow/backward_data_flow_impl.h

@@ -5,7 +5,7 @@
 #include <set>
 #include <algorithm>
 
-#include "../../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "../CFGraph.h"
 #include "../IR.h"
 #include "../RD_subst.h"

src/CFGraph/DataFlow/data_flow.h

@@ -2,7 +2,7 @@
 #include<vector>
 #include<set>
 
-#include "../../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "../CFGraph.h"
 #include "../IR.h"
 

src/CFGraph/DataFlow/data_flow_impl.h

@@ -4,7 +4,7 @@
 #include<vector>
 #include<set>
 
-#include "../../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "../CFGraph.h"
 #include "../IR.h"
 

src/CFGraph/IR.cpp

@@ -5,8 +5,8 @@
 #include <vector>
 #include <set>
 
-#include "../Utils/SgUtils.h"
-#include "../Utils/CommonBlock.h"
+#include "SgUtils.h"
+#include "CommonBlock.h"
 #include "graph_calls.h"
 #include "expr_transform.h"
 

src/CFGraph/IR.h

@@ -6,7 +6,7 @@
 #include <algorithm>
 
 #include "CFGraph.h"
-#include "../Utils/CommonBlock.h"
+#include "CommonBlock.h"
 
 namespace SAPFOR
 {

src/CFGraph/RD_subst.cpp

@@ -8,8 +8,8 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "../Utils/SgUtils.h"
-#include "../Utils/CommonBlock.h"
+#include "SgUtils.h"
+#include "CommonBlock.h"
 #include "graph_calls.h"
 #include "expr_transform.h"
 

src/CFGraph/RD_subst.h

@@ -2,8 +2,8 @@
 
 #include<unordered_map>
 
-#include "../Utils/SgUtils.h"
-#include "../Utils/CommonBlock.h"
+#include "SgUtils.h"
+#include "CommonBlock.h"
 #include "graph_calls.h"
 
 #include "CFGraph.h"

src/CFGraph/live_variable_analysis.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "CFGraph.h"
 
 namespace LIVE_VARIABLES

src/CFGraph/private_variables_analysis.cpp

@@ -1,6 +1,6 @@
-#include "../Utils/errors.h"
+#include "errors.h"
 #include "private_variables_analysis.h"
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 #include "../LoopAnalyzer/loop_analyzer.h"
 #include "../SageAnalysisTool/depGraph.h"
 #include "../DirectiveProcessing/directive_parser.h"

src/CFGraph/private_variables_analysis.h

@@ -1,5 +1,5 @@
-#include "../Utils/SgUtils.h"
-#include "../GraphLoop/graph_loops.h"
+#include "SgUtils.h"
+#include "graph_loops.h"
 #include "CFGraph.h"
 
 #include <string>

src/CreateInterTree/CreateInterTree.cpp

@@ -1,7 +1,7 @@
 #include "CreateInterTree.h"
-#include "../Utils/SgUtils.h"
-#include "../Utils/utils.h"
-#include "../GraphCall/graph_calls_func.h"
+#include "SgUtils.h"
+#include "utils.h"
+#include "graph_calls_func.h"
 
 using std::string;
 using std::wstring;

src/CreateInterTree/CreateInterTree.h

@@ -8,7 +8,7 @@
 
 #include "dvm.h"
 
-#include "../GraphLoop/graph_loops_func.h"
+#include "graph_loops_func.h"
 
 struct SpfInterval
 {

src/DirectiveProcessing/directive_analyzer.cpp

@@ -16,9 +16,9 @@
 #include <assert.h>
 
 #include "../Distribution/DvmhDirective.h"
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 #include "directive_analyzer.h"
-#include "../Utils/utils.h"
+#include "utils.h"
 
 using std::vector;
 using std::map;

src/DirectiveProcessing/directive_analyzer.h

@@ -1,6 +1,6 @@
 #pragma once
 
 #include <vector>
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 
 void UniteNestedDirectives(std::vector<LoopGraph*> &loopGraph);

src/DirectiveProcessing/directive_creator.cpp

@@ -15,18 +15,18 @@
 #include "../Distribution/Distribution.h"
 #include "../Distribution/DvmhDirective_func.h"
 
-#include "../Utils/errors.h"
+#include "errors.h"
 #include "../LoopAnalyzer/loop_analyzer.h"
 #include "directive_parser.h"
 #include "directive_creator.h"
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "../Sapfor.h"
-#include "../GraphLoop/graph_loops_func.h"
+#include "graph_loops_func.h"
 #include "../Transformations/LoopNesting/loop_transform.h"
 #include "expr_transform.h"
-#include "../GraphCall/graph_calls_func.h"
+#include "graph_calls_func.h"
 
-#include "../Utils/AstWrapper.h"
+#include "AstWrapper.h"
 
 #define PRINT_DIR_RESULT 0
 

src/DirectiveProcessing/directive_creator.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include "../Distribution/Distribution.h"
-#include "../Utils/errors.h"
-#include "../GraphLoop/graph_loops.h"
-#include "../Utils/types.h"
+#include "errors.h"
+#include "graph_loops.h"
+#include "types.h"
 
 void createParallelDirectives(const std::map<LoopGraph*, std::map<DIST::Array*, ArrayInfo*>> &loopInfo,
                               const std::vector<ParallelRegion*>& regions, 

src/DirectiveProcessing/directive_creator_base.cpp

@@ -12,7 +12,7 @@
 #include "../Distribution/Arrays.h"
 #include "../Transformations/LoopNesting/loop_transform.h"
 
-#include "../Utils/errors.h"
+#include "errors.h"
 #include "directive_parser.h"
 #include "directive_creator.h"
 

src/DirectiveProcessing/directive_omp_parser.cpp

@@ -9,7 +9,7 @@
 #include "directive_omp_parser.h"
 #include "directive_parser.h"
 
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 
 using std::vector;
 using std::map;

src/DirectiveProcessing/directive_omp_parser.h

@@ -4,7 +4,7 @@
 #include <map>
 #include <vector>
 
-#include "../Utils/errors.h"
+#include "errors.h"
 
 #define SPF_USER_DIR 777
 #define SPF_USER_DIR_COPY 999

src/DirectiveProcessing/directive_parser.cpp

@@ -12,10 +12,10 @@
 #include <assert.h>
 
 #include "directive_parser.h"
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "../LoopAnalyzer/loop_analyzer.h"
-#include "../Utils/AstWrapper.h"
-#include "../Utils/errors.h"
+#include "AstWrapper.h"
+#include "errors.h"
 
 using std::string;
 using std::vector;

src/DirectiveProcessing/directive_parser.h

@@ -4,8 +4,8 @@
 #include <set>
 #include <map>
 
-#include "../Utils/AstWrapper.h"
-#include "../GraphLoop/graph_loops.h"
+#include "AstWrapper.h"
+#include "graph_loops.h"
 #include "../Distribution/DvmhDirective.h"
 
 struct DvmDirective

src/DirectiveProcessing/insert_directive.cpp

@@ -16,13 +16,13 @@
 #include "../Distribution/Arrays.h"
 #include "../Distribution/Distribution.h"
 #include "../Distribution/DvmhDirective_func.h"
-#include "../GraphLoop/graph_loops_func.h"
-#include "../GraphCall/graph_calls_func.h"
+#include "graph_loops_func.h"
+#include "graph_calls_func.h"
 
-#include "../Utils/errors.h"
+#include "errors.h"
 #include "../LoopAnalyzer/loop_analyzer.h"
 #include "directive_parser.h"
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "../Sapfor.h"
 #include "directive_creator.h"
 #include "insert_directive.h"

src/DirectiveProcessing/remote_access.cpp

@@ -18,13 +18,13 @@
 
 #include "dvm.h"
 #include "../LoopAnalyzer/loop_analyzer.h"
-#include "../Utils/types.h"
-#include "../Utils/errors.h"
-#include "../Utils/SgUtils.h"
+#include "types.h"
+#include "errors.h"
+#include "SgUtils.h"
 #include "../Distribution/Arrays.h"
 #include "graph_calls.h"
-#include "../GraphCall/graph_calls_func.h"
-#include "../GraphLoop/graph_loops_func.h"
+#include "graph_calls_func.h"
+#include "graph_loops_func.h"
 #include "remote_access.h"
 
 using std::vector;

src/DirectiveProcessing/remote_access_base.cpp

@@ -18,7 +18,7 @@
 
 #include "../Distribution/Arrays.h"
 #include "graph_calls.h"
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 #include "../ParallelizationRegions/ParRegions.h"
 #include "remote_access.h"
 

src/DirectiveProcessing/shadow.cpp

@@ -5,14 +5,14 @@
 #include <string>
 #include <vector>
 
-#include "../Utils/errors.h"
-#include "../Utils/utils.h"
-#include "../GraphLoop/graph_loops_func.h"
+#include "errors.h"
+#include "utils.h"
+#include "graph_loops_func.h"
 #include "graph_calls.h"
-#include "../GraphCall/graph_calls_func.h"
+#include "graph_calls_func.h"
 #include "directive_parser.h"
 #include "../Distribution/DvmhDirective_func.h"
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "expr_transform.h"
 
 #include "../CFGraph/CFGraph.h"

src/DirectiveProcessing/spf_directive_preproc.cpp

@@ -12,11 +12,11 @@
 
 #include "dvm.h"
 #include "../Sapfor.h"
-#include "../GraphLoop/graph_loops.h"
-#include "../GraphCall/graph_calls_func.h"
+#include "graph_loops.h"
+#include "graph_calls_func.h"
 #include "../SageAnalysisTool/depInterfaceExt.h"
-#include "../Utils/SgUtils.h"
-#include "../Utils/errors.h"
+#include "SgUtils.h"
+#include "errors.h"
 #include "directive_parser.h"
 #include "expr_transform.h"
 #include "../LoopAnalyzer/loop_analyzer.h"

src/Distribution/Array.cpp

@@ -1,6 +1,6 @@
 #include "Array.h"
-#include "../Utils/errors.h"
-#include "../Utils/utils.h"
+#include "errors.h"
+#include "utils.h"
 #include "graph_calls.h"
 
 using namespace std;

src/Distribution/Array.h

@@ -7,9 +7,9 @@
 #include <algorithm>
 #include <climits>
 #include "DvmhDirectiveBase.h"
-#include "../Utils/utils.h"
-#include "../Utils/errors.h"
-#include "../Utils/json.hpp"
+#include "utils.h"
+#include "errors.h"
+#include "json.hpp"
 
 class Symbol;
 class Expression;

src/Distribution/ArrayAnalysis.cpp

@@ -1,8 +1,8 @@
 #include "Array.h"
-#include "../Utils/errors.h"
-#include "../Utils/utils.h"
+#include "errors.h"
+#include "utils.h"
 #include "graph_calls.h"
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "../DirectiveProcessing/directive_parser.h"
 #include "../DirectiveProcessing/directive_omp_parser.h"
 #include "../LoopAnalyzer/loop_analyzer.h"

src/Distribution/CreateDistributionDirs.cpp

@@ -14,9 +14,9 @@
 #include "GraphCSR.h"
 #include "Arrays.h"
 
-#include "../Utils/errors.h"
-#include "../Utils/utils.h"
-#include "../GraphLoop/graph_loops.h"
+#include "errors.h"
+#include "utils.h"
+#include "graph_loops.h"
 
 using std::vector;
 using std::set;

src/Distribution/CreateDistributionDirs.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../GraphLoop/graph_loops.h"
-#include "../Utils/errors.h"
+#include "graph_loops.h"
+#include "errors.h"
 
 void createDistributionDirs(DIST::GraphCSR<int, double, attrType> &reducedG, DIST::Arrays<int> &allArrays, 
                             DataDirective &dataDirectives, std::map<std::string, std::vector<Messages>> &allMessages, 

src/Distribution/Cycle.h

@@ -3,7 +3,7 @@
 #include <vector>
 #include <algorithm>
 
-#include "../Utils/types.h"
+#include "types.h"
 
 namespace Distribution
 {

src/Distribution/Distribution.cpp

@@ -30,9 +30,9 @@ using namespace std::chrono;
 #include "Arrays.h"
 #include "Array.h"
 #include "Distribution.h"
-#include "../Utils/utils.h"
-#include "../Utils/errors.h"
-#include "../Utils/types.h"
+#include "utils.h"
+#include "errors.h"
+#include "types.h"
 #include "../Distribution/Cycle.h"
 #include "../VisualizerCalls/get_information.h"
 #include "../VisualizerCalls/SendMessage.h"

src/Distribution/DvmhDirective.cpp

@@ -7,12 +7,12 @@
 #include <string>
 #include <algorithm>
 
-#include "../Utils/types.h"
+#include "types.h"
 #include "DvmhDirective.h"
-#include "../Utils/errors.h"
-#include "../Utils/SgUtils.h"
+#include "errors.h"
+#include "SgUtils.h"
 #include "../Sapfor.h"
-#include "../GraphCall/graph_calls_func.h"
+#include "graph_calls_func.h"
 
 #include "dvm.h"
 

src/Distribution/DvmhDirective.h

@@ -7,9 +7,9 @@
 
 #include "Array.h"
 #include "DvmhDirectiveBase.h"
-#include "../Utils/AstWrapper.h"
-#include "../Utils/types.h"
-#include "../Utils/utils.h"
+#include "AstWrapper.h"
+#include "types.h"
+#include "utils.h"
 
 extern int sharedMemoryParallelization;
 

src/Distribution/DvmhDirectiveBase.cpp

@@ -10,11 +10,11 @@
 #include "../Distribution/Array.h"
 #include "../Distribution/Arrays.h"
 #include "../Distribution/GraphCSR.h"
-#include "../Utils/errors.h"
-#include "../Utils/utils.h"
-#include "../Utils/json.hpp"
+#include "errors.h"
+#include "utils.h"
+#include "json.hpp"
 
-#include "../GraphCall/graph_calls_func.h"
+#include "graph_calls_func.h"
 
 using std::vector;
 using std::tuple;

src/Distribution/DvmhDirectiveBase.h

@@ -3,7 +3,7 @@
 #include <vector>
 #include <string>
 
-#include "../Utils/json.hpp"
+#include "json.hpp"
 
 typedef enum lang : int { LANG_C, LANG_F } language;
 typedef enum dist : int { BLOCK, NONE } distType;

src/Distribution/DvmhDirective_func.h

@@ -4,7 +4,7 @@
 #include <string>
 #include <set>
 #include "dvm.h"
-#include "../Utils/types.h"
+#include "types.h"
 
 SgExpression* createAndSetNext(const int side, const int variant, SgExpression *p);
 std::vector<SgExpression*> genSubscripts(const std::vector<std::pair<int, int>> &shadowRenew, const std::vector<std::pair<int, int>> &shadowRenewShifts);

src/Distribution/GraphCSR.cpp

@@ -19,8 +19,8 @@ extern int passDone;
 #include "Cycle.h"
 #include "Arrays.h"
 #include "Array.h"
-#include "../Utils/errors.h"
-#include "../Utils/utils.h"
+#include "errors.h"
+#include "utils.h"
 #include "../VisualizerCalls/get_information.h"
 #include "../VisualizerCalls/SendMessage.h"
 

src/Distribution/GraphCSR.h

@@ -5,7 +5,7 @@
 #include <set>
 #include <tuple>
 
-#include "../Utils/RationalNum.h"
+#include "RationalNum.h"
 
 typedef enum links { RR_link, WR_link, WW_link } LinkType;
 

src/DvmhRegions/DvmhRegion.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../GraphLoop/graph_loops_func.h"
+#include "graph_loops_func.h"
 
 #include <string>
 

src/DvmhRegions/DvmhRegionInserter.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../GraphCall/graph_calls_func.h"
-#include "../GraphLoop/graph_loops_func.h"
+#include "graph_calls_func.h"
+#include "graph_loops_func.h"
 #include "expr_transform.h"
 #include "../ParallelizationRegions/ParRegions.h"
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "ReadWriteAnalyzer.h"
 #include "DvmhRegion.h"
 

src/DvmhRegions/LoopChecker.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../GraphLoop/graph_loops_func.h"
-#include "../GraphCall/graph_calls_func.h"
+#include "graph_loops_func.h"
+#include "graph_calls_func.h"
 
 #include <vector>
 #include <string>

src/DvmhRegions/ReadWriteAnalyzer.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "dvm.h"
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "VarUsages.h"
 #include <set>
 #include <tuple>

src/DvmhRegions/TypedSymbol.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "dvm.h"
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include <string>
 
 enum class VAR_TYPE { VAR_ARR, VAR_DISTR_ARR, VAR_SCALAR, VAR_ANY, VAR_UNDEFINED };

src/DynamicAnalysis/createParallelRegions.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Utils/utils.h"
+#include "utils.h"
 
 #include "./gcov_info.h"
 #include "../CreateInterTree/CreateInterTree.h"

src/DynamicAnalysis/gCov_parser.cpp

@@ -8,7 +8,7 @@
 
 #include "dvm.h"
 #include "gCov_parser_func.h"
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 
 using namespace std;
 

src/DynamicAnalysis/gCov_parser_func.h

@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "dvm.h"
-#include "../Utils/errors.h"
+#include "errors.h"
 #include "gcov_info.h"
 #include "../CreateInterTree/CreateInterTree.h"
 

src/DynamicAnalysis/gcov_info.cpp

@@ -4,7 +4,7 @@
 #include <map>
 #include <algorithm>
 
-#include "../Utils/errors.h"
+#include "errors.h"
 
 #include "gcov_info.h"
 

src/DynamicAnalysis/gcov_info.h

@@ -5,7 +5,7 @@
 #include <map>
 #include <stdint.h>
 
-#include "../Utils/utils.h"
+#include "utils.h"
 
 //make 'class' - need friend for Gcov_info
 struct Perform

src/GraphCall/graph_calls.cpp

@@ -15,10 +15,10 @@
 #include "graph_calls_func.h"
 
 #include "../CFGraph/CFGraph.h"
-#include "../GraphLoop/graph_loops_func.h"
+#include "graph_loops_func.h"
 #include "../DirectiveProcessing/directive_parser.h"
-#include "../Utils/SgUtils.h"
-#include "../Utils/json.hpp"
+#include "SgUtils.h"
+#include "json.hpp"
 #include "../ParallelizationRegions/ParRegions_func.h"
 #include "../DynamicAnalysis/gCov_parser_func.h"
 #include "expr_transform.h"

src/GraphCall/graph_calls.h

@@ -3,10 +3,10 @@
 #include <string>
 #include <set>
 
-#include "../Utils/AstWrapper.h"
-#include "../Utils/utils.h"
+#include "AstWrapper.h"
+#include "utils.h"
 #include "../DirectiveProcessing/shadow.h"
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 
 static const char* paramNames[] = 
 { "NONE_T", "ARRAY_T", "STRING_ARRAY_T", "STRING_T", "SCALAR_CHAR_T", "SCALAR_BOOL_T", "SCALAR_SHORT_T", "SCALAR_INT_T", "SCALAR_LONG_INT_T",

src/GraphCall/graph_calls_base.cpp

@@ -10,10 +10,10 @@
 #include <set>
 #include <string>
 
-#include "../Utils/errors.h"
+#include "errors.h"
 #include "graph_calls.h"
 #include "../Distribution/Distribution.h"
-#include "../Utils/utils.h"
+#include "utils.h"
 #include "../ParallelizationRegions/ParRegions.h"
 
 using std::vector;

src/GraphCall/graph_calls_func.h

@@ -5,7 +5,7 @@
 #include <set>
 
 #include "graph_calls.h"
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 #include "../ParallelizationRegions/ParRegions.h"
 #include "Utils/json.hpp"
 

src/GraphLoop/graph_loops.cpp

@@ -12,7 +12,7 @@
 
 #include "dvm.h"
 #include "../Sapfor.h"
-#include "../GraphCall/graph_calls_func.h"
+#include "graph_calls_func.h"
 #include "../ParallelizationRegions/ParRegions_func.h"
 #include "expr_transform.h"
 
@@ -21,12 +21,12 @@
 #include "../Distribution/Distribution.h"
 
 #include "graph_loops.h"
-#include "../Utils/utils.h"
-#include "../Utils/SgUtils.h"
+#include "utils.h"
+#include "SgUtils.h"
 
-#include "../Utils/errors.h"
-#include "../Utils/AstWrapper.h"
-#include "../Utils/json.hpp"
+#include "errors.h"
+#include "AstWrapper.h"
+#include "json.hpp"
 
 #include "../DirectiveProcessing/directive_parser.h"
 #include "../DynamicAnalysis/gCov_parser_func.h"

src/GraphLoop/graph_loops.h

@@ -5,8 +5,8 @@
 #include <map>
 #include <set>
 
-#include "../Utils/errors.h"
-#include "../Utils/types.h"
+#include "errors.h"
+#include "types.h"
 #include "../Distribution/DvmhDirective.h"
 #include "../Distribution/Distribution.h"
 

src/GraphLoop/graph_loops_base.cpp

@@ -23,8 +23,8 @@ using std::make_pair;
 using std::get;
 
 #include "graph_loops.h"
-#include "../GraphCall/graph_calls_func.h"
-#include "../Utils/errors.h"
+#include "graph_calls_func.h"
+#include "errors.h"
 #include "../Distribution/Distribution.h"
 #include "../Distribution/CreateDistributionDirs.h"
 #include "../ParallelizationRegions/ParRegions.h"

src/LoopAnalyzer/allocations_prepoc.cpp

@@ -8,8 +8,8 @@
 #include <set>
 
 #include "dvm.h"
-#include "../Utils/SgUtils.h"
-#include "../Utils/errors.h"
+#include "SgUtils.h"
+#include "errors.h"
 
 using std::set;
 using std::pair;

src/LoopAnalyzer/dep_analyzer.cpp

@@ -20,8 +20,8 @@
 #include "dvm.h"
 #include "loop_analyzer.h"
 
-#include "../Utils/utils.h"
-#include "../Utils/SgUtils.h"
+#include "utils.h"
+#include "SgUtils.h"
 #include "../ParallelizationRegions/ParRegions_func.h"
 #include "../SageAnalysisTool/depGraph.h"
 #include "../SageAnalysisTool/OmegaForSage/include/lang-interf.h"

src/LoopAnalyzer/loop_analyzer.cpp

@@ -30,15 +30,15 @@ extern int passDone;
 #include "../Distribution/Arrays.h"
 #include "../ParallelizationRegions/ParRegions.h"
 
-#include "../Utils/errors.h"
+#include "errors.h"
 #include "../DirectiveProcessing/directive_parser.h"
 #include "../DirectiveProcessing/directive_creator.h"
 
-#include "../Utils/SgUtils.h"
-#include "../Utils/AstWrapper.h"
+#include "SgUtils.h"
+#include "AstWrapper.h"
 
-#include "../GraphCall/graph_calls_func.h"
-#include "../GraphLoop/graph_loops_func.h"
+#include "graph_calls_func.h"
+#include "graph_loops_func.h"
 #include "../ParallelizationRegions/ParRegions_func.h"
 #include "../DynamicAnalysis/gCov_parser_func.h"
 

src/LoopAnalyzer/loop_analyzer.h

@@ -5,12 +5,12 @@
 #include <tuple>
 #include <vector>
 #include <set>
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 #include "graph_calls.h"
 #include "../ParallelizationRegions/ParRegions.h"
 #include "../SageAnalysisTool/depInterfaceExt.h"
-#include "../Utils/AstWrapper.h"
-#include "../Utils/SgUtils.h"
+#include "AstWrapper.h"
+#include "SgUtils.h"
 
 #include "dvm.h"
 

src/ParallelizationRegions/ParRegions.cpp

@@ -10,10 +10,10 @@
 
 #include "dvm.h"
 #include "ParRegions.h"
-#include "../Utils/utils.h"
-#include "../Utils/SgUtils.h"
-#include "../GraphCall/graph_calls_func.h"
-#include "../GraphLoop/graph_loops.h"
+#include "utils.h"
+#include "SgUtils.h"
+#include "graph_calls_func.h"
+#include "graph_loops.h"
 #include "../Distribution/Distribution.h"
 #include "expr_transform.h"
 

src/ParallelizationRegions/ParRegions.h

@@ -9,12 +9,12 @@
 #include "../Distribution/DvmhDirective.h"
 #include "../Distribution/GraphCSR.h"
 #include "../Distribution/Distribution.h"
-#include "../Utils/AstWrapper.h"
+#include "AstWrapper.h"
 
-#include "../Utils/json.hpp"
+#include "json.hpp"
 
 #if __SPF
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 #endif
 
 struct ParallelRegionLines

src/ParallelizationRegions/ParRegions_func.h

@@ -2,7 +2,7 @@
 
 #include "ParRegions.h"
 #include "graph_calls.h"
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 
 void fillRegionLines(SgFile *file, std::vector<ParallelRegion*> &regions, std::vector<Messages>& messagesForFile, std::vector<LoopGraph*> *loops = NULL, std::vector<FuncInfo*> *funcs = NULL);
 void fillRegionLinesStep2(std::vector<ParallelRegion*> &regions, const std::map<std::string, std::vector<FuncInfo*>> &allFuncInfo, std::map<std::string, std::vector<LoopGraph*>> *loopGraph = NULL);

src/ParallelizationRegions/expand_extract_reg.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ParRegions.h"
-#include "../Utils/SgUtils.h"
-#include "../Utils/errors.h"
+#include "SgUtils.h"
+#include "errors.h"
 
 bool expandExtractReg(const std::string &fileName, const int startLine, const int endLine, const std::vector<ParallelRegion*> &regions, std::vector<Messages> &messagesForFile, const bool toDelete = false);

src/ParallelizationRegions/resolve_par_reg_conflicts.cpp

@@ -11,12 +11,12 @@
 #include "ParRegions_func.h"
 #include "resolve_par_reg_conflicts.h"
 
-#include "../GraphCall/graph_calls_func.h"
-#include "../GraphLoop/graph_loops_func.h"
+#include "graph_calls_func.h"
+#include "graph_loops_func.h"
 #include "../LoopAnalyzer/loop_analyzer.h"
 #include "../DirectiveProcessing/directive_creator.h"
 #include "../DirectiveProcessing/insert_directive.h"
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "expr_transform.h"
 #include "../Transformations/FunctionPurifying/function_purifying.h"
 

src/ParallelizationRegions/resolve_par_reg_conflicts.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "ParRegions.h"
-#include "../Utils/SgUtils.h"
-#include "../Utils/errors.h"
+#include "SgUtils.h"
+#include "errors.h"
 #include "graph_calls.h"
 
 void fillRegionIntervals(std::vector<ParallelRegion*> &regions);

src/Predictor/PredictScheme.cpp

@@ -16,10 +16,10 @@
 #include "../DynamicAnalysis/gcov_info.h"
 #include "../DynamicAnalysis/gCov_parser_func.h"
 #include "PredictScheme.h"
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "../DirectiveProcessing/directive_parser.h"
 #include "../Distribution/DvmhDirective.h"
-#include "../GraphLoop/graph_loops_func.h"
+#include "graph_loops_func.h"
 #include "expr_transform.h"
 #include "../LoopAnalyzer/loop_analyzer.h"
 #include "../CFGraph/CFGraph.h"

src/Predictor/PredictScheme.h

@@ -2,7 +2,7 @@
 #include <vector>
 #include "dvm.h"
 #include "graph_calls.h"
-#include "../Utils/json.hpp"
+#include "json.hpp"
 
 class ParallelStats
 {

src/PrivateAnalyzer/private_arrays_search.cpp

@@ -9,8 +9,8 @@
 #include "private_arrays_search.h"
 #include "range_structures.h"
 #include "region.h"
-#include "../Utils/SgUtils.h"
-#include "../GraphLoop/graph_loops.h"
+#include "SgUtils.h"
+#include "graph_loops.h"
 #include "../CFGraph/CFGraph.h"
 
 using namespace std;

src/PrivateAnalyzer/private_arrays_search.h

@@ -6,7 +6,7 @@
 
 #include "range_structures.h"
 #include "region.h"
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 #include "../CFGraph/CFGraph.h"
 
 void Collapse(Region* region);

src/PrivateAnalyzer/region.cpp

@@ -8,7 +8,7 @@
 #include "range_structures.h"
 #include "region.h"
 
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 
 using namespace std;
 

src/PrivateAnalyzer/region.h

@@ -5,7 +5,7 @@
 #include <unordered_set>
 #include <string>
 
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 #include "../CFGraph/CFGraph.h"
 
 class Region : public SAPFOR::BasicBlock {

src/ProjectManipulation/ConvertFiles.cpp

@@ -6,9 +6,9 @@
 #include <string>
 #include <vector>
 
-#include "../Utils/errors.h"
-#include "../Utils/SgUtils.h"
-#include "../Utils/utils.h"
+#include "errors.h"
+#include "SgUtils.h"
+#include "utils.h"
 
 #include "../VerificationCode/verifications.h"
 

src/ProjectManipulation/FileInfo.cpp

@@ -7,8 +7,8 @@
 #include <vector>
 
 #include "FileInfo.h"
-#include "../Utils/utils.h"
-#include "../Utils/errors.h"
+#include "utils.h"
+#include "errors.h"
 
 using namespace std;
 

src/ProjectManipulation/ParseFiles.cpp

@@ -22,8 +22,8 @@
 #include <thread>
 #include <stack>
 
-#include "../Utils/errors.h"
-#include "../Utils/SgUtils.h"
+#include "errors.h"
+#include "SgUtils.h"
 #include "../VisualizerCalls/get_information.h"
 #include "../VisualizerCalls/SendMessage.h"
 

src/ProjectManipulation/PerfAnalyzer.cpp

@@ -6,8 +6,8 @@
 #include <string>
 #include <vector>
 
-#include "../Utils/errors.h"
-#include "../Utils/SgUtils.h"
+#include "errors.h"
+#include "SgUtils.h"
 
 #include "StdCapture.h"
 

src/ProjectParameters/projectParameters.cpp

@@ -12,10 +12,10 @@
 #include <tuple>
 
 #include "dvm.h"
-#include "../Utils/errors.h"
-#include "../Utils/SgUtils.h"
+#include "errors.h"
+#include "SgUtils.h"
 #include "graph_calls.h"
-#include "../GraphCall/graph_calls_func.h"
+#include "graph_calls_func.h"
 
 #include "projectParameters.h"
 

src/SageAnalysisTool/defUse.cpp

@@ -5,8 +5,8 @@
 #include <string>
 
 #include "graph_calls.h"
-#include "../Utils/errors.h"
-#include "../Utils/utils.h"
+#include "errors.h"
+#include "utils.h"
 #include "sage++user.h"
 #include "definesValues.h"
 #include "set.h"

src/SageAnalysisTool/depGraph.cpp

@@ -16,7 +16,7 @@ extern "C" void removeFromCollection(void *pointer);
 extern int passDone;
 
 #include "graph_calls.h"
-#include "../Utils/errors.h"
+#include "errors.h"
 #include "../VisualizerCalls/get_information.h"
 
 #include "sage++user.h"

src/Transformations/ArrayDimsSwapping/swap_array_dims.cpp

@@ -11,9 +11,9 @@
 #include "../Distribution/Array.h"
 #include "dvm.h"
 
-#include "../Utils/errors.h"
-#include "../Utils/utils.h"
-#include "../Utils/SgUtils.h"
+#include "errors.h"
+#include "utils.h"
+#include "SgUtils.h"
 
 using namespace std;
 

src/Transformations/CheckPoints/checkpoints.cpp

@@ -4,8 +4,8 @@
 #include <string>
 #include <set>
 
-#include "../Utils/SgUtils.h"
-#include "../Utils/utils.h"
+#include "SgUtils.h"
+#include "utils.h"
 #include "expr_transform.h"
 
 #include "checkpoints.h"

src/Transformations/DeadCodeRemoving/dead_code.h

@@ -3,7 +3,7 @@
 #include<string>
 #include<vector>
 
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "../CFGraph/CFGraph.h"
 #include "../CFGraph/live_variable_analysis.h"
 #include "../CFGraph/DataFlow/data_flow.h"

src/Transformations/ExpressionSubstitution/expr_transform.cpp

@@ -19,11 +19,11 @@ extern int passDone;
 
 #include "../ParallelizationRegions/ParRegions.h"
 #include "../ParallelizationRegions/ParRegions_func.h"
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 #include "graph_calls.h"
-#include "../GraphCall/graph_calls_func.h"
-#include "../Utils/utils.h"
-#include "../Utils/SgUtils.h"
+#include "graph_calls_func.h"
+#include "utils.h"
+#include "SgUtils.h"
 #include "../Distribution/Distribution.h"
 #include "../VisualizerCalls/get_information.h"
 #include "expr_transform.h"

src/Transformations/ExpressionSubstitution/expr_transform.h

@@ -5,10 +5,10 @@
 #include <string>
 #include "dvm.h"
 #include "../Distribution/Distribution.h"
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 #include "../ParallelizationRegions/ParRegions.h"
 #include "graph_calls.h"
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 
 #include "acc_analyzer.h"
 

src/Transformations/FunctionDuplication/uniq_call_chain_dup.cpp

@@ -12,12 +12,12 @@
 #include <tuple>
 
 #include "dvm.h"
-#include "../Utils/errors.h"
-#include "../Utils/SgUtils.h"
+#include "errors.h"
+#include "SgUtils.h"
 
 #include "uniq_call_chain_dup.h"
 #include "graph_calls.h"
-#include "../GraphCall/graph_calls_func.h"
+#include "graph_calls_func.h"
 #include "expr_transform.h"
 #include "../VerificationCode/verifications.h"
 

src/Transformations/FunctionInlining/inliner.cpp

@@ -8,10 +8,10 @@
 #include <algorithm>
 
 #include "dvm.h"
-#include "../Utils/errors.h"
-#include "../Utils/utils.h"
-#include "../Utils/SgUtils.h"
-#include "../GraphCall/graph_calls_func.h"
+#include "errors.h"
+#include "utils.h"
+#include "SgUtils.h"
+#include "graph_calls_func.h"
 #include "inliner.h"
 #include "../VisualizerCalls/SendMessage.h"
 #include "expr_transform.h"

src/Transformations/FunctionPurifying/function_purifying.cpp

@@ -11,10 +11,10 @@
 #include <string>
 
 #include "dvm.h"
-#include "../GraphCall/graph_calls_func.h"
-#include "../Utils/SgUtils.h"
-#include "../Utils/CommonBlock.h"
-#include "../Utils/DefUseList.h"
+#include "graph_calls_func.h"
+#include "SgUtils.h"
+#include "CommonBlock.h"
+#include "DefUseList.h"
 #include "expr_transform.h"
 #include "../VerificationCode/verifications.h"
 #include "../DvmhRegions/DvmhRegionInserter.h"

src/Transformations/GlobalVariables/fix_common_blocks.h

@@ -8,7 +8,7 @@
 #include <algorithm>
 
 #include "dvm.h"
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 
 #include "../LoopAnalyzer/loop_analyzer.h"
 #include "expr_transform.h"

src/Transformations/LoopCombining/loops_combiner.cpp

@@ -2,8 +2,8 @@
 
 #include "../LoopAnalyzer/loop_analyzer.h"
 #include "expr_transform.h"
-#include "../Utils/errors.h"
-#include "../Utils/SgUtils.h"
+#include "errors.h"
+#include "SgUtils.h"
 #include <string>
 #include <vector>
 #include <queue>

src/Transformations/LoopCombining/loops_combiner.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "dvm.h"
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 #include "../SageAnalysisTool/depGraph.h"
 #include "../SageAnalysisTool/OmegaForSage/include/lang-interf.h"
 #include "../DirectiveProcessing/directive_parser.h"

src/Transformations/LoopEndDoConverter/enddo_loop_converter.cpp

@@ -11,9 +11,9 @@
 
 #include "dvm.h"
 #include "enddo_loop_converter.h"
-#include "../Utils/errors.h"
-#include "../Utils/utils.h"
-#include "../Utils/SgUtils.h"
+#include "errors.h"
+#include "utils.h"
+#include "SgUtils.h"
 
 using namespace std;
 

src/Transformations/LoopEndDoConverter/enddo_loop_converter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Utils/errors.h"
+#include "errors.h"
 
 void ConverToEndDo(SgFile *file, std::vector<Messages> &messagesForFile);
 std::vector<SgStatement*> createIfConditions(std::stack<SgExpression*>& conds, std::stack<SgStatement*>& ifBlocks, SgStatement *control);

src/Transformations/LoopNesting/loop_transform.cpp

@@ -8,9 +8,9 @@
 #include "../DirectiveProcessing/directive_parser.h"
 #include "../SageAnalysisTool/OmegaForSage/include/lang-interf.h"
 #include "../SageAnalysisTool/definesValues.h"
-#include "../Utils/SgUtils.h"
+#include "SgUtils.h"
 #include "../SageAnalysisTool/depGraph.h"
-#include "../GraphCall/graph_calls_func.h"
+#include "graph_calls_func.h"
 
 using std::pair;
 using std::map;

src/Transformations/LoopNesting/loop_transform.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <map>
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 
 void reverseCreatedNestedLoops(const std::string &file, std::vector<LoopGraph*> &loopsInFile);
 bool createNestedLoops(LoopGraph *current, const std::map<LoopGraph*, void*> &depInfoForLoopGraph,

src/Transformations/LoopSplitting/loops_splitter.cpp

@@ -5,7 +5,7 @@
 
 #include "../LoopAnalyzer/loop_analyzer.h"
 #include "expr_transform.h"
-#include "../Utils/errors.h"
+#include "errors.h"
 #include "../CFGraph/CFGraph.h"
 #include "../SageAnalysisTool/OmegaForSage/include/lang-interf.h"
 #include "../DirectiveProcessing/directive_parser.h"

src/Transformations/LoopSplitting/loops_splitter.h

@@ -4,8 +4,8 @@
 #include <map>
 
 #include "dvm.h"
-#include "../GraphLoop/graph_loops.h"
+#include "graph_loops.h"
 #include "../SageAnalysisTool/depGraph.h"
-#include "../Utils/CommonBlock.h"
+#include "CommonBlock.h"
 
 int splitLoops(SgFile *file, std::vector<LoopGraph*> &loopGraphs, std::vector<Messages> &messages, const std::map<LoopGraph*, depGraph*>& depInfoForLoopGraph, const std::map<std::string, CommonBlock*>& commonBlocks, const std::map<std::string, std::vector<FuncInfo*>>& allFuncInfo, int& countOfTransform);

src/Transformations/LoopUnrolling/loops_unrolling.cpp

@@ -1,8 +1,8 @@
 #include "loops_unrolling.h"
 
 #include "../LoopAnalyzer/loop_analyzer.h"
-#include "../Utils/errors.h"
-#include "../GraphLoop/graph_loops_func.h"
+#include "errors.h"
+#include "graph_loops_func.h"
 
 #include <string>
 #include <vector>