Skip to content

Commit 31f7a4d

Browse files
Merge pull request #353 from Sensing-Dev/update/node-name-v1.8
Update/add node name for 1.8.x
2 parents f706c35 + 289ba99 commit 31f7a4d

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

.github/workflows/linux.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
- main
7+
- release/**
78

89
env:
910
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -15,7 +16,7 @@ jobs:
1516
# well on Windows or Mac. You can convert this to a matrix build if you need
1617
# cross-platform coverage.
1718
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
18-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-22.04
1920

2021
steps:
2122
- uses: actions/checkout@v4

.github/workflows/macos.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
- main
7+
- release/**
78

89
env:
910
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)

.github/workflows/windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
- main
7+
- release/**
78

89
env:
910
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)

include/ion/port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class Port {
166166
[&](const Port::Channel& c) { return std::get<0>(c) == nid; });
167167
}
168168

169-
void determine_succ(const NodeID& nid, const std::string& old_pn, const std::string& new_pn);
169+
void determine_succ(const std::string & n_name, const NodeID &nid, const std::string &old_pn, const std::string &new_pn);
170170

171171
/**
172172
* Overloaded operator to set the port index and return a reference to the current port. eg. port[0]

src/lower.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ void determine_and_validate(std::vector<Node>& nodes) {
124124
throw std::runtime_error(msg);
125125
}
126126

127-
port.determine_succ(n.id(), pn, arginfo.name);
127+
port.determine_succ(n.name(), n.id(), pn, arginfo.name);
128128
pn = arginfo.name;
129129
}
130130

src/port.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ Port::Impl::Impl(const NodeID & nid, const std::string& pn, const Halide::Type&
1616
params[0] = Halide::Internal::Parameter(type, dimensions != 0, dimensions, argument_name(nid, pn, 0, gid));
1717
}
1818

19-
void Port::determine_succ(const NodeID& nid, const std::string& old_pn, const std::string& new_pn) {
19+
void Port::determine_succ(const std::string & n_name,const NodeID &nid, const std::string &old_pn, const std::string &new_pn) {
2020
auto it = std::find(impl_->succ_chans.begin(), impl_->succ_chans.end(), Channel{nid, old_pn});
2121
if (it == impl_->succ_chans.end()) {
2222
log::error("fixme");
2323
throw std::runtime_error("fixme");
2424
}
2525

26-
log::debug("Determine free port {} as {} on Node {}", old_pn, new_pn, nid.value());
26+
log::debug("Determine free port {} as {} on Node: {}_{}", old_pn, new_pn, n_name, nid.value());
2727
impl_->succ_chans.erase(it);
2828
impl_->succ_chans.insert(Channel{nid, new_pn});
2929
}

0 commit comments

Comments
 (0)