Skip to content

Commit c22abfa

Browse files
committed
version check to allow compilation with older fairmq version
1 parent c949962 commit c22abfa

12 files changed

Lines changed: 36 additions & 0 deletions

File tree

devices/flp2epn-distributed/run/runEPN_distributed.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,11 @@ int main(int argc, char** argv)
219219
try {
220220
epn.ChangeState(EPNex::SETOUTPUT);
221221
epn.ChangeState(EPNex::SETINPUT);
222+
// temporary check to allow compilation with older fairmq version
223+
#ifdef FAIRMQ_INTERFACE_VERSION
222224
epn.ChangeState(EPNex::BIND);
223225
epn.ChangeState(EPNex::CONNECT);
226+
#endif
224227
epn.ChangeState(EPNex::RUN);
225228
} catch (const exception& e) {
226229
LOG(ERROR) << e.what();

devices/flp2epn-distributed/run/runFLPSampler.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,11 @@ int main(int argc, char** argv)
190190
try {
191191
sampler.ChangeState(FLPexSampler::SETOUTPUT);
192192
sampler.ChangeState(FLPexSampler::SETINPUT);
193+
// temporary check to allow compilation with older fairmq version
194+
#ifdef FAIRMQ_INTERFACE_VERSION
193195
sampler.ChangeState(FLPexSampler::BIND);
194196
sampler.ChangeState(FLPexSampler::CONNECT);
197+
#endif
195198
sampler.ChangeState(FLPexSampler::RUN);
196199
} catch (const exception& e) {
197200
LOG(ERROR) << e.what();

devices/flp2epn-distributed/run/runFLP_distributed.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,11 @@ int main(int argc, char** argv)
227227
try {
228228
flp.ChangeState(FLPex::SETOUTPUT);
229229
flp.ChangeState(FLPex::SETINPUT);
230+
// temporary check to allow compilation with older fairmq version
231+
#ifdef FAIRMQ_INTERFACE_VERSION
230232
flp.ChangeState(FLPex::BIND);
231233
flp.ChangeState(FLPex::CONNECT);
234+
#endif
232235
flp.ChangeState(FLPex::RUN);
233236
} catch (const exception& e) {
234237
LOG(ERROR) << e.what();

devices/flp2epn-dynamic/run/runEPN_dynamic.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,11 @@ int main(int argc, char** argv)
182182

183183
epn.ChangeState(O2EPNex::SETOUTPUT);
184184
epn.ChangeState(O2EPNex::SETINPUT);
185+
// temporary check to allow compilation with older fairmq version
186+
#ifdef FAIRMQ_INTERFACE_VERSION
185187
epn.ChangeState(O2EPNex::BIND);
186188
epn.ChangeState(O2EPNex::CONNECT);
189+
#endif
187190
epn.ChangeState(O2EPNex::RUN);
188191

189192
// wait until the running thread has finished processing.

devices/flp2epn-dynamic/run/runFLP_dynamic.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,11 @@ int main(int argc, char** argv)
188188

189189
flp.ChangeState(O2FLPex::SETOUTPUT);
190190
flp.ChangeState(O2FLPex::SETINPUT);
191+
// temporary check to allow compilation with older fairmq version
192+
#ifdef FAIRMQ_INTERFACE_VERSION
191193
flp.ChangeState(O2FLPex::BIND);
192194
flp.ChangeState(O2FLPex::CONNECT);
195+
#endif
193196
flp.ChangeState(O2FLPex::RUN);
194197

195198
// wait until the running thread has finished processing.

devices/flp2epn/run/runEPN.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,11 @@ int main(int argc, char** argv)
143143

144144
epn.ChangeState(O2EPNex::SETOUTPUT);
145145
epn.ChangeState(O2EPNex::SETINPUT);
146+
// temporary check to allow compilation with older fairmq version
147+
#ifdef FAIRMQ_INTERFACE_VERSION
146148
epn.ChangeState(O2EPNex::BIND);
147149
epn.ChangeState(O2EPNex::CONNECT);
150+
#endif
148151
epn.ChangeState(O2EPNex::RUN);
149152

150153
// wait until the running thread has finished processing.

devices/flp2epn/run/runEPN_M.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,11 @@ int main(int argc, char** argv)
143143

144144
epn.ChangeState(O2EpnMerger::SETOUTPUT);
145145
epn.ChangeState(O2EpnMerger::SETINPUT);
146+
// temporary check to allow compilation with older fairmq version
147+
#ifdef FAIRMQ_INTERFACE_VERSION
146148
epn.ChangeState(O2EpnMerger::BIND);
147149
epn.ChangeState(O2EpnMerger::CONNECT);
150+
#endif
148151
epn.ChangeState(O2EpnMerger::RUN);
149152

150153
// wait until the running thread has finished processing.

devices/flp2epn/run/runFLP.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,11 @@ int main(int argc, char** argv)
149149

150150
flp.ChangeState(O2FLPex::SETOUTPUT);
151151
flp.ChangeState(O2FLPex::SETINPUT);
152+
// temporary check to allow compilation with older fairmq version
153+
#ifdef FAIRMQ_INTERFACE_VERSION
152154
flp.ChangeState(O2FLPex::BIND);
153155
flp.ChangeState(O2FLPex::CONNECT);
156+
#endif
154157
flp.ChangeState(O2FLPex::RUN);
155158

156159
// wait until the running thread has finished processing.

devices/flp2epn/run/runMerger.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,11 @@ int main(int argc, char** argv)
176176

177177
merger.ChangeState(O2Merger::SETOUTPUT);
178178
merger.ChangeState(O2Merger::SETINPUT);
179+
// temporary check to allow compilation with older fairmq version
180+
#ifdef FAIRMQ_INTERFACE_VERSION
179181
merger.ChangeState(O2Merger::BIND);
180182
merger.ChangeState(O2Merger::CONNECT);
183+
#endif
181184
merger.ChangeState(O2Merger::RUN);
182185

183186
// wait until the running thread has finished processing.

devices/flp2epn/run/runProxy.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,11 @@ int main(int argc, char** argv)
168168

169169
proxy.ChangeState(O2Proxy::SETOUTPUT);
170170
proxy.ChangeState(O2Proxy::SETINPUT);
171+
// temporary check to allow compilation with older fairmq version
172+
#ifdef FAIRMQ_INTERFACE_VERSION
171173
proxy.ChangeState(O2Proxy::BIND);
172174
proxy.ChangeState(O2Proxy::CONNECT);
175+
#endif
173176
proxy.ChangeState(O2Proxy::RUN);
174177

175178

0 commit comments

Comments
 (0)