From ecba3a5e129c8b264d4d40ddecf14faf93b43a8d Mon Sep 17 00:00:00 2001 From: vamsiDT Date: Thu, 5 Dec 2024 17:28:42 +0100 Subject: [PATCH] various fixes; compilation errors related to astra-sim; remove /etc and replace with logs dir --- .../astra-sim/system/BaseStream.hh | 2 +- .../astra-sim/system/CollectivePhase.cc | 2 +- .../astra-sim/system/MemBus.cc | 2 +- .../astra-sim/system/MockNcclChannel.h | 2 +- .../astra-sim/system/MockNcclGroup.cc | 2 +- .../astra-sim/system/MockNcclGroup.h | 4 +-- .../astra-sim/system/PacketBundle.cc | 2 +- .../astra-sim/system/QueueLevelHandler.hh | 2 +- .../astra-sim/system/QueueLevels.hh | 2 +- .../astra-sim/system/StreamBaseline.cc | 2 +- .../astra-sim/system/Sys.cc | 26 +++++++++---------- .../astra-sim/system/Sys.hh | 8 +++--- .../astra-sim/system/UsageTracker.hh | 2 +- .../astra-sim/system/collective/Algorithm.hh | 10 +++---- .../astra-sim/system/collective/AllToAll.hh | 6 ++--- .../collective/DoubleBinaryTreeAllReduce.cc | 4 +-- .../collective/DoubleBinaryTreeAllReduce.hh | 6 ++--- .../system/collective/HalvingDoubling.cc | 4 +-- .../system/collective/HalvingDoubling.hh | 8 +++--- .../system/collective/NcclTreeFlowModel.cc | 10 +++---- .../system/collective/NcclTreeFlowModel.hh | 10 +++---- .../astra-sim/system/collective/Ring.cc | 4 +-- .../astra-sim/system/collective/Ring.hh | 8 +++--- .../system/fast-backend/FastBackEnd.hh | 2 +- .../astra-sim/system/memory/SimpleMemory.hh | 4 +-- .../system/scheduling/OfflineGreedy.hh | 4 +-- .../system/topology/BasicLogicalTopology.hh | 2 +- .../astra-sim/system/topology/BinaryTree.hh | 2 +- .../system/topology/ComplexLogicalTopology.hh | 2 +- .../topology/DoubleBinaryTreeTopology.hh | 2 +- .../system/topology/GeneralComplexTopology.hh | 2 +- .../topology/LocalRingGlobalBinaryTree.hh | 2 +- .../topology/LocalRingNodeA2AGlobalDBT.hh | 2 +- .../system/topology/LogicalTopology.hh | 2 +- .../astra-sim/system/topology/Node.hh | 2 +- .../astra-sim/system/topology/RingTopology.hh | 2 +- .../astra-sim/system/topology/Torus3D.hh | 2 +- .../astra-sim/workload/CSVWriter.cc | 2 +- .../astra-sim/workload/Layer.cc | 8 +++--- .../astra-sim/workload/Layer.hh | 6 ++--- .../astra-sim/workload/Workload.cc | 9 ++++--- .../astra-sim/workload/Workload.hh | 6 ++--- astra-sim-alibabacloud/build.sh | 5 +++- .../inputs/config/SimAI.conf | 18 ++++++------- 44 files changed, 110 insertions(+), 104 deletions(-) diff --git a/astra-sim-alibabacloud/astra-sim/system/BaseStream.hh b/astra-sim-alibabacloud/astra-sim/system/BaseStream.hh index 11fc405a..7c887d3f 100644 --- 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 index 371325c8..1c423061 100644 --- 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 index f5971e41..86455ad8 100644 --- 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 index eca57334..b58f7944 100644 --- a/astra-sim-alibabacloud/astra-sim/system/MockNcclChannel.h +++ b/astra-sim-alibabacloud/astra-sim/system/MockNcclChannel.h @@ -18,7 +18,7 @@ #include #include #include -#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 index aaa64d08..b613e2d3 100644 --- a/astra-sim-alibabacloud/astra-sim/system/MockNcclGroup.cc +++ b/astra-sim-alibabacloud/astra-sim/system/MockNcclGroup.cc @@ -19,7 +19,7 @@ #include #include #include -#include "astra-sim/system/MockNcclLog.h" +#include "MockNcclLog.h" using namespace std; namespace MockNccl { MockNcclGroup::MockNcclGroup(std::vectorngpus,int TP_size,int gpus_per_nodes,std::vector _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 index 4b2ec3ac..20dd90a9 100644 --- a/astra-sim-alibabacloud/astra-sim/system/MockNcclGroup.h +++ b/astra-sim-alibabacloud/astra-sim/system/MockNcclGroup.h @@ -22,8 +22,8 @@ #include #include #include -#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 index abea0ddf..72d66284 100644 --- 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 index 3f56d991..d24528f8 100644 --- 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 #include #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 index fb5ab2a8..f2510a40 100644 --- 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 #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 index 3e79da3b..d2ec684b 100644 --- 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 index 77373d20..60d9c18e 100644 --- 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 #include diff --git a/astra-sim-alibabacloud/astra-sim/system/Sys.hh b/astra-sim-alibabacloud/astra-sim/system/Sys.hh index d648546d..0e150ad6 100644 --- 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 -#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 index 897cdb5f..fdb88863 100644 --- 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 index b74d9fab..d81cf023 100644 --- 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 #include #include -#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 index d601f7f2..7bb78b36 100644 --- 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 #include #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 index 283f362d..bd3e0fcf 100644 --- 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 index ad833ec8..5a3c185e 100644 --- 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 #include #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 index 604a4ee6..d3f50bcb 100644 --- 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 #include #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 index 70ffa1f9..84e8836c 100644 --- 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 #include #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 index 4c84a873..d52b7b5c 100644 --- 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 -#include "astra-sim/system/PhyMultiThread.hh" +#include "../PhyMultiThread.hh" #endif #include #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 index ff49102f..aadaff8d 100644 --- 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 #include #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 index 4d49ed9e..a183c5a1 100644 --- 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 index 6364500d..fb049a1f 100644 --- 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 #include #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 index 1285e11c..7bb6f347 100644 --- 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 #include -#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 index db1f20ac..505aff1f 100644 --- 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 index 6f5c3b42..698a50f7 100644 --- 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 index f81cf447..441b8489 100644 --- 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 #include #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 index 6ae2f170..61759e01 100644 --- 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 #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 index 226916c3..5eb9c096 100644 --- 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 #include #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 index bff144e8..95014684 100644 --- 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 #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 index ea2f4dd5..09abd331 100644 --- 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 #include #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 index 8ad2acc1..d7b5fdd5 100644 --- 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 index 30e56612..64beeb82 100644 --- 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 { diff --git a/astra-sim-alibabacloud/astra-sim/system/topology/LogicalTopology.hh b/astra-sim-alibabacloud/astra-sim/system/topology/LogicalTopology.hh index 5f8cf6ec..a300eaaf 100644 --- a/astra-sim-alibabacloud/astra-sim/system/topology/LogicalTopology.hh +++ b/astra-sim-alibabacloud/astra-sim/system/topology/LogicalTopology.hh @@ -5,7 +5,7 @@ LICENSE file in the root directory of this source tree. #ifndef __LOGICALTOPOLOGY_HH__ #define __LOGICALTOPOLOGY_HH__ -#include "astra-sim/system/Common.hh" +#include "../Common.hh" namespace AstraSim { class BasicLogicalTopology; class LogicalTopology { diff --git a/astra-sim-alibabacloud/astra-sim/system/topology/Node.hh b/astra-sim-alibabacloud/astra-sim/system/topology/Node.hh index 209b3355..fc11fc9b 100644 --- a/astra-sim-alibabacloud/astra-sim/system/topology/Node.hh +++ b/astra-sim-alibabacloud/astra-sim/system/topology/Node.hh @@ -19,7 +19,7 @@ LICENSE file in the root directory of this source tree. #include #include #include "ComputeNode.hh" -#include "astra-sim/system/Common.hh" +#include "../Common.hh" namespace AstraSim { class Node : public ComputeNode { diff --git a/astra-sim-alibabacloud/astra-sim/system/topology/RingTopology.hh b/astra-sim-alibabacloud/astra-sim/system/topology/RingTopology.hh index 1fc3b57b..1c7eb95e 100644 --- a/astra-sim-alibabacloud/astra-sim/system/topology/RingTopology.hh +++ b/astra-sim-alibabacloud/astra-sim/system/topology/RingTopology.hh @@ -19,7 +19,7 @@ LICENSE file in the root directory of this source tree. #include #include #include "BasicLogicalTopology.hh" -#include "astra-sim/system/Common.hh" +#include "../Common.hh" namespace AstraSim { class RingTopology : public BasicLogicalTopology { diff --git a/astra-sim-alibabacloud/astra-sim/system/topology/Torus3D.hh b/astra-sim-alibabacloud/astra-sim/system/topology/Torus3D.hh index 81be628c..92cc0807 100644 --- a/astra-sim-alibabacloud/astra-sim/system/topology/Torus3D.hh +++ b/astra-sim-alibabacloud/astra-sim/system/topology/Torus3D.hh @@ -20,7 +20,7 @@ LICENSE file in the root directory of this source tree. #include #include "ComplexLogicalTopology.hh" #include "RingTopology.hh" -#include "astra-sim/system/Common.hh" +#include "../Common.hh" namespace AstraSim { class Torus3D : public ComplexLogicalTopology { diff --git a/astra-sim-alibabacloud/astra-sim/workload/CSVWriter.cc b/astra-sim-alibabacloud/astra-sim/workload/CSVWriter.cc index ecc91686..d8133cb8 100644 --- a/astra-sim-alibabacloud/astra-sim/workload/CSVWriter.cc +++ b/astra-sim-alibabacloud/astra-sim/workload/CSVWriter.cc @@ -4,7 +4,7 @@ LICENSE file in the root directory of this source tree. *******************************************************************************/ #include "CSVWriter.hh" -#include "astra-sim/system/Common.hh" +#include "../system/Common.hh" namespace AstraSim { CSVWriter::CSVWriter(std::string path, std::string name) { this->path = path; diff --git a/astra-sim-alibabacloud/astra-sim/workload/Layer.cc b/astra-sim-alibabacloud/astra-sim/workload/Layer.cc index 710ac7bd..a711b90b 100755 --- a/astra-sim-alibabacloud/astra-sim/workload/Layer.cc +++ b/astra-sim-alibabacloud/astra-sim/workload/Layer.cc @@ -4,10 +4,10 @@ LICENSE file in the root directory of this source tree. *******************************************************************************/ #include "Layer.hh" -#include "astra-sim/system/DataSet.hh" -#include "astra-sim/system/IntData.hh" -#include "astra-sim/system/MockNcclLog.h" -#include "astra-sim/system/AstraParamParse.hh" +#include "../system/DataSet.hh" +#include "../system/IntData.hh" +#include "../system/MockNcclLog.h" +#include "../system/AstraParamParse.hh" #ifdef NS3_MPI diff --git a/astra-sim-alibabacloud/astra-sim/workload/Layer.hh b/astra-sim-alibabacloud/astra-sim/workload/Layer.hh index 499c4c25..ff44b23e 100644 --- a/astra-sim-alibabacloud/astra-sim/workload/Layer.hh +++ b/astra-sim-alibabacloud/astra-sim/workload/Layer.hh @@ -19,9 +19,9 @@ LICENSE file in the root directory of this source tree. #include #include "CSVWriter.hh" #include "Workload.hh" -#include "astra-sim/system/StreamStat.hh" -#include "astra-sim/system/Sys.hh" -#include"astra-sim/system/MockNcclGroup.h" +#include "../system/StreamStat.hh" +#include "../system/Sys.hh" +#include "../system/MockNcclGroup.h" namespace AstraSim { class DataSet; diff --git a/astra-sim-alibabacloud/astra-sim/workload/Workload.cc b/astra-sim-alibabacloud/astra-sim/workload/Workload.cc index c722b918..3bd8e4b9 100644 --- a/astra-sim-alibabacloud/astra-sim/workload/Workload.cc +++ b/astra-sim-alibabacloud/astra-sim/workload/Workload.cc @@ -6,7 +6,7 @@ LICENSE file in the root directory of this source tree. #include "Workload.hh" #include "CSVWriter.hh" #include "Layer.hh" -#include "astra-sim/system/MockNcclLog.h" +#include "../system/MockNcclLog.h" namespace AstraSim { Workload::~Workload() { @@ -1158,8 +1158,11 @@ bool Workload::initialize_workload(std::string name) { inFile >> expert_parallel_npu_group; inFile >> tmp; // pp: inFile >> pipeline_model_parallelism; - inFile >> tmp; // vpp: - inFile >> vpp; + // workload files generated by aicb do not have "vpp:". + // In general, reading these values need to be done in a more robust way. + // This type of hardcoded structure causes issues if the worklod files miss at least one of these values + // inFile >> tmp; // vpp: + // inFile >> vpp; inFile >> tmp; // ga: inFile >> GA; inFile >> tmp; // all_gpus: diff --git a/astra-sim-alibabacloud/astra-sim/workload/Workload.hh b/astra-sim-alibabacloud/astra-sim/workload/Workload.hh index 141b00a1..8b50aeb3 100644 --- a/astra-sim-alibabacloud/astra-sim/workload/Workload.hh +++ b/astra-sim-alibabacloud/astra-sim/workload/Workload.hh @@ -17,7 +17,7 @@ LICENSE file in the root directory of this source tree. #include #include #include -#include "astra-sim/system/Callable.hh" +#include "../system/Callable.hh" namespace AstraSim { class Workload; @@ -27,8 +27,8 @@ class Layer; class CSVWriter; } // namespace AstraSim -#include "astra-sim/system/AstraSimDataAPI.hh" -#include "astra-sim/system/Sys.hh" +#include "../system/AstraSimDataAPI.hh" +#include "../system/Sys.hh" namespace AstraSim { enum class ParallelismPolicy { diff --git a/astra-sim-alibabacloud/build.sh b/astra-sim-alibabacloud/build.sh index 5007f353..ed76f375 100755 --- a/astra-sim-alibabacloud/build.sh +++ b/astra-sim-alibabacloud/build.sh @@ -3,7 +3,10 @@ SCRIPT_DIR=$(dirname "$(realpath $0)") NS3_BUILD_DIR="${SCRIPT_DIR:?}"/build/astra_ns3 SIMAI_PHY_BUILD_DIR="${SCRIPT_DIR:?}"/build/simai_phy SIMAI_ANALYTICAL_BUILD_DIR="${SCRIPT_DIR:?}"/build/simai_analytical -SIM_LOG_DIR=/etc/astra-sim +SIM_LOG_DIR="${SCRIPT_DIR:?}"/../logs +if [ ! -d "${SIM_LOG_DIR}" ]; then + mkdir -p "${SIM_LOG_DIR}" +fi # Functions function cleanup_build { diff --git a/astra-sim-alibabacloud/inputs/config/SimAI.conf b/astra-sim-alibabacloud/inputs/config/SimAI.conf index eeabe1ac..4dcea719 100644 --- a/astra-sim-alibabacloud/inputs/config/SimAI.conf +++ b/astra-sim-alibabacloud/inputs/config/SimAI.conf @@ -3,11 +3,11 @@ USE_DYNAMIC_PFC_THRESHOLD 1 PACKET_PAYLOAD_SIZE 9000 -FLOW_FILE /etc/astra-sim/simulation/flow1.txt -TRACE_FILE /etc/astra-sim/simulation/trace1.txt -TRACE_OUTPUT_FILE /etc/astra-sim/simulation/llama_hpn7_mix.tr -FCT_OUTPUT_FILE /etc/astra-sim/simulation/llama_hpn7_fct.txt -PFC_OUTPUT_FILE /etc/astra-sim/simulation/llama_hpn7_pfc.txt +FLOW_FILE logs/simulation/flow1.txt +TRACE_FILE logs/simulation/trace1.txt +TRACE_OUTPUT_FILE logs/simulation/llama_hpn7_mix.tr +FCT_OUTPUT_FILE logs/simulation/llama_hpn7_fct.txt +PFC_OUTPUT_FILE logs/simulation/llama_hpn7_pfc.txt SIMULATOR_STOP_TIME 40000000000000.00 @@ -54,10 +54,10 @@ PMAX_MAP 6 25000000000 0.2 50000000000 0.2 100000000000 0.2 200000000000 0.8 400 BUFFER_SIZE 32 -QLEN_MON_FILE /etc/astra-sim/simulation/llama_hpn7_qlen.txt -BW_MON_FILE /etc/astra-sim/simulation/llama_hpn7_bw.txt -RATE_MON_FILE /etc/astra-sim/simulation/llama_hpn7_rate.txt -CNP_MON_FILE /etc/astra-sim/simulation/llama_hpn7_cnp.txt +QLEN_MON_FILE logs/simulation/llama_hpn7_qlen.txt +BW_MON_FILE logs/simulation/llama_hpn7_bw.txt +RATE_MON_FILE logs/simulation/llama_hpn7_rate.txt +CNP_MON_FILE logs/simulation/llama_hpn7_cnp.txt MON_START 0 MON_END 20000 QP_MON_INTERVAL 100