Skip to content

Arch+inst #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tonibohnlein merged 11 commits into from
Dec 10, 2025
Merged

Arch+inst #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2e4e052
architecture
tonibohnlein Dec 8, 2025
a64a134
update arch
tonibohnlein Dec 8, 2025
7880bbf
flat send cost
tonibohnlein Dec 8, 2025
5bca1cc
documentation
tonibohnlein Dec 8, 2025
b9482a9
bugfix
tonibohnlein Dec 8, 2025
b4710ae
update architecture
tonibohnlein Dec 8, 2025
7f8aacd
added to_string, removed duplicate comment.
tonibohnlein Dec 8, 2025
e8b06c3
removed some bounds checking
tonibohnlein Dec 8, 2025
20be565
revised bounds checking
tonibohnlein Dec 8, 2025
24df859
revised bounds checking
tonibohnlein Dec 8, 2025
5d30220
bugfix
tonibohnlein Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions include/osp/auxiliary/io/arch_file_reader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ limitations under the License.

#pragma once

#include "osp/bsp/model/BspArchitecture.hpp"
#include <fstream>
#include <iostream>
#include <sstream>
#include "osp/bsp/model/BspArchitecture.hpp"

namespace osp { namespace file_reader {

Expand All @@ -31,7 +31,8 @@ bool readBspArchitecture(std::ifstream &infile, BspArchitecture<Graph_t> &archit

// Skip comment lines
while (std::getline(infile, line)) {
if (!line.empty() && line[0] != '%') break;
if (!line.empty() && line[0] != '%')
break;
}

// Parse architecture parameters
Expand All @@ -58,24 +59,24 @@ bool readBspArchitecture(std::ifstream &infile, BspArchitecture<Graph_t> &archit
if (0 <= mem_type && mem_type <= 3) {
using memw_t = v_memw_t<Graph_t>;
switch (mem_type) {
case 0:
architecture.setMemoryConstraintType(MEMORY_CONSTRAINT_TYPE::NONE);
break;
case 1:
architecture.setMemoryConstraintType(MEMORY_CONSTRAINT_TYPE::LOCAL);
architecture.setMemoryBound(static_cast<memw_t>(M));
break;
case 2:
architecture.setMemoryConstraintType(MEMORY_CONSTRAINT_TYPE::GLOBAL);
architecture.setMemoryBound(static_cast<memw_t>(M));
break;
case 3:
architecture.setMemoryConstraintType(MEMORY_CONSTRAINT_TYPE::PERSISTENT_AND_TRANSIENT);
architecture.setMemoryBound(static_cast<memw_t>(M));
break;
default:
std::cerr << "Invalid memory type.\n";
return false;
case 0:
architecture.setMemoryConstraintType(MEMORY_CONSTRAINT_TYPE::NONE);
break;
case 1:
architecture.setMemoryConstraintType(MEMORY_CONSTRAINT_TYPE::LOCAL);
architecture.setMemoryBound(static_cast<memw_t>(M));
break;
case 2:
architecture.setMemoryConstraintType(MEMORY_CONSTRAINT_TYPE::GLOBAL);
architecture.setMemoryBound(static_cast<memw_t>(M));
break;
case 3:
architecture.setMemoryConstraintType(MEMORY_CONSTRAINT_TYPE::PERSISTENT_AND_TRANSIENT);
architecture.setMemoryBound(static_cast<memw_t>(M));
break;
default:
std::cerr << "Invalid memory type.\n";
return false;
}
} else if (mem_type == -1) {
std::cout << "No memory type specified. Assuming \"NONE\".\n";
Expand Down Expand Up @@ -116,7 +117,7 @@ bool readBspArchitecture(std::ifstream &infile, BspArchitecture<Graph_t> &archit
return false;
}

architecture.setSendCosts(fromProc, toProc, static_cast<v_commw_t<Graph_t>>(value));
architecture.SetSendCosts(fromProc, toProc, static_cast<v_commw_t<Graph_t>>(value));
}

// Ensure there are no remaining non-comment lines
Expand All @@ -127,7 +128,6 @@ bool readBspArchitecture(std::ifstream &infile, BspArchitecture<Graph_t> &archit
}
}

architecture.computeCommAverage();
return true;
}

Expand Down
Loading