aliyun · vamsiDT · Dec 5, 2024
diff --git a/astra-sim-alibabacloud/astra-sim/system/BaseStream.hh b/astra-sim-alibabacloud/astra-sim/system/BaseStream.hh
@@ -24,7 +24,7 @@ LICENSE file in the root directory of this source tree.
 #include "DataSet.hh"
 #include "StreamStat.hh"
 #include "Sys.hh"
-#include "astra-sim/system/topology/LogicalTopology.hh"
+#include "./topology/LogicalTopology.hh"
 
 namespace AstraSim {
 class RecvPacketEventHadndlerData;

diff --git a/astra-sim-alibabacloud/astra-sim/system/CollectivePhase.cc b/astra-sim-alibabacloud/astra-sim/system/CollectivePhase.cc
@@ -4,7 +4,7 @@ LICENSE file in the root directory of this source tree.
 *******************************************************************************/
 
 #include "CollectivePhase.hh"
-#include "astra-sim/system/collective/Algorithm.hh"
+#include "./collective/Algorithm.hh"
 namespace AstraSim {
 CollectivePhase::CollectivePhase(
     Sys* generator,

diff --git a/astra-sim-alibabacloud/astra-sim/system/MemBus.cc b/astra-sim-alibabacloud/astra-sim/system/MemBus.cc
@@ -6,7 +6,7 @@ LICENSE file in the root directory of this source tree.
 #include "MemBus.hh"
 #include "LogGP.hh"
 #include "Sys.hh"
-#include "astra-sim/system/MockNcclLog.h"
+#include "MockNcclLog.h"
 namespace AstraSim {
 MemBus::~MemBus() {
   delete NPU_side;

diff --git a/astra-sim-alibabacloud/astra-sim/system/MockNcclChannel.h b/astra-sim-alibabacloud/astra-sim/system/MockNcclChannel.h
@@ -18,7 +18,7 @@
 #include <vector>
 #include <map>
 #include <memory>
-#include "astra-sim/system/Common.hh"
+#include "Common.hh"
 #include "MockNcclGroup.h"
 
 namespace MockNccl {

diff --git a/astra-sim-alibabacloud/astra-sim/system/MockNcclGroup.cc b/astra-sim-alibabacloud/astra-sim/system/MockNcclGroup.cc
@@ -19,7 +19,7 @@
 #include<set>
 #include <queue>
 #include<cmath>
-#include "astra-sim/system/MockNcclLog.h"
+#include "MockNcclLog.h"
 using namespace std;
 namespace MockNccl {
   MockNcclGroup::MockNcclGroup(std::vector<int>ngpus,int TP_size,int gpus_per_nodes,std::vector<int> _NVSwitch,GPUType _gpu_type):g_flow_id(0),gpu_type(_gpu_type){

diff --git a/astra-sim-alibabacloud/astra-sim/system/MockNcclGroup.h b/astra-sim-alibabacloud/astra-sim/system/MockNcclGroup.h
@@ -22,8 +22,8 @@
 #include <memory>
 #include <map>
 #include <unordered_map>
-#include "astra-sim/system/Common.hh"
-#include"astra-sim/system/MockNccl.h"
+#include "Common.hh"
+#include"MockNccl.h"
 using namespace std;
 
 namespace MockNccl {

diff --git a/astra-sim-alibabacloud/astra-sim/system/PacketBundle.cc b/astra-sim-alibabacloud/astra-sim/system/PacketBundle.cc
@@ -4,7 +4,7 @@ LICENSE file in the root directory of this source tree.
 *******************************************************************************/
 
 #include "PacketBundle.hh"
-#include "astra-sim/system/MockNcclLog.h"
+#include "MockNcclLog.h"
 #include "PhyMultiThread.hh"
 namespace AstraSim {
 PacketBundle::PacketBundle(

diff --git a/astra-sim-alibabacloud/astra-sim/system/QueueLevelHandler.hh b/astra-sim-alibabacloud/astra-sim/system/QueueLevelHandler.hh
@@ -19,7 +19,7 @@ LICENSE file in the root directory of this source tree.
 #include <tuple>
 #include <vector>
 #include "AstraNetworkAPI.hh"
-#include "astra-sim/system/topology/RingTopology.hh"
+#include "./topology/RingTopology.hh"
 
 namespace AstraSim {
 class QueueLevelHandler {

diff --git a/astra-sim-alibabacloud/astra-sim/system/QueueLevels.hh b/astra-sim-alibabacloud/astra-sim/system/QueueLevels.hh
@@ -20,7 +20,7 @@ LICENSE file in the root directory of this source tree.
 #include <vector>
 #include "AstraNetworkAPI.hh"
 #include "QueueLevelHandler.hh"
-#include "astra-sim/system/topology/RingTopology.hh"
+#include "./topology/RingTopology.hh"
 
 namespace AstraSim {
 class QueueLevels {

diff --git a/astra-sim-alibabacloud/astra-sim/system/StreamBaseline.cc b/astra-sim-alibabacloud/astra-sim/system/StreamBaseline.cc
@@ -5,7 +5,7 @@ LICENSE file in the root directory of this source tree.
 
 #include "StreamBaseline.hh"
 #include "MockNcclLog.h"
-#include "astra-sim/system/collective/Algorithm.hh"
+#include "./collective/Algorithm.hh"
 namespace AstraSim {
 StreamBaseline::StreamBaseline(
     Sys* owner,

diff --git a/astra-sim-alibabacloud/astra-sim/system/Sys.cc b/astra-sim-alibabacloud/astra-sim/system/Sys.cc
@@ -14,19 +14,19 @@ LICENSE file in the root directory of this source tree.
 #include "Common.hh"
 #include "RendezvousRecvData.hh"
 #include "RendezvousSendData.hh"
-#include "astra-sim/system/collective/AllToAll.hh"
-#include "astra-sim/system/collective/DoubleBinaryTreeAllReduce.hh"
-#include "astra-sim/system/collective/HalvingDoubling.hh"
-#include "astra-sim/system/collective/Ring.hh"
-#include "astra-sim/system/collective/NcclTreeFlowModel.hh"
-#include "astra-sim/system/scheduling/OfflineGreedy.hh"
-#include "astra-sim/system/topology/BasicLogicalTopology.hh"
-#include "astra-sim/system/topology/DoubleBinaryTreeTopology.hh"
-#include "astra-sim/system/topology/GeneralComplexTopology.hh"
-#include "astra-sim/system/topology/LocalRingGlobalBinaryTree.hh"
-#include "astra-sim/system/topology/LocalRingNodeA2AGlobalDBT.hh"
-#include "astra-sim/system/topology/Torus3D.hh"
-#include "astra-sim/system/MockNcclLog.h"
+#include "./collective/AllToAll.hh"
+#include "./collective/DoubleBinaryTreeAllReduce.hh"
+#include "./collective/HalvingDoubling.hh"
+#include "./collective/Ring.hh"
+#include "./collective/NcclTreeFlowModel.hh"
+#include "./scheduling/OfflineGreedy.hh"
+#include "./topology/BasicLogicalTopology.hh"
+#include "./topology/DoubleBinaryTreeTopology.hh"
+#include "./topology/GeneralComplexTopology.hh"
+#include "./topology/LocalRingGlobalBinaryTree.hh"
+#include "./topology/LocalRingNodeA2AGlobalDBT.hh"
+#include "./topology/Torus3D.hh"
+#include "./MockNcclLog.h"
 
 #include <algorithm>
 #include <cmath>

diff --git a/astra-sim-alibabacloud/astra-sim/system/Sys.hh b/astra-sim-alibabacloud/astra-sim/system/Sys.hh
@@ -25,14 +25,14 @@ LICENSE file in the root directory of this source tree.
 #include "Common.hh"
 #include "SendPacketEventHandlerData.hh"
 #include "UsageTracker.hh"
-#include "astra-sim/system/MockNcclChannel.h"
-#include "astra-sim/system/topology/RingTopology.hh"
-#include "astra-sim/workload/Workload.hh"
+#include "MockNcclChannel.h"
+#include "./topology/RingTopology.hh"
+#include "../workload/Workload.hh"
 #ifdef NS3_MTP
 #include "ns3/mtp-interface.h"
 #endif
 #include <atomic>
-#include "astra-sim/system/MockNcclGroup.h"
+#include "MockNcclGroup.h"
 
 namespace AstraSim {
 class MemBus;

diff --git a/astra-sim-alibabacloud/astra-sim/system/UsageTracker.hh b/astra-sim-alibabacloud/astra-sim/system/UsageTracker.hh
@@ -21,7 +21,7 @@ LICENSE file in the root directory of this source tree.
 #include "Callable.hh"
 #include "Common.hh"
 #include "Usage.hh"
-#include "astra-sim/workload/CSVWriter.hh"
+#include "../workload/CSVWriter.hh"
 
 namespace AstraSim {
 class UsageTracker {

diff --git a/astra-sim-alibabacloud/astra-sim/system/collective/Algorithm.hh b/astra-sim-alibabacloud/astra-sim/system/collective/Algorithm.hh
@@ -18,11 +18,11 @@ LICENSE file in the root directory of this source tree.
 #include <sstream>
 #include <tuple>
 #include <vector>
-#include "astra-sim/system/BaseStream.hh"
-#include "astra-sim/system/CallData.hh"
-#include "astra-sim/system/Callable.hh"
-#include "astra-sim/system/Common.hh"
-#include "astra-sim/system/topology/LogicalTopology.hh"
+#include "../BaseStream.hh"
+#include "../CallData.hh"
+#include "../Callable.hh"
+#include "../Common.hh"
+#include "../topology/LogicalTopology.hh"
 
 namespace AstraSim {
 class Algorithm : public Callable {

diff --git a/astra-sim-alibabacloud/astra-sim/system/collective/AllToAll.hh b/astra-sim-alibabacloud/astra-sim/system/collective/AllToAll.hh
@@ -19,9 +19,9 @@ LICENSE file in the root directory of this source tree.
 #include <tuple>
 #include <vector>
 #include "Ring.hh"
-#include "astra-sim/system/CallData.hh"
-#include "astra-sim/system/Common.hh"
-#include "astra-sim/system/topology/RingTopology.hh"
+#include "../CallData.hh"
+#include "../Common.hh"
+#include "../topology/RingTopology.hh"
 
 namespace AstraSim {
 class AllToAll : public Ring {

diff --git a/astra-sim-alibabacloud/astra-sim/system/collective/DoubleBinaryTreeAllReduce.cc b/astra-sim-alibabacloud/astra-sim/system/collective/DoubleBinaryTreeAllReduce.cc
@@ -4,8 +4,8 @@ LICENSE file in the root directory of this source tree.
 *******************************************************************************/
 
 #include "DoubleBinaryTreeAllReduce.hh"
-#include "astra-sim/system/PacketBundle.hh"
-#include "astra-sim/system/RecvPacketEventHadndlerData.hh"
+#include "../PacketBundle.hh"
+#include "../RecvPacketEventHadndlerData.hh"
 namespace AstraSim {
 DoubleBinaryTreeAllReduce::DoubleBinaryTreeAllReduce(
     int id,

diff --git a/astra-sim-alibabacloud/astra-sim/system/collective/DoubleBinaryTreeAllReduce.hh b/astra-sim-alibabacloud/astra-sim/system/collective/DoubleBinaryTreeAllReduce.hh
@@ -20,9 +20,9 @@ LICENSE file in the root directory of this source tree.
 #include <tuple>
 #include <vector>
 #include "Algorithm.hh"
-#include "astra-sim/system/CallData.hh"
-#include "astra-sim/system/Common.hh"
-#include "astra-sim/system/topology/BinaryTree.hh"
+#include "../CallData.hh"
+#include "../Common.hh"
+#include "../topology/BinaryTree.hh"
 
 namespace AstraSim {
 class DoubleBinaryTreeAllReduce : public Algorithm {

diff --git a/astra-sim-alibabacloud/astra-sim/system/collective/HalvingDoubling.cc b/astra-sim-alibabacloud/astra-sim/system/collective/HalvingDoubling.cc
@@ -7,8 +7,8 @@ LICENSE file in the root directory of this source tree.
 #include <math.h>
 #include <stdlib.h>
 #include "Ring.hh"
-#include "astra-sim/system/PacketBundle.hh"
-#include "astra-sim/system/RecvPacketEventHadndlerData.hh"
+#include "../PacketBundle.hh"
+#include "../RecvPacketEventHadndlerData.hh"
 
 namespace AstraSim {
 HalvingDoubling::HalvingDoubling(

diff --git a/astra-sim-alibabacloud/astra-sim/system/collective/HalvingDoubling.hh b/astra-sim-alibabacloud/astra-sim/system/collective/HalvingDoubling.hh
@@ -19,10 +19,10 @@ LICENSE file in the root directory of this source tree.
 #include <tuple>
 #include <vector>
 #include "Algorithm.hh"
-#include "astra-sim/system/Common.hh"
-#include "astra-sim/system/MemBus.hh"
-#include "astra-sim/system/MyPacket.hh"
-#include "astra-sim/system/topology/RingTopology.hh"
+#include "../Common.hh"
+#include "../MemBus.hh"
+#include "../MyPacket.hh"
+#include "../topology/RingTopology.hh"
 
 namespace AstraSim {
 class HalvingDoubling : public Algorithm {

diff --git a/astra-sim-alibabacloud/astra-sim/system/collective/NcclTreeFlowModel.cc b/astra-sim-alibabacloud/astra-sim/system/collective/NcclTreeFlowModel.cc
@@ -15,16 +15,16 @@
 
 #ifdef PHY_MTP
 #include<mpi.h>
-#include "astra-sim/system/PhyMultiThread.hh"
+#include "../PhyMultiThread.hh"
 #endif
 #include<chrono>
 
 #include "NcclTreeFlowModel.hh"
-#include "astra-sim/system/PacketBundle.hh"
-#include "astra-sim/system/RecvPacketEventHadndlerData.hh"
-#include "astra-sim/system/MockNcclLog.h"
+#include "../PacketBundle.hh"
+#include "../RecvPacketEventHadndlerData.hh"
+#include "../MockNcclLog.h"
 #ifdef PHY_RDMA
-#include "astra-sim/system/SimAiFlowModelRdma.hh"
+#include "../SimAiFlowModelRdma.hh"
 extern FlowPhyRdma flow_rdma; 
 #endif
 

diff --git a/astra-sim-alibabacloud/astra-sim/system/collective/NcclTreeFlowModel.hh b/astra-sim-alibabacloud/astra-sim/system/collective/NcclTreeFlowModel.hh
@@ -31,11 +31,11 @@
 #include <vector>
 #include<condition_variable>
 #include "Algorithm.hh"
-#include "astra-sim/system/Common.hh"
-#include "astra-sim/system/MemBus.hh"
-#include "astra-sim/system/MyPacket.hh"
-#include "astra-sim/system/topology/RingTopology.hh"
-#include  "astra-sim/system/MockNcclQps.h"
+#include "../Common.hh"
+#include "../MemBus.hh"
+#include "../MyPacket.hh"
+#include "../topology/RingTopology.hh"
+#include "../MockNcclQps.h"
 
 namespace AstraSim {
 class NcclTreeFlowModel : public Algorithm {

diff --git a/astra-sim-alibabacloud/astra-sim/system/collective/Ring.cc b/astra-sim-alibabacloud/astra-sim/system/collective/Ring.cc
@@ -4,8 +4,8 @@ LICENSE file in the root directory of this source tree.
 *******************************************************************************/
 
 #include "Ring.hh"
-#include "astra-sim/system/PacketBundle.hh"
-#include "astra-sim/system/RecvPacketEventHadndlerData.hh"
+#include "../PacketBundle.hh"
+#include "../RecvPacketEventHadndlerData.hh"
 namespace AstraSim {
 Ring::Ring(
     ComType type,

diff --git a/astra-sim-alibabacloud/astra-sim/system/collective/Ring.hh b/astra-sim-alibabacloud/astra-sim/system/collective/Ring.hh
@@ -19,10 +19,10 @@ LICENSE file in the root directory of this source tree.
 #include <tuple>
 #include <vector>
 #include "Algorithm.hh"
-#include "astra-sim/system/Common.hh"
-#include "astra-sim/system/MemBus.hh"
-#include "astra-sim/system/MyPacket.hh"
-#include "astra-sim/system/topology/RingTopology.hh"
+#include "../Common.hh"
+#include "../MemBus.hh"
+#include "../MyPacket.hh"
+#include "../topology/RingTopology.hh"
 
 namespace AstraSim {
 class Ring : public Algorithm {

diff --git a/astra-sim-alibabacloud/astra-sim/system/fast-backend/FastBackEnd.hh b/astra-sim-alibabacloud/astra-sim/system/fast-backend/FastBackEnd.hh
@@ -21,7 +21,7 @@
 #include <map>
 #include <tuple>
 
-#include "astra-sim/system/AstraNetworkAPI.hh"
+#include "../AstraNetworkAPI.hh"
 namespace AstraSim {
 class FastBackEnd;
 

diff --git a/astra-sim-alibabacloud/astra-sim/system/memory/SimpleMemory.hh b/astra-sim-alibabacloud/astra-sim/system/memory/SimpleMemory.hh
@@ -5,8 +5,8 @@ LICENSE file in the root directory of this source tree.
 
 #ifndef __SIMPLEMEMORY_HH__
 #define __SIMPLEMEMORY_HH__
-#include "astra-sim/system/AstraMemoryAPI.hh"
-#include "astra-sim/system/AstraNetworkAPI.hh"
+#include "../AstraMemoryAPI.hh"
+#include "../AstraNetworkAPI.hh"
 namespace AstraSim {
 class SimpleMemory : public AstraMemoryAPI {
  public:

diff --git a/astra-sim-alibabacloud/astra-sim/system/scheduling/OfflineGreedy.hh b/astra-sim-alibabacloud/astra-sim/system/scheduling/OfflineGreedy.hh
@@ -5,8 +5,8 @@ LICENSE file in the root directory of this source tree.
 
 #ifndef __OFFLINEGREEDY_HH__
 #define __OFFLINEGREEDY_HH__
-#include "astra-sim/system/Common.hh"
-#include "astra-sim/system/Sys.hh"
+#include "../Common.hh"
+#include "../Sys.hh"
 #include "vector"
 namespace AstraSim {
 class DimElapsedTime {

diff --git a/astra-sim-alibabacloud/astra-sim/system/topology/BasicLogicalTopology.hh b/astra-sim-alibabacloud/astra-sim/system/topology/BasicLogicalTopology.hh
@@ -19,7 +19,7 @@ LICENSE file in the root directory of this source tree.
 #include <tuple>
 #include <vector>
 #include "LogicalTopology.hh"
-#include "astra-sim/system/Common.hh"
+#include "../Common.hh"
 
 namespace AstraSim {
 class BasicLogicalTopology : public LogicalTopology {

diff --git a/astra-sim-alibabacloud/astra-sim/system/topology/BinaryTree.hh b/astra-sim-alibabacloud/astra-sim/system/topology/BinaryTree.hh
@@ -20,7 +20,7 @@ LICENSE file in the root directory of this source tree.
 #include <vector>
 #include "BasicLogicalTopology.hh"
 #include "Node.hh"
-#include "astra-sim/system/Common.hh"
+#include "../Common.hh"
 
 namespace AstraSim {
 class BinaryTree : public BasicLogicalTopology {

diff --git a/astra-sim-alibabacloud/astra-sim/system/topology/ComplexLogicalTopology.hh b/astra-sim-alibabacloud/astra-sim/system/topology/ComplexLogicalTopology.hh
@@ -19,7 +19,7 @@ LICENSE file in the root directory of this source tree.
 #include <tuple>
 #include <vector>
 #include "LogicalTopology.hh"
-#include "astra-sim/system/Common.hh"
+#include "../Common.hh"
 
 namespace AstraSim {
 class ComplexLogicalTopology : public LogicalTopology {

diff --git a/astra-sim-alibabacloud/astra-sim/system/topology/DoubleBinaryTreeTopology.hh b/astra-sim-alibabacloud/astra-sim/system/topology/DoubleBinaryTreeTopology.hh
@@ -20,7 +20,7 @@ LICENSE file in the root directory of this source tree.
 #include <vector>
 #include "ComplexLogicalTopology.hh"
 #include "LocalRingGlobalBinaryTree.hh"
-#include "astra-sim/system/Common.hh"
+#include "../Common.hh"
 namespace AstraSim {
 class DoubleBinaryTreeTopology : public ComplexLogicalTopology {
  public:

diff --git a/astra-sim-alibabacloud/astra-sim/system/topology/GeneralComplexTopology.hh b/astra-sim-alibabacloud/astra-sim/system/topology/GeneralComplexTopology.hh
@@ -19,7 +19,7 @@ LICENSE file in the root directory of this source tree.
 #include <tuple>
 #include <vector>
 #include "ComplexLogicalTopology.hh"
-#include "astra-sim/system/Common.hh"
+#include "../Common.hh"
 
 namespace AstraSim {
 class GeneralComplexTopology : public ComplexLogicalTopology {

diff --git a/astra-sim-alibabacloud/astra-sim/system/topology/LocalRingGlobalBinaryTree.hh b/astra-sim-alibabacloud/astra-sim/system/topology/LocalRingGlobalBinaryTree.hh
@@ -21,7 +21,7 @@ LICENSE file in the root directory of this source tree.
 #include "BinaryTree.hh"
 #include "ComplexLogicalTopology.hh"
 #include "RingTopology.hh"
-#include "astra-sim/system/Common.hh"
+#include "../Common.hh"
 
 namespace AstraSim {
 class LocalRingGlobalBinaryTree : public ComplexLogicalTopology {

diff --git a/astra-sim-alibabacloud/astra-sim/system/topology/LocalRingNodeA2AGlobalDBT.hh b/astra-sim-alibabacloud/astra-sim/system/topology/LocalRingNodeA2AGlobalDBT.hh
@@ -21,7 +21,7 @@ LICENSE file in the root directory of this source tree.
 #include "ComplexLogicalTopology.hh"
 #include "DoubleBinaryTreeTopology.hh"
 #include "RingTopology.hh"
-#include "astra-sim/system/Common.hh"
+#include "../Common.hh"
 
 namespace AstraSim {
 class LocalRingNodeA2AGlobalDBT : public ComplexLogicalTopology {